| @@ -1,84 +1,84 @@ | | | @@ -1,84 +1,84 @@ |
1 | $NetBSD: patch-am,v 1.8 2012/04/15 04:07:21 markd Exp $ | | 1 | $NetBSD: patch-am,v 1.9 2013/10/20 17:57:32 joerg Exp $ |
2 | | | 2 | |
3 | Pkgsrc stuff | | 3 | Pkgsrc stuff |
4 | GridEngine dev mailing list patch for "nbsd-1" issue | | 4 | GridEngine dev mailing list patch for "nbsd-1" issue |
5 | ArchLinux static crypto also needs libz.a | | 5 | ArchLinux static crypto also needs libz.a |
6 | | | 6 | |
7 | --- source/aimk.orig 2011-11-28 23:06:13.000000000 +0000 | | 7 | --- source/aimk.orig 2011-11-28 23:06:13.000000000 +0000 |
8 | +++ source/aimk | | 8 | +++ source/aimk |
9 | @@ -961,7 +961,7 @@ if ( $SYSTEM_LIBS != 1 ) then | | 9 | @@ -961,7 +961,7 @@ if ( $SYSTEM_LIBS != 1 ) then |
10 | # we generate a berkeley db shared lib, so we need bdb include and lib path | | 10 | # we generate a berkeley db shared lib, so we need bdb include and lib path |
11 | set CFLAGS = "-I$BERKELEYDB_HOME/include/${BDB_INCLUDE_SUBDIR} $CFLAGS" | | 11 | set CFLAGS = "-I$BERKELEYDB_HOME/include/${BDB_INCLUDE_SUBDIR} $CFLAGS" |
12 | set LFLAGS = "-L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} $LFLAGS" | | 12 | set LFLAGS = "-L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} $LFLAGS" |
13 | - set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR}" | | 13 | - set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR}" |
14 | + set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} -R$BERKELEYDB_HOME/lib" | | 14 | + set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} ${COMPILER_RPATH_FLAG}$BERKELEYDB_HOME/lib" |
15 | endif | | 15 | endif |
16 | set CFLAGS = "$CFLAGS -DSPOOLING_$SPOOLING_METHOD $SECFLAGS" | | 16 | set CFLAGS = "$CFLAGS -DSPOOLING_$SPOOLING_METHOD $SECFLAGS" |
17 | | | 17 | |
18 | @@ -1213,9 +1213,9 @@ case DARWIN_PPC: | | 18 | @@ -1213,9 +1213,9 @@ case DARWIN_PPC: |
19 | | | 19 | |
20 | set XMTDEF = "" | | 20 | set XMTDEF = "" |
21 | set XMTINCD = "$XMTINCD -I$MOTIFHOME/include" | | 21 | set XMTINCD = "$XMTINCD -I$MOTIFHOME/include" |
22 | - set XINCD = "$XMTINCD $XINCD -I/usr/X11R6/include" | | 22 | - set XINCD = "$XMTINCD $XINCD -I/usr/X11R6/include" |
23 | + set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" | | 23 | + set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" |
24 | set XCFLAGS = "-DNeedFunctionPrototypes -DNeedVarargsPrototypes -Wno-error $XMTDEF $XINCD" | | 24 | set XCFLAGS = "-DNeedFunctionPrototypes -DNeedVarargsPrototypes -Wno-error $XMTDEF $XINCD" |
25 | - set XLIBD = "-L$MOTIFHOME/lib -L/usr/X11R6/lib" | | 25 | - set XLIBD = "-L$MOTIFHOME/lib -L/usr/X11R6/lib" |
26 | + set XLIBD = "-L$MOTIFHOME/lib -R${MOTIFHOME}/lib -L${X11BASE}/lib -R${X11BASE}/lib" | | 26 | + set XLIBD = "-L$MOTIFHOME/lib -R${MOTIFHOME}/lib -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib" |
27 | set XLIBS = "-lXm -lXpm -lXt -lXext -lX11 -lSM -lICE" | | 27 | set XLIBS = "-lXm -lXpm -lXt -lXext -lX11 -lSM -lICE" |
28 | if ("$ADOC" == 1) then | | 28 | if ("$ADOC" == 1) then |
29 | set CFLAGS = "$CFLAGS -Wno-error" | | 29 | set CFLAGS = "$CFLAGS -Wno-error" |
30 | @@ -1263,7 +1263,7 @@ case FREEBSD_*: | | 30 | @@ -1263,7 +1263,7 @@ case FREEBSD_*: |
31 | set DLLIB = "" | | 31 | set DLLIB = "" |
32 | set DEPEND_FLAGS = "$CFLAGS $XMTINCD" | | 32 | set DEPEND_FLAGS = "$CFLAGS $XMTINCD" |
33 | set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" | | 33 | set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" |
34 | - set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include" | | 34 | - set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include" |
35 | + set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include" | | 35 | + set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include" |
36 | set NOERR_CFLAG = "-Wno-error" | | 36 | set NOERR_CFLAG = "-Wno-error" |
37 | set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic" | | 37 | set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic" |
38 | set LIBS = "$LIBS -lkvm" | | 38 | set LIBS = "$LIBS -lkvm" |
39 | @@ -1273,9 +1273,9 @@ case FREEBSD_*: | | 39 | @@ -1273,9 +1273,9 @@ case FREEBSD_*: |
40 | set AUTHLIBS = "-lcrypt -lpam" | | 40 | set AUTHLIBS = "-lcrypt -lpam" |
41 | | | 41 | |
42 | set XMTDEF = "" | | 42 | set XMTDEF = "" |
43 | - set XINCD = "$XMTINCD $XINCD -I/usr/X11/include" | | 43 | - set XINCD = "$XMTINCD $XINCD -I/usr/X11/include" |
44 | + set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" | | 44 | + set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" |
45 | set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" | | 45 | set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" |
46 | - set XLIBD = "-L/usr/X11R6/lib" | | 46 | - set XLIBD = "-L/usr/X11R6/lib" |
47 | + set XLIBD = "-L${X11BASE}/lib -R${X11BASE}/lib" | | 47 | + set XLIBD = "-L${X11BASE}/lib ${COMPILER_RPATH_FLAGS}${X11BASE}/lib" |
48 | set XLFLAGS = "$XLIBD" | | 48 | set XLFLAGS = "$XLIBD" |
49 | set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" | | 49 | set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" |
50 | set RM = "rm -f" | | 50 | set RM = "rm -f" |
51 | @@ -1294,9 +1294,9 @@ case NETBSD_*: | | 51 | @@ -1294,9 +1294,9 @@ case NETBSD_*: |
52 | set DLLIB = "" | | 52 | set DLLIB = "" |
53 | set DEPEND_FLAGS = "$CFLAGS $XMTINCD" | | 53 | set DEPEND_FLAGS = "$CFLAGS $XMTINCD" |
54 | set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" | | 54 | set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" |
55 | - set CFLAGS = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include" | | 55 | - set CFLAGS = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include" |
56 | + set CFLAGS = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include" | | 56 | + set CFLAGS = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include" |
57 | set NOERR_CFLAG = "-Wno-error" | | 57 | set NOERR_CFLAG = "-Wno-error" |
58 | - set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic" | | 58 | - set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic" |
59 | + set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic -L${LOCALBASE}/lib -R${LOCALBASE}/lib" | | 59 | + set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib" |
60 | set LIBS = "$LIBS -lkvm" | | 60 | set LIBS = "$LIBS -lkvm" |
61 | set SHAREDLD = $CC | | 61 | set SHAREDLD = $CC |
62 | set SHARED_CFLAGS = "-fPIC" | | 62 | set SHARED_CFLAGS = "-fPIC" |
63 | @@ -1304,9 +1304,9 @@ case NETBSD_*: | | 63 | @@ -1304,9 +1304,9 @@ case NETBSD_*: |
64 | set AUTHLIBS = "-lcrypt -lpam" | | 64 | set AUTHLIBS = "-lcrypt -lpam" |
65 | | | 65 | |
66 | set XMTDEF = "" | | 66 | set XMTDEF = "" |
67 | - set XINCD = "$XMTINCD $XINCD -I/usr/X11/include -I/usr/pkg/include" | | 67 | - set XINCD = "$XMTINCD $XINCD -I/usr/X11/include -I/usr/pkg/include" |
68 | + set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" | | 68 | + set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" |
69 | set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" | | 69 | set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" |
70 | - set XLIBD = "-L/usr/X11R6/lib -R/usr/X11R6/lib -L/usr/pkg/lib -R /usr/pkg/lib" | | 70 | - set XLIBD = "-L/usr/X11R6/lib -R/usr/X11R6/lib -L/usr/pkg/lib -R /usr/pkg/lib" |
71 | + set XLIBD = "-L${X11BASE}/lib -R${X11BASE}/lib -L${LOCALBASE}/lib -R${LOCALBASE}/lib" | | 71 | + set XLIBD = "-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib" |
72 | set XLFLAGS = "$XLIBD" | | 72 | set XLFLAGS = "$XLIBD" |
73 | set XLIBS = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" | | 73 | set XLIBS = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" |
74 | set RM = "rm -f" | | 74 | set RM = "rm -f" |
75 | @@ -1508,6 +1508,8 @@ case LINUXSPARC64: | | 75 | @@ -1508,6 +1508,8 @@ case LINUXSPARC64: |
76 | set DEBUG_FLAG = "$DEBUG_FLAG -fprofile-arcs -ftest-coverage" | | 76 | set DEBUG_FLAG = "$DEBUG_FLAG -fprofile-arcs -ftest-coverage" |
77 | endif | | 77 | endif |
78 | | | 78 | |
79 | + set SECLIBS_STATIC = "$SECLIBS_STATIC /usr/lib/libz.a" | | 79 | + set SECLIBS_STATIC = "$SECLIBS_STATIC /usr/lib/libz.a" |
80 | + | | 80 | + |
81 | if ( -f /lib/libc.so.6 ) then | | 81 | if ( -f /lib/libc.so.6 ) then |
82 | strings /lib/libc.so.6 | grep "GNU C Library" | grep '2.[234]' >& /dev/null | | 82 | strings /lib/libc.so.6 | grep "GNU C Library" | grep '2.[234]' >& /dev/null |
83 | if ($status == 0) then | | 83 | if ($status == 0) then |
84 | @@ -2103,6 +2105,13 @@ else | | 84 | @@ -2103,6 +2105,13 @@ else |