blob: b3a76af883e35a668c38a6af5ce577a48f678e21 (
plain)
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
|
$NetBSD: patch-ak,v 1.2 2015/12/25 20:12:16 joerg Exp $
Add LDFLAGS
replace $(COMMLISTSLIB) with -lcommlists so that pkgsrc wrapper
doesnt reorder.
--- source/utilbin/Makefile.orig 2012-05-23 19:04:49.000000000 +0000
+++ source/utilbin/Makefile
@@ -146,7 +146,7 @@ read_raw.o: $(UTILBIN_DIR)/read_raw.c
#---------------------------------------------------------------------
echo_raw: echo_raw.o version.o $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB)
- $(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti -lrmon -llck $(COMMLISTSLIB) $(LIBS)
+ $(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti -lrmon -llck -lcommlists $(LIBS)
echo_raw.o: $(UTILBIN_DIR)/echo_raw.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/echo_raw.c
@@ -188,7 +188,7 @@ signals.o: $(UTILBIN_DIR)/signals.c
#---------------------------------------------------------------------
loadcheck: loadcheck.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB) $(COMMLISTSLIB) $(LCKLIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB)
- $(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) -llck -lrmon $(COMMLISTSLIB) $(LOADAVGLIBS) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) -llck -lrmon -lcommlists $(LOADAVGLIBS) $(LIBS)
loadcheck.o: $(UTILBIN_DIR)/loadcheck.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/loadcheck.c
@@ -222,7 +222,7 @@ fstype.o: $(UTILBIN_DIR)/fstype.c
$(CC) $(CFLAGS) $(MEMCFLAG) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/fstype.c
#---------------------------------------------------------------------
spooldefaults: spooldefaults.o version.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLCLIB) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(LCKLIB) $(WINGRIDLIB_DEP) $(UTILIB) $(RMONLIB)
- $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon $(DLLIB) $(SLIBS) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) $(COMPILER_RPATH_FLAG)$(SGE_ROOT)/lib/$(SGE_ARCH) spooldefaults.o version.o sge_mt_init.o -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon $(DLLIB) $(SLIBS) $(LIBS)
spooldefaults.o: $(UTILBIN_DIR)/spooldefaults.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooldefaults.c
@@ -257,7 +257,7 @@ tst_pthread_signals.o: $(UTILBIN_DIR)/ts
#---------------------------------------------------------------------
spooledit: spooledit.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(WINGRIDLIB_DEP) $(UTILIB) $(LCKLIB) $(RMONLIB)
- $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
+ $(CC) -o $@ $(LFLAGS) ${COMPILER_RPATH_FLAG}${SGE_ROOT}/lib/${SGE_ARCH} spooledit.o version.o sge_mt_init.o -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti $(WINGRIDLIB) -llck -lrmon -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
spooledit.o: $(UTILBIN_DIR)/spooledit.c
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooledit.c
@@ -290,7 +290,7 @@ valid_jvmlib.o: $(UTILBIN_DIR)/valid_jv
$(CC) $(CFLAGS) -c $(UTILBIN_DIR)/valid_jvmlib.c
#---------------------------------------------------------------------
-AUTHUSER_ADD_LIBS = -luti -llck -lrmon $(COMMLISTSLIB) $(DLLIB)
+AUTHUSER_ADD_LIBS = -luti -llck -lrmon -lcommlists $(DLLIB)
authuser: authuser.o juti.o $(UTILIB) $(LCKLIB) $(RMONLIB) $(COMMLISTSLIB)
$(CC) -o authuser $(LFLAGS) authuser.o juti.o $(AUTHLIBS) $(AUTHUSER_ADD_LIBS) $(LIBS)
|
