diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-05-16 07:20:01 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-05-16 07:20:01 +0000 |
| commit | 6b1d148054b3ef370ccd093150c1cf47046f4196 (patch) | |
| tree | 12f3e987d3fd7328bb61cf2dcc6a58b9f130fe1d | |
| parent | 279da880ada36222249fb988d0bacc506631ee26 (diff) | |
| download | ATCD-6b1d148054b3ef370ccd093150c1cf47046f4196.tar.gz | |
Fri May 16 07:18:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 10 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux.GNU | 6 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_common.GNU | 6 |
3 files changed, 16 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index d907dbf3cc2..eaeb3895319 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,13 @@ +Fri May 16 07:18:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_linux.GNU: + * include/makeinclude/platform_linux_common.GNU: + Support lib64 paths to detect certain features. Thanks to Ken + Sedgwick <ksedgwick at bonsai dot com> for reporting this + + * include/makeinclude/platform_linux.GNU: + Only set DLD and LD when they are not set yet + Thu May 15 14:00:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Based_Pointer_T.{h,inl}: diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU index 94706302d06..3041a58ca89 100644 --- a/ACE/include/makeinclude/platform_linux.GNU +++ b/ACE/include/makeinclude/platform_linux.GNU @@ -65,14 +65,14 @@ CPPFLAGS += -D_GNU_SOURCE DCFLAGS += -g DCCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) +DLD ?= $(CXX) +LD ?= $(CXX) LIBS += -ldl ifeq ($(threads),1) LIBS += -lpthread # look for the rt library in the usual places - LIBS += $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -lrt) + LIBS += $(shell test "`ls -L /usr/lib*/librt.so* /lib*/librt.so*`" && echo -lrt) endif ifeq ($(optimize),1) diff --git a/ACE/include/makeinclude/platform_linux_common.GNU b/ACE/include/makeinclude/platform_linux_common.GNU index e5b988e6e5f..53f680644d2 100644 --- a/ACE/include/makeinclude/platform_linux_common.GNU +++ b/ACE/include/makeinclude/platform_linux_common.GNU @@ -47,8 +47,8 @@ PLATFORM_TCL_CPPFLAGS= PLATFORM_TCL_LIBS=-ltcl PLATFORM_TCL_LDFLAGS= -PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) -PLATFORM_TK_LIBS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_LIB_FLAG) +PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib*/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) +PLATFORM_TK_LIBS=$(shell . /usr/lib*/tkConfig.sh && echo -n $$TK_LIB_FLAG) PLATFORM_TK_LDFLAGS= PLATFORM_QT_CPPFLAGS ?= -I$(QTDIR)/include @@ -71,7 +71,7 @@ ifeq ($(sctp),lksctp) endif PLATFORM_AIO_SUPPORT := \ - $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -DACE_HAS_AIO_CALLS) + $(shell test "`ls -L /usr/lib*/librt.so* /lib*/librt.so*`" && echo -DACE_HAS_AIO_CALLS) GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION) ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION))) |