[ooo-build-commit] Branch 'ooo/master' - solenv/config

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Sep 3 17:07:32 PDT 2009


 solenv/config/sdev300.ini |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit bb596c875b924b139d05f61e01b968493b8bd6a1
Author: Release Engineers <releng at openoffice.org>
Date:   Thu Sep 3 10:59:26 2009 +0000

    #100000# revert some unxlngx settings

diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index d8b87b5..a8851fd 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -939,7 +939,7 @@ unxlngx6
 			COPYALL TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -951,7 +951,7 @@ unxlngx6
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -963,7 +963,7 @@ unxlngx6
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -1004,7 +1004,7 @@ unxlngx6
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
 			DEVROOT %SOLAR_ENV_ROOT%
-			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
+			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
@@ -1024,7 +1024,7 @@ unxlngx6
 		common2 
 		{
 			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
+            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
 			COM GCC
 			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
 			COMMON_ENV_TOOLS %SOLARROOT%$/etools
@@ -1033,7 +1033,7 @@ unxlngx6
 			CVER C341
 			ENABLE_KAB TRUE
 			ENABLE_KDE TRUE
-			ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin
+			ENV_TOOLS %SOLARROOT%/et_linux_libc2.11/%WORK_STAMP%/bin
 			GLIBC 2REDHAT60
 			GUI UNX
 			GUIBASE unx


More information about the ooo-build-commit mailing list