74270ab279
SGE 6.1 contains numerous improvements including resource quotas. A more complete list can be found in the 6.1 release announcment: http://gridengine.sunsource.net/news/SGE61-announce.html
58 lines
1.9 KiB
Text
58 lines
1.9 KiB
Text
|
|
$FreeBSD$
|
|
|
|
--- aimk.orig
|
|
+++ aimk
|
|
@@ -222,7 +222,7 @@
|
|
if ( $?SGE_INPUT_CFLAGS ) then
|
|
set INP_CFLAGS = "$SGE_INPUT_CFLAGS"
|
|
else
|
|
- set INP_CFLAGS = ""
|
|
+ set INP_CFLAGS = "%%CFLAGS%%"
|
|
endif
|
|
|
|
# Default build targets for which we have seperate make files
|
|
@@ -1065,12 +1065,12 @@
|
|
set OFLAG = "-O"
|
|
endif
|
|
set ARFLAGS = rcv
|
|
- set CC = gcc
|
|
- set CXX = g++
|
|
+ set CC = %%CC%%
|
|
+ set CXX = %%CXX%%
|
|
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 NOERR_CFLAG = "-Wno-error"
|
|
set LFLAGS = "$DEBUG_FLAG $LFLAGS -export-dynamic"
|
|
set LIBS = "$LIBS -lkvm"
|
|
@@ -1080,9 +1080,9 @@
|
|
set AUTHLIBS = "-lcrypt -lpam"
|
|
|
|
set XMTDEF = ""
|
|
- 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"
|
|
set XLFLAGS = "$XLIBD"
|
|
set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
|
|
set RM = "rm -f"
|
|
@@ -1728,6 +1728,7 @@
|
|
if ("$JAVA_ARCH" != "") then
|
|
set CORE_INCLUDE = "$CORE_INCLUDE -I${JAVA_HOME}/${JAVA_INCL}/${JAVA_ARCH}"
|
|
switch ($buildarch)
|
|
+ case fbsd-i386:
|
|
case lx24-x86:
|
|
case ulx24-x86:
|
|
case lx26-x86:
|
|
@@ -1745,6 +1746,7 @@
|
|
case usol-sparc:
|
|
set JAVA_LIB_ARCH = sparc
|
|
breaksw
|
|
+ case fbsd-amd64:
|
|
case lx24-amd64:
|
|
case ulx24-amd64:
|
|
case lx26-amd64:
|