Mike Sullivan
2012-02-20 b74d961943d13298445c1fcd9097ce19f23a1ae8
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
5 files modified
15 ■■■■■ changed files
components/libtorrent/Makefile 1 ●●●● patch | view | raw | blame | history
components/python/python27/patches/00-bits.patch 4 ●●●● patch | view | raw | blame | history
components/rtorrent/Makefile 1 ●●●● patch | view | raw | blame | history
components/unrar/Makefile 3 ●●●● patch | view | raw | blame | history
make-rules/configure.mk 6 ●●●● patch | view | raw | blame | history
components/libtorrent/Makefile
@@ -59,7 +59,6 @@
CXXFLAGS +=    $(studio_OPT)
CXXFLAGS +=    -i
CXXFLAGS +=    -xspace
CXXFLAGS +=    -mr
CXXFLAGS +=    $(studio_XREGS)
CONFIGURE_OPTIONS  +=    --enable-shared
components/python/python27/patches/00-bits.patch
@@ -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/)
components/rtorrent/Makefile
@@ -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)
components/unrar/Makefile
@@ -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)
make-rules/configure.mk
@@ -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