mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-25 09:34:11 +00:00
c7985448bb
There are significant conceptual differences between SGE 5 and SGE 6 so potential upgraders should beware. At the file level the two are entierly incompatable so SGE 5 must be removed before SGE 6 is installed. The port has seen limited testing so beware.
44 lines
1.3 KiB
Plaintext
44 lines
1.3 KiB
Plaintext
|
|
$FreeBSD$
|
|
|
|
--- dist/pvm/src/aimk.orig
|
|
+++ dist/pvm/src/aimk
|
|
@@ -73,6 +73,8 @@
|
|
|
|
setenv ARCH `$SGE_ROOT/util/arch`
|
|
|
|
+set ARCH = `$SGE_ROOT/util/arch`
|
|
+
|
|
# common compiler and linker settings
|
|
#
|
|
unsetenv LD_LIBRARY_PATH
|
|
@@ -80,9 +82,9 @@
|
|
set MAKE = make
|
|
set MAKEFILE = ../Makefile
|
|
set SDIR = ".."
|
|
-set CFLAGS = "-I../ -I$PVM_ROOT/include"
|
|
+set CFLAGS = "-I../ -I$PVM_ROOT/include -I%%LOCALBASE%%/include"
|
|
set QSYST_PVM_DIR = "$SGE_ROOT/pvm/lib/$ARCH"
|
|
-set LFLAGS = "-L$PVM_ROOT/lib/$PVM_ARCH -L$QSYST_PVM_DIR -L."
|
|
+set LFLAGS = "-L$PVM_ROOT/lib/$PVM_ARCH -L$QSYST_PVM_DIR -L%%LOCALBASE%%/lib -L."
|
|
set LIBS = ""
|
|
set PVM_ROOT = "$PVM_ROOT"
|
|
set PVM_ARCH = "$PVM_ARCH"
|
|
@@ -171,6 +173,16 @@
|
|
case lx24-x86:
|
|
set CC = gcc
|
|
set CFLAGS = "-O -Wall -Werror -Wstrict-prototypes -DLINUX $DEBUG_FLAG $CFLAGS"
|
|
+ set LFLAGS = "$DEBUG_FLAG $LFLAGS"
|
|
+ set LIBS = "$LIBS"
|
|
+ set START_FILE = "/usr/lib/crti.o /usr/lib/crtbegin.o"
|
|
+ set CTOR = "/usr/lib/crti.o /usr/lib/crtbegin.o"
|
|
+ set DTOR = "/usr/lib/crtend.o /usr/lib/crtn.o"
|
|
+ breaksw
|
|
+
|
|
+case fbsd-*:
|
|
+ set CC = gcc
|
|
+ set CFLAGS = "%%CFLAGS%% -Wall -Werror -Wstrict-prototypes $DEBUG_FLAG $CFLAGS"
|
|
set LFLAGS = "$DEBUG_FLAG $LFLAGS"
|
|
set LIBS = "$LIBS"
|
|
set START_FILE = "/usr/lib/crti.o /usr/lib/crtbegin.o"
|