7143131 hi ho, hi ho, it's off to nine we go
7141080 python27 autoconf patch can't be applied until Userland CBE uses the new version of autoconf
--- a/components/libtorrent/Makefile Fri Feb 17 05:35:25 2012 -0800
+++ b/components/libtorrent/Makefile Mon Feb 20 10:14:44 2012 -0800
@@ -59,7 +59,6 @@
CXXFLAGS += $(studio_OPT)
CXXFLAGS += -i
CXXFLAGS += -xspace
-CXXFLAGS += -mr
CXXFLAGS += $(studio_XREGS)
CONFIGURE_OPTIONS += --enable-shared
--- a/components/python/python27/patches/00-bits.patch Fri Feb 17 05:35:25 2012 -0800
+++ b/components/python/python27/patches/00-bits.patch Mon Feb 20 10:14:44 2012 -0800
@@ -5,10 +5,10 @@
+++ Python-2.7.1/configure.in Tue Jul 12 14:47:05 2011
@@ -12,7 +12,7 @@
[],
- [m4_fatal([Autoconf version $1 is required for Python], 63)])
+ [m4_fatal([Autoconf version $1 is required for Python], 68)])
])
-version_required(2.65)
-+version_required(2.63)
++version_required(2.68)
AC_REVISION($Revision: 86076 $)
AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
--- a/components/rtorrent/Makefile Fri Feb 17 05:35:25 2012 -0800
+++ b/components/rtorrent/Makefile Mon Feb 20 10:14:44 2012 -0800
@@ -55,7 +55,6 @@
CXXFLAGS += -i
CXXFLAGS += -xspace
-CXXFLAGS += -mr
CXXFLAGS += $(studio_XREGS)
CXXFLAGS += -I/usr/include/ncurses
CONFIGURE_OPTIONS.32 += --srcdir=$(BUILD_DIR_32)
--- a/components/unrar/Makefile Fri Feb 17 05:35:25 2012 -0800
+++ b/components/unrar/Makefile Mon Feb 20 10:14:44 2012 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -53,6 +53,7 @@
COMPONENT_BUILD_ENV += DEFINES="$(CPP_LARGEFILES)"
COMPONENT_BUILD_ARGS += -f makefile.unix
+COMPONENT_BUILD_ARGS += STRIP="/bin/true"
# common targets
build: $(BUILD_32)
--- a/make-rules/configure.mk Fri Feb 17 05:35:25 2012 -0800
+++ b/make-rules/configure.mk Mon Feb 20 10:14:44 2012 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -90,6 +90,10 @@
CONFIGURE_ENV += $(CONFIGURE_ENV.$(BITS))
+# temporarily work around some issues
+CONFIGURE_ENV += "ac_cv_func_realloc_0_nonnull=yes"
+COMPONENT_BUILD_ENV += "ac_cv_func_realloc_0_nonnull=yes"
+
# configure the unpacked source for building 32 and 64 bit version
CONFIGURE_SCRIPT = $(SOURCE_DIR)/configure
$(BUILD_DIR)/%/.configured: $(SOURCE_DIR)/.prep