Date: Friday, January 19, 2007 @ 19:21:56
Author: marc
Path: /cvsroot/carob/carob/make-includes
Modified: freebsd-os.mk (1.3 -> 1.4) linux-os.mk (1.3 -> 1.4) main.mk (1.7
-> 1.8)
Moved CLIENT_LIBS pthread option from main.mk to *-os.mk files (this
is highly system-dependent).
---------------+
freebsd-os.mk | 10 ++++++++++
linux-os.mk | 2 +-
main.mk | 11 -----------
3 files changed, 11 insertions(+), 12 deletions(-)
Index: carob/make-includes/freebsd-os.mk
diff -u carob/make-includes/freebsd-os.mk:1.3
carob/make-includes/freebsd-os.mk:1.4
--- carob/make-includes/freebsd-os.mk:1.3 Thu Jan 11 22:57:54 2007
+++ carob/make-includes/freebsd-os.mk Fri Jan 19 19:21:56 2007
@@ -1,3 +1,13 @@
+# One thread library is needed, check CAROB-117
+# let's provide a default
+
+# This may be wrong check:
+# FreeBSD Porter's Handbook > Dos and Don'ts > Threading libraries
+# It can easily be fixed on the command line:
+# gmake OS=freebsd CLIENT_LDLIBS=-pthread / -lc_r / -lthr / etc.
+
+CLIENT_LDLIBS = -pthread
+
# ports pkg_add -r libgmp is installing GMP here
Index: carob/make-includes/linux-os.mk
diff -u carob/make-includes/linux-os.mk:1.3 carob/make-includes/linux-os.mk:1.4
--- carob/make-includes/linux-os.mk:1.3 Tue Jan 9 16:00:00 2007
+++ carob/make-includes/linux-os.mk Fri Jan 19 19:21:56 2007
@@ -8,5 +8,5 @@
# Note that liblog4cxx.so sometimes pulls libxml2.so which is linked to
libdl.so,
# hiding this error
-override CLIENT_LDLIBS += -ldl
+CLIENT_LDLIBS = -lpthread -ldl
Index: carob/make-includes/main.mk
diff -u carob/make-includes/main.mk:1.7 carob/make-includes/main.mk:1.8
--- carob/make-includes/main.mk:1.7 Wed Jan 17 10:48:17 2007
+++ carob/make-includes/main.mk Fri Jan 19 19:21:56 2007
@@ -13,17 +13,6 @@
OS?=linux
-# One thread library is needed, check CAROB-117
-# let's provide a default
-
-# This may be wrong on FreeBSD, check:
-# FreeBSD Porter's Handbook > Dos and Don'ts > Threading libraries
-# It can easily be fixed on the command line:
-# gmake OS=freebsd CLIENT_LDLIBS=-pthread / -lc_r / -lthr / etc.
-
-CLIENT_LDLIBS = -lpthread
-
-
include ${MKINCLUDES}/${COMPILER}-compiler.mk
# order matters: os.mk is likely to define the right linker to use
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
