Date: Tuesday, January 9, 2007 @ 16:00:00
Author: marc
Path: /cvsroot/carob/carob
Modified: make-includes/linux-os.mk (1.2 -> 1.3) test/GNUmakefile (1.37 ->
1.38)
Moved linux-specific -ldl cppunit hack to make-includes/linux-os.mk
---------------------------+
make-includes/linux-os.mk | 12 +++++++++++-
test/GNUmakefile | 7 -------
2 files changed, 11 insertions(+), 8 deletions(-)
Index: carob/make-includes/linux-os.mk
diff -u carob/make-includes/linux-os.mk:1.2 carob/make-includes/linux-os.mk:1.3
--- carob/make-includes/linux-os.mk:1.2 Mon Jan 8 17:00:05 2007
+++ carob/make-includes/linux-os.mk Tue Jan 9 16:00:00 2007
@@ -1,2 +1,12 @@
-# empty file
+# cppunit is sometimes not linked to libdl. Compilation mistake?
+# lib/libcppunit.so: undefined reference to `dlclose'
+
+# -ldl is required (at least) on linux, check man dlopen(3).
+# But not on FreeBSD for instance.
+
+# Note that liblog4cxx.so sometimes pulls libxml2.so which is linked to
libdl.so,
+# hiding this error
+
+override CLIENT_LDLIBS += -ldl
+
Index: carob/test/GNUmakefile
diff -u carob/test/GNUmakefile:1.37 carob/test/GNUmakefile:1.38
--- carob/test/GNUmakefile:1.37 Tue Jan 9 15:42:04 2007
+++ carob/test/GNUmakefile Tue Jan 9 16:00:00 2007
@@ -54,13 +54,6 @@
override CLIENT_LDLIBS += -l${LIB_CPPUNIT}
-# cppunit is sometimes not linked to libdl
-# lib/libcppunit.so: undefined reference to `dlclose'
-# Note that liblog4cxx.so sometimes pulls libxml2.so which also pulls
libdl.so, hiding this error
-ifeq (${OS}, linux)
-override CLIENT_LDLIBS += -ldl
-endif
-
# For QT ui, uncomment this
#LDFLAGS += -l${LIB_CPPUNIT_QTUI}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
