1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
|
Description: Build using libtirpc
No longer part of libc6, we have to include and link this explicitly.
Author: Afif Elghraoui <afif@debian.org>
Forwarded: no
Last-Update: 2021-09-26
--- gridengine.orig/source/aimk
+++ gridengine/source/aimk
@@ -302,7 +302,7 @@
set COMPILE_DC = 0
set CC = cc
set CFLAGS = "-D$TARGET_BITS $INP_CFLAGS -DSGE_PQS_API"
-set CORE_INCLUDE = "-I../common -I../libs -I../libs/uti -I../libs/juti -I../libs/gdi -I../libs/japi -I../libs/sgeobj -I../libs/cull -I../libs/comm -I../libs/comm/lists -I../libs/sched -I../libs/evc -I../libs/evm -I../libs/mir -I../daemons/common -I../daemons/qmaster -I../daemons/execd -I../clients/common -I."
+set CORE_INCLUDE = "-I/usr/include/tirpc -I../common -I../libs -I../libs/uti -I../libs/juti -I../libs/gdi -I../libs/japi -I../libs/sgeobj -I../libs/cull -I../libs/comm -I../libs/comm/lists -I../libs/sched -I../libs/evc -I../libs/evm -I../libs/mir -I../daemons/common -I../daemons/qmaster -I../daemons/execd -I../clients/common -I."
set DEBUG_FLAG = ""
set HWLOC = 0
set NO_HWLOC = 0
@@ -327,7 +327,7 @@
set LFLAGS = "-L. $INP_LFLAGS"
set XLFLAGS = ""
set XLIBS = ""
-set LIBS = "-lm -lpthread"
+set LIBS = "-lm -lpthread -ltirpc"
set LIBRARY_LIBS = "" # used for linking shared objects like drmaa.so or jgdi.so. Overwritten by $LIBS if empty
set LD_WRAPPER = ""
set DLLIB = "-luti -ldl"
@@ -1636,9 +1636,6 @@
if ($GPROFFED == 1) then
set DEBUG_FLAG = "$DEBUG_FLAG -pg"
endif
- # in cygwin add tirpc include path and library
- set CFLAGS = "$CFLAGS -I/usr/include/tirpc"
- set LIBS = "$LIBS -ltirpc"
# For now, kludge by treating Cygwin as "LINUX" and special-casing
# where necessary
set CFLAGS = "$OFLAG -Wall -Wstrict-prototypes -DLINUX -D_GNU_SOURCE -DGETHOSTBYNAME -DGETHOSTBYADDR -DHAVE_XDR_H=1 $DEBUG_FLAG $CFLAGS"
@@ -2662,17 +2659,12 @@
setenv $SHARED_PATH_NAME ${SOURCE}/${COMPILE_ARCH}
endif
- set SGE_LIBS = "-lsge -lpthread"
+ set SGE_LIBS = "-lsge $LIBS"
switch ( $COMPILE_ARCH )
case WIN32_X86:
set SGE_LIBS = "$SGE_LIBS $WINGRIDLIB"
breaksw
- case CYGWIN_X86:
- case CYGWIN_X86_64:
- # Cygwin needs the tirpc libs which are defined in the common Cygwin part
- set SGE_LIBS = "$SGE_LIBS $LIBS"
- breaksw
endsw
if ( ! -d $SOURCE/3rdparty/qtcsh/$COMPILE_ARCH || \
|