summaryrefslogtreecommitdiff
path: root/sysutils/sge62/files/patch-aimk
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2007-01-09 08:26:10 +0000
committerBrooks Davis <brooks@FreeBSD.org>2007-01-09 08:26:10 +0000
commit7210188d90dd946ab99ba282ed98b99fde43cc15 (patch)
tree51a896eb0ce74ae6f43c893df82d8e543f743729 /sysutils/sge62/files/patch-aimk
parentUpdate to 0.28 (diff)
Upgrade to 6.0u8. No major changes in SGE, but a few port
infrastructure changes: - Don't manually include bsd.java.mk since it's no longer necessicary. [1] - Fix BDB spooling support[2] and enable it by default. PR: ports/99615 [1], ports/99839 [2] Submitted by: hq[1], Davide Cittaro <daweonline at gmail>[2]
Notes
Notes: svn path=/head/; revision=181844
Diffstat (limited to 'sysutils/sge62/files/patch-aimk')
-rw-r--r--sysutils/sge62/files/patch-aimk18
1 files changed, 12 insertions, 6 deletions
diff --git a/sysutils/sge62/files/patch-aimk b/sysutils/sge62/files/patch-aimk
index 7936b6d9c408..dbb6393730ee 100644
--- a/sysutils/sge62/files/patch-aimk
+++ b/sysutils/sge62/files/patch-aimk
@@ -1,8 +1,8 @@
$FreeBSD$
---- aimk.orig Tue Oct 25 17:48:15 2005
-+++ aimk Mon Dec 4 15:57:37 2006
+--- aimk.orig
++++ aimk
@@ -397,7 +397,7 @@
if ( $?SGE_INPUT_CFLAGS ) then
set INP_CFLAGS = "$SGE_INPUT_CFLAGS"
@@ -12,7 +12,7 @@ $FreeBSD$
endif
# Default build targets for which we have seperate make files
-@@ -1180,12 +1180,12 @@
+@@ -1177,27 +1177,27 @@
set MAKE = gmake
set OFLAG = "-O"
set ARFLAGS = rcv
@@ -26,11 +26,17 @@ $FreeBSD$
- 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 NOERR_CFLAG = "-Wno-error"
- set LFLAGS = "$DEBUG_FLAG $LFLAGS"
+- set LFLAGS = "$DEBUG_FLAG $LFLAGS"
++ set LFLAGS = "-export-dynamic $DEBUG_FLAG $LFLAGS"
set LIBS = "$LIBS -lkvm"
-@@ -1196,11 +1196,11 @@
+ set SHAREDLD = $CC
+ set SHARED_CFLAGS = "-fPIC"
+- set SHARED_LFLAGS = "$SHARED_LFLAGS -L. -shared"
++ set SHARED_LFLAGS = "-export-dynamic $SHARED_LFLAGS -L. -shared"
+
set XMTDEF = ""
- set XINCD = "$XMTINCD $XINCD -I/usr/X11/include"
+- set XINCD = "$XMTINCD $XINCD -I/usr/X11/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"