diff options
| author | sb <sb@openoffice.org> | 2009-10-13 13:09:45 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-10-13 13:09:45 +0200 |
| commit | d763f15f1f81872d6fd0f9a10d10b90238ed2b23 (patch) | |
| tree | 21a2e3f998dc4128b112b2594aac2d1e302bf095 /solenv | |
| parent | Create DEV300_m61 milestone tag from trunk@276697 (diff) | |
| download | core-d763f15f1f81872d6fd0f9a10d10b90238ed2b23.tar.gz core-d763f15f1f81872d6fd0f9a10d10b90238ed2b23.zip | |
#i105348# get rid of LinuxThread-specific code (NPTL define)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/config/sdev300.ini | 2 | ||||
| -rw-r--r-- | solenv/config/ssolar.cmn | 1 | ||||
| -rw-r--r-- | solenv/inc/unxlng.mk | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 8b65e8b111e9..afe5aac44201 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -1000,7 +1000,6 @@ unxlngx6 DEVROOT %SOLAR_ENV_ROOT% PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin/perl PKGFORMAT rpm - PTHREAD_CFLAGS -DNPTL SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP% SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv @@ -2529,7 +2528,6 @@ unxubti8 PAM_LINK NO PERL /usr/bin/perl PKGFORMAT deb - PTHREAD_CFLAGS -DNPTL SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv SOLARROOT %SOLAR_ENV_ROOT% SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP% diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index dca20cc902b1..039bdcfcc898 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -169,7 +169,6 @@ common PROFILE profile PROSWITCH - PTHREAD_CFLAGS REMOTE_BUILD_FLAG RES_ARAB RES_CHINSIM diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk index a79d3e47c6cf..b496da7917da 100644 --- a/solenv/inc/unxlng.mk +++ b/solenv/inc/unxlng.mk @@ -47,7 +47,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) +CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) # enable visibility define in "sal/types.h" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" |