Commits

Anonymous committed 570a62a

CWS-TOOLING: integrate CWS rpm4lngx
2009-10-06 14:38:50 +0200 vg r276703 : #160779# new environment for unxlngx6

  • Participants
  • Parent commits 5b3d2ce

Comments (0)

Files changed (3)

File smoketestoo_native/smoketest.pl

 					if ( ($file =~ /-menus-/) or ($file =~ /^adabas/) or (/^j2re-/) or ($file =~ /-gnome-/) ) {
 						next;
 					}
-					$Command = "rpm --define \"_dbpath $rpmdir\" --install --ignoresize --nodeps -vh --relocate /opt=${dest_installdir}opt $installsetpath$file";
+					$Command = "rpm ";
+					$Command .= "--ignorearch " if (defined $ENV{HOSTTYPE} && ($ENV{HOSTTYPE} eq 'x86_64-linux'));
+					$Command .= "--define \"_dbpath $rpmdir\" --install --ignoresize --nodeps -vh --relocate /opt=${dest_installdir}opt $installsetpath$file";
 					execute_Command ($Command, $error_setup, $show_Message, $command_withoutErrorcheck | $command_withoutOutput);
 				}
 				$ENV{LD_LIBRARY_PATH}=$ld_library_backup;

File solenv/bin/rpm-wrapper

 LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
     ${BUILD_TOOLS?}/rpmbuild "$@"
 else
+if [ "$OUTPATH" = "unxlngx6" ]
+then
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
+    ${BUILD_TOOLS?}/rpmbuild "$@"
+else
 LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
     ${BUILD_TOOLS?}/rpm "$@"
 fi
+fi

File solenv/config/sdev300.ini

 			COPYALL TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%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%
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%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%
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%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%
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
 			DEVROOT %SOLAR_ENV_ROOT%
-			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin/perl
+			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
 			PKGFORMAT rpm
 			PTHREAD_CFLAGS -DNPTL
 			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
 		common2 
 		{
 			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
+            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
 			COM GCC
 			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
 			COMMON_ENV_TOOLS %SOLARROOT%$/etools
 			CVER C341
 			ENABLE_KAB TRUE
 			ENABLE_KDE TRUE
-			ENV_TOOLS %SOLARROOT%/et_linux_libc2.11/%WORK_STAMP%/bin
+			ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin
 			GUI UNX
 			GUIBASE unx
 			GUIENV sal