Commits

Frank Schoenheit [fs]  committed e61c1b2 Merge

accstuff: merged m104 master fixes

  • Participants
  • Parent commits f225830, 076c4e7

Comments (0)

Files changed (8)

 564e24baaaae5e18c8bfa76811993fbefa571b5c DEV300_m101
 7dbaa615ad894cfd4f9611e82783250bd0a3016d DEV300_m102
 1bdfec44e7ce902365aa7d9cb632f0adeb86262e DEV300_m103
+21b3740610dc90f5298f3bea070153020f3db8b8 DEV300_m104

File berkeleydb/makefile.mk

 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION= \
 	..$/dist$/configure
-CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 CC='$(CC) $(SOLARLIB)'
 .IF "$(OS)"=="MACOSX"
 CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
 .ENDIF

File 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

File 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=
 

File 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

File solenv/config/ssolar.cmn

 		OLD_CHAOS
         OOO_JUNIT_JAR
         OOO_SHELL
+        OOO_SYSBASE_SYS_RELEASE
 		PACKMS
 		PCLEAN_PATH
         PKGCONFIG_ROOT

File solenv/gbuild/JunitTest.mk

 $(call gb_JunitTest_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),JUT,2)
 	$(call gb_Helper_abbreviate_dirs_native,\
+        rm -rf $(call gb_JunitTest_get_userdir,$*) && \
 		mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
-		$(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false))
+		$(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false) && \
+        rm -rf $(call gb_JunitTest_get_userdir,$*))
 	$(CLEAN_CMD)
 
 define gb_JunitTest_JunitTest

File xpdf/makefile.mk

 .ELSE
 CXXFLAGS:=-O $(ARCH_FLAGS)
 .ENDIF
+.IF "$(SYSBASE)" != ""
+CXXFLAGS +:= -I$(SYSBASE)/usr/include
+.END
 LDFLAGS:=$(ARCH_FLAGS)
 .EXPORT : CFLAGS CXXFLAGS LDFLAGS
 .ENDIF