diff options
| author | Olli Savia <ops@iki.fi> | 2011-02-21 09:16:43 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2011-02-21 09:16:43 +0000 |
| commit | 4b6eaa57fb08788c53ebc4a323120ff07e9f6050 (patch) | |
| tree | 036cd9d0bda5bcfcc2d947b029c7074b37c8d223 | |
| parent | 6e61a8fd8e861ae323f78d415ce01ee5b312084b (diff) | |
| download | ATCD-4b6eaa57fb08788c53ebc4a323120ff07e9f6050.tar.gz | |
ChangeLogTag: Mon Feb 21 09:14:55 UTC 2011 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_freebsd.GNU | 17 |
2 files changed, 6 insertions, 16 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 7d73f7c1a9f..ec1cb9ba612 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Mon Feb 21 09:14:55 UTC 2011 Olli Savia <ops@iki.fi> + + * include/makeinclude/platform_freebsd.GNU: + Removed legacy threads related settings. + Sun Feb 20 11:04:02 UTC 2011 Olli Savia <ops@iki.fi> * include/makeinclude/platform_freebsd.GNU: diff --git a/ACE/include/makeinclude/platform_freebsd.GNU b/ACE/include/makeinclude/platform_freebsd.GNU index 3b4b0a411dc..1cd8af28214 100644 --- a/ACE/include/makeinclude/platform_freebsd.GNU +++ b/ACE/include/makeinclude/platform_freebsd.GNU @@ -29,23 +29,8 @@ SOFLAGS += -shared SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< PRELIB = @echo -## Set the correct compiler flags for pthreads. This -## test is copied from /usr/ports/Mk/bsd.port.mk ifeq ($(threads),1) - RET = $(shell test $(OSVERSION) -lt 500016 && printf 1) - ifeq ($(RET),1) - PTHREAD_CPPFLAGS = -D_THREAD_SAFE - PTHREAD_LIBS = -pthread - else - RET = $(shell test $(OSVERSION) -lt 502102 && printf 1) - ifeq ($(RET),1) - PTHREAD_LIBS = -lc_r - else - PTHREAD_LIBS = -lpthread - endif - endif # RET - CPPFLAGS += $(PTHREAD_CPPFLAGS) - LIBS += $(PTHREAD_LIBS) + LIBS += -lpthread else CPPFLAGS += -DACE_MT_SAFE=0 endif # threads |