Date: Friday, March 9, 2007 @ 17:50:35
Author: marc
Path: /cvsroot/carob/carob/make-includes
Added: Darwin-os.mk (1.1) FreeBSD-os.mk (1.1) Linux-os.mk (1.1)
Removed: darwinports-os.mk (1.6) freebsd-os.mk (1.5) linux-os.mk (1.4)
Renamed -os.mk files according to output of "uname -s"
-------------------+
Darwin-os.mk | 37 +++++++++++++++++++++++++++++++++++++
FreeBSD-os.mk | 35 +++++++++++++++++++++++++++++++++++
Linux-os.mk | 12 ++++++++++++
darwinports-os.mk | 37 -------------------------------------
freebsd-os.mk | 35 -----------------------------------
linux-os.mk | 12 ------------
6 files changed, 84 insertions(+), 84 deletions(-)
Index: carob/make-includes/Darwin-os.mk
diff -u /dev/null carob/make-includes/Darwin-os.mk:1.1
--- /dev/null Fri Mar 9 17:50:35 2007
+++ carob/make-includes/Darwin-os.mk Fri Mar 9 17:50:35 2007
@@ -0,0 +1,37 @@
+
+# Dynamic Library Programming
+#
http://developer.apple.com/documentation/DeveloperTools/Conceptual/DynamicLibraries/
+
+
+# standard location of darwinports
+MK_CPPFLAGS += -I/opt/local/include
+MK_LDFLAGS += -L/opt/local/lib
+
+
+# probably better to mess with poll() on MacOSX:
+#
http://fink.sourceforge.net/doc/porting/porting.en.html#preparing-10.4.system-libs
+MK_CPPFLAGS += -DCAROB_USE_SELECT
+
+
+# Named locales silently fail (fallback on POSIX?) TODO: test again
+# with XCode > 1.1. For instance "locale -a" works on MacOSX >= 10.4
+# Maybe using locale named "" on 10.4 would provide an UTF-8 codec?
+
+MK_CPPFLAGS += -DCAROB_USE_ICONV -DCAROB_FORCE_UNICODE_WCHAR
+MK_LDLIBS += -liconv
+
+
+# Hack to get std::isnan,isinf,signbit C99-like features
+# http://lists.apple.com/archives/xcode-users/2005/Feb/msg00238.html
+
+# Tested on MacOS 10.3 with XCode 1.1 updated (gcc 3.3). We'll have to
+# move this to C99Math.h in case we have to differentiate gcc versions.
+
+MK_CPPFLAGS += -D_GLIBCPP_USE_C99
+
+
+LINKER = darwinlibtool
+
+
+
+
Index: carob/make-includes/FreeBSD-os.mk
diff -u /dev/null carob/make-includes/FreeBSD-os.mk:1.1
--- /dev/null Fri Mar 9 17:50:35 2007
+++ carob/make-includes/FreeBSD-os.mk Fri Mar 9 17:50:35 2007
@@ -0,0 +1,35 @@
+# 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
+# same thing for libiconv
+MK_CPPFLAGS += -I/usr/local/include
+MK_LDFLAGS += -L/usr/local/lib
+
+
+# named locales do not work on FreeBSD. See carob/doc/locales
+# fallback on Iconv
+
+MK_CPPFLAGS += -DCAROB_USE_ICONV
+MK_LDLIBS += -liconv
+
+
+# Unreliable FreeBSD hack. According to Bruno Haible, in 2000
+# wchar_t on FreeBSD was: "All bytes belonging to the multibyte char,
+# packed in a single word. This makes the widechar <--> multibyte
+# converter quite fast."
+#
+# ==> locale-dependent and definitely not unicode.
+# See also carob/doc/locales
+
+MK_CPPFLAGS += -DCAROB_FORCE_UNICODE_WCHAR
+
Index: carob/make-includes/Linux-os.mk
diff -u /dev/null carob/make-includes/Linux-os.mk:1.1
--- /dev/null Fri Mar 9 17:50:35 2007
+++ carob/make-includes/Linux-os.mk Fri Mar 9 17:50:35 2007
@@ -0,0 +1,12 @@
+
+# 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
+
+CLIENT_LDLIBS = -lpthread -ldl
+
Index: carob/make-includes/darwinports-os.mk
diff -u carob/make-includes/darwinports-os.mk:1.6
carob/make-includes/darwinports-os.mk:removed
--- carob/make-includes/darwinports-os.mk:1.6 Wed Jan 31 15:06:02 2007
+++ carob/make-includes/darwinports-os.mk Fri Mar 9 17:50:35 2007
@@ -1,37 +0,0 @@
-
-# Dynamic Library Programming
-#
http://developer.apple.com/documentation/DeveloperTools/Conceptual/DynamicLibraries/
-
-
-# standard location of darwinports
-MK_CPPFLAGS += -I/opt/local/include
-MK_LDFLAGS += -L/opt/local/lib
-
-
-# probably better to mess with poll() on MacOSX:
-#
http://fink.sourceforge.net/doc/porting/porting.en.html#preparing-10.4.system-libs
-MK_CPPFLAGS += -DCAROB_USE_SELECT
-
-
-# Named locales silently fail (fallback on POSIX?) TODO: test again
-# with XCode > 1.1. For instance "locale -a" works on MacOSX >= 10.4
-# Maybe using locale named "" on 10.4 would provide an UTF-8 codec?
-
-MK_CPPFLAGS += -DCAROB_USE_ICONV -DCAROB_FORCE_UNICODE_WCHAR
-MK_LDLIBS += -liconv
-
-
-# Hack to get std::isnan,isinf,signbit C99-like features
-# http://lists.apple.com/archives/xcode-users/2005/Feb/msg00238.html
-
-# Tested on MacOS 10.3 with XCode 1.1 updated (gcc 3.3). We'll have to
-# move this to C99Math.h in case we have to differentiate gcc versions.
-
-MK_CPPFLAGS += -D_GLIBCPP_USE_C99
-
-
-LINKER = darwinlibtool
-
-
-
-
Index: carob/make-includes/freebsd-os.mk
diff -u carob/make-includes/freebsd-os.mk:1.5
carob/make-includes/freebsd-os.mk:removed
--- carob/make-includes/freebsd-os.mk:1.5 Mon Jan 29 18:19:20 2007
+++ carob/make-includes/freebsd-os.mk Fri Mar 9 17:50:35 2007
@@ -1,35 +0,0 @@
-# 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
-# same thing for libiconv
-MK_CPPFLAGS += -I/usr/local/include
-MK_LDFLAGS += -L/usr/local/lib
-
-
-# named locales do not work on FreeBSD. See carob/doc/locales
-# fallback on Iconv
-
-MK_CPPFLAGS += -DCAROB_USE_ICONV
-MK_LDLIBS += -liconv
-
-
-# Unreliable FreeBSD hack. According to Bruno Haible, in 2000
-# wchar_t on FreeBSD was: "All bytes belonging to the multibyte char,
-# packed in a single word. This makes the widechar <--> multibyte
-# converter quite fast."
-#
-# ==> locale-dependent and definitely not unicode.
-# See also carob/doc/locales
-
-MK_CPPFLAGS += -DCAROB_FORCE_UNICODE_WCHAR
-
Index: carob/make-includes/linux-os.mk
diff -u carob/make-includes/linux-os.mk:1.4
carob/make-includes/linux-os.mk:removed
--- carob/make-includes/linux-os.mk:1.4 Fri Jan 19 19:21:56 2007
+++ carob/make-includes/linux-os.mk Fri Mar 9 17:50:35 2007
@@ -1,12 +0,0 @@
-
-# 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
-
-CLIENT_LDLIBS = -lpthread -ldl
-
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
