Anonymous avatar Anonymous committed f3a2cc5

masterfix from: sb140: #i117456# on Solaris 11 against Solaris 10 baseline, trick python configure into thinking it sees Solaris 10
(transplanted from 6402ce7b0667b255e70c517c4320ecaee2682c56)

Comments (0)

Files changed (4)

python/Python-2.6.1-sysbase.patch

+--- misc/Python-2.6.1/configure	Thu Mar 17 13:00:41 2011
++++ misc/build/Python-2.6.1/configure	Thu Mar 17 12:58:50 2011
+@@ -2042,7 +2042,9 @@
+ if test -z "$MACHDEP"
+ then
+ 	ac_sys_system=`uname -s`
+-	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
++        if test -n "$OOO_SYSBASE_SYS_RELEASE"; then
++                ac_sys_release=$OOO_SYSBASE_SYS_RELEASE
++	elif test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
+ 	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
+ 		ac_sys_release=`uname -v`
+ 	else

python/makefile.mk

 PATCH_FILES=\
 	Python-$(PYVERSION).patch \
 	Python-parallel-make.patch \
-	Python-ssl.patch
+	Python-ssl.patch \
+    Python-2.6.1-sysbase.patch
 
 CONFIGURE_DIR=
 

solenv/config/sdev300.ini

             SOLAR_ENV_ROOT /so/env
             SOLAR_SOURCE_ROOT %DRIVE_O%
             SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
+            OOO_SYSBASE_SYS_RELEASE 5.10
         }
         common1
         {
         sysbaseroot
         {
             SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+            OOO_SYSBASE_SYS_RELEASE
         }
     }
     extern
             SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
             SOLAR_SOURCE_ROOT %DRIVE_O%
             SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
+            OOO_SYSBASE_SYS_RELEASE 5.10
         }
         common1
         {
         sysbaseroot
         {
             SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+            OOO_SYSBASE_SYS_RELEASE
         }
     }
     extern
             SOLAR_ENV_ROOT /so/env
             SOLAR_SOURCE_ROOT %DRIVE_O%
             SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
+            OOO_SYSBASE_SYS_RELEASE 5.10
         }
         common1
         {
         sysbaseroot
         {
             SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+            OOO_SYSBASE_SYS_RELEASE
         }
     }
     extern

solenv/config/ssolar.cmn

 		OLD_CHAOS
         OOO_JUNIT_JAR
         OOO_SHELL
+        OOO_SYSBASE_SYS_RELEASE
 		PACKMS
 		PCLEAN_PATH
         PKGCONFIG_ROOT
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.