diff options
Diffstat (limited to 'sysutils/sge61/files/patch-aimk')
| -rw-r--r-- | sysutils/sge61/files/patch-aimk | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/sysutils/sge61/files/patch-aimk b/sysutils/sge61/files/patch-aimk index dbb6393730ee..5fad14fbc275 100644 --- a/sysutils/sge61/files/patch-aimk +++ b/sysutils/sge61/files/patch-aimk @@ -3,7 +3,7 @@ $FreeBSD$ --- aimk.orig +++ aimk -@@ -397,7 +397,7 @@ +@@ -210,7 +210,7 @@ if ( $?SGE_INPUT_CFLAGS ) then set INP_CFLAGS = "$SGE_INPUT_CFLAGS" else @@ -12,39 +12,31 @@ $FreeBSD$ endif # Default build targets for which we have seperate make files -@@ -1177,27 +1177,27 @@ - set MAKE = gmake - set OFLAG = "-O" - set ARFLAGS = rcv +@@ -1003,12 +1003,12 @@ + set OFLAG = "-O" + endif + set ARFLAGS = rcv - set CC = gcc - set CXX = g++ + set CC = %%CC%% + set CXX = %%CXX%% - set DLLIB = "" + set DLLIB = "" set DEPEND_FLAGS = "$CFLAGS $XMTINCD" set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" - set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include" -+ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I%%X11BASE%%/include" ++ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include" set NOERR_CFLAG = "-Wno-error" -- set LFLAGS = "$DEBUG_FLAG $LFLAGS" -+ set LFLAGS = "-export-dynamic $DEBUG_FLAG $LFLAGS" + set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic" set LIBS = "$LIBS -lkvm" - set SHAREDLD = $CC - set SHARED_CFLAGS = "-fPIC" -- set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared" -+ set SHARED_LFLAGS = "-export-dynamic $SHARED_LFLAGS -L. -shared" +@@ -1017,9 +1017,9 @@ + set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared -export-dynamic" set XMTDEF = "" - set XINCD = "$XMTINCD $XINCD -I/usr/X11/include" -+ set XINCD = "$XMTINCD $XINCD -I%%X11BASE%%/include" ++ set XINCD = "$XMTINCD $XINCD -I${X11BASE}/include" set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" - set XLIBD = "-L/usr/X11R6/lib" -+ set XLIBD = "-L%%X11BASE%%/lib" ++ set XLIBD = "-L${X11BASE}/lib" set XLFLAGS = "$XLIBD" set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" set RM = "rm -f" -- set JAVA_ARCH = "" -+ set JAVA_ARCH = "freebsd" - breaksw - - case NETBSD_*: |