Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/slurm/files: slurm-0.3.3-asneeded.patch
Date: Tue, 02 Jun 2009 11:59:42
Message-Id: E1MBSeb-00050i-2g@stork.gentoo.org
1 flameeyes 09/06/02 11:59:41
2
3 Added: slurm-0.3.3-asneeded.patch
4 Log:
5 Add patch to fix build with --as-needed by Kevin Pyle, closes bug #247937.
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 net-analyzer/slurm/files/slurm-0.3.3-asneeded.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/slurm/files/slurm-0.3.3-asneeded.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/slurm/files/slurm-0.3.3-asneeded.patch?rev=1.1&content-type=text/plain
13
14 Index: slurm-0.3.3-asneeded.patch
15 ===================================================================
16 --- a/configure.in 2004-09-28 09:34:56.000000000 -0500
17 +++ b/configure.in 2009-02-14 12:42:52.000000000 -0600
18 @@ -40,41 +40,15 @@
19 fi
20 AC_DEFINE(OSTYPE, ["${OSTYPE}"], [The operating system to build for])
21
22 -for cursespath in /usr/include/ncurses.h /usr/local/include/ncurses.h /usr/local/include/ncurses/ncurses.h /opt/include/ncurses.h /opt/include/curses.h /usr/include/curses.h /usr/local/include/curses.h /dev/null
23 -do
24 - test -f "${cursespath}" && break
25 -done
26 -case ${cursespath} in
27 - /usr/include/*)
28 - CFLAGS="$CFLAGS -I/usr/include"
29 - LDFLAGS=""
30 - ;;
31 - /usr/local/include/ncurses/*)
32 - CFLAGS="${CFLAGS} -I/usr/local/include/ncurses"
33 - LDFLAGS="-L/usr/local/lib"
34 - SOLLDFLAGS="-R/usr/local/lib"
35 - ;;
36 - /usr/local/include/*)
37 - CFLAGS="${CFLAGS} -I/usr/local/include"
38 - LDFLAGS="-L/usr/local/lib"
39 - SOLLDFLAGS="-R/usr/local/lib"
40 - ;;
41 - /opt/include/*)
42 - CFLAGS="${CFLAGS} -I/opt/include"
43 - LDFLAGS="-L/opt/lib"
44 - SOLLDFLAGS="-R/opt/lib"
45 - ;;
46 -esac
47 # add Slowlaris -R and libraries to LDFLAGS
48 if test ${OSTYPE} = "solaris" ; then
49 LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat"
50 fi
51
52 -AC_CHECK_LIB(fridge, vanilla_coke, echo "WTF?!", echo "Warning: No vanilla coke found in fridge.";echo "We highly suggest that you rectify this situation immediatly.")
53 ncurses_support="no"
54 curses_support="no"
55 color_support="no"
56 -AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes", AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; ncurses_support="yes"; echo "NO TRANSPARENCY SUPPORT in this ncurses lib", AC_CHECK_LIB(curses, initscr, LDFLAGS="$LDFLAGS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; curses_support="yes"; echo "NO TRANSPARENCY SUPPORT in curses lib")))
57 +AC_CHECK_LIB(ncurses, use_default_colors, LIBS="-lncurses $LIBS"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes")
58
59 # disable color support on Solaris for now
60 if test ${OSTYPE} = "solaris" ; then