Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
16837431 /usr/lib/python2.7/config/Makefile is incorrect
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 27 Nov 2014 08:49:20 -0800
changeset 3497 091183b2cc24
parent 3495 135c9369f1dc
child 3499 78cfa87d42b8
16837431 /usr/lib/python2.7/config/Makefile is incorrect
components/python/cheetah/Makefile file | annotate | diff | comparison | revisions
components/python/coverage/Makefile file | annotate | diff | comparison | revisions
components/python/greenlet/Makefile file | annotate | diff | comparison | revisions
components/python/imaging/Makefile file | annotate | diff | comparison | revisions
components/python/librabbitmq/Makefile file | annotate | diff | comparison | revisions
components/python/m2crypto/Makefile file | annotate | diff | comparison | revisions
components/python/markupsafe/Makefile file | annotate | diff | comparison | revisions
components/python/mysql/Makefile file | annotate | diff | comparison | revisions
components/python/netifaces/Makefile file | annotate | diff | comparison | revisions
components/python/pycups/Makefile file | annotate | diff | comparison | revisions
components/python/pycurl/Makefile file | annotate | diff | comparison | revisions
components/python/pylxml/Makefile file | annotate | diff | comparison | revisions
components/python/pyopenssl/Makefile file | annotate | diff | comparison | revisions
components/python/python-ldap/Makefile file | annotate | diff | comparison | revisions
components/python/python27/Makefile file | annotate | diff | comparison | revisions
components/python/python34/Makefile file | annotate | diff | comparison | revisions
components/python/simplejson/Makefile file | annotate | diff | comparison | revisions
components/python/sqlalchemy/Makefile file | annotate | diff | comparison | revisions
components/python/twisted/Makefile file | annotate | diff | comparison | revisions
components/python/zope-interface/Makefile file | annotate | diff | comparison | revisions
components/rdiff-backup/Makefile file | annotate | diff | comparison | revisions
make-rules/setup.py.mk file | annotate | diff | comparison | revisions 
--- a/components/python/cheetah/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/cheetah/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -43,16 +43,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 COMPONENT_POST_INSTALL_ACTION = \
         (cd $(PROTO_DIR)/usr/bin ; \
 	 $(MV) -f cheetah cheetah-$(PYTHON_VERSION) ; \
--- a/components/python/coverage/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/coverage/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -48,16 +48,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/python/greenlet/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/greenlet/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -50,15 +50,8 @@
 COMPONENT_PRE_BUILD_ACTION = \
 	$(MKDIR) $(SOURCE_DIR)/64
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -shared
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
+LDSHARED=	$(CC) -shared
+PYTHON_ENV +=	LDSHARED="$(LDSHARED)"
 
 # One of the tests, test_exception_switch (tests.test_cpp.CPPTests), 
 # failed in 64-bit. Skip it for now.
--- a/components/python/imaging/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/imaging/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -53,16 +53,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/python/librabbitmq/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/librabbitmq/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -43,16 +43,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/python/m2crypto/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/m2crypto/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -46,16 +46,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 COMPONENT_TEST_ARGS =	setup.py test
 COMPONENT_TEST_DIR =	$(COMPONENT_SRC)
 COMPONENT_TEST_ENV=	CC=$(CC)
--- a/components/python/markupsafe/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/markupsafe/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -40,16 +40,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 COMPONENT_TEST_DIR=	$(COMPONENT_SRC)
 COMPONENT_TEST_ARGS=	setup.py test
 COMPONENT_TEST_ENV=	PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
--- a/components/python/mysql/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/mysql/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -25,11 +25,6 @@
 
 include ../../../make-rules/shared-macros.mk
 
-PATH_32=/usr/mysql/5.5/bin/$(MACH32):/usr/bin
-PATH_64=/usr/mysql/5.5/bin:/usr/bin
-COMPONENT_BUILD_ENV   += PATH=$(PATH_$(BITS))
-COMPONENT_INSTALL_ENV += PATH=$(PATH_$(BITS))
-
 COMPONENT_NAME=		MySQL-python
 COMPONENT_VERSION=	1.2.2
 COMPONENT_PROJECT_URL=	http://sourceforge.net/projects/mysql-python
@@ -49,20 +44,15 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+PATH_32=/usr/mysql/5.5/bin/$(MACH32):/usr/bin:$(SPRO_VROOT)/bin
+PATH_64=/usr/mysql/5.5/bin:/usr/bin:$(SPRO_VROOT)/bin
+COMPONENT_BUILD_ENV   += PATH=$(PATH_$(BITS)):$(PATH)
+COMPONENT_INSTALL_ENV += PATH=$(PATH_$(BITS)):$(PATH)
+
 CFLAGS_32=	-L/usr/mysql/5.5/lib -R/usr/mysql/5.5/lib
 CFLAGS_64=	-L/usr/mysql/5.5/lib/$(MACH64) -R/usr/mysql/5.5/lib/$(MACH64)
 CFLAGS +=	$(CFLAGS_$(BITS))
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets
--- a/components/python/netifaces/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/netifaces/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -45,16 +45,6 @@
 
 COMPONENT_BUILD_ENV += CC_BITS="$(CC_BITS)"
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/python/pycups/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/pycups/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -49,16 +49,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 COMPONENT_TEST_ARGS=	test.py
 COMPONENT_TEST_DIR=	$(COMPONENT_SRC)
 
--- a/components/python/pycurl/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/pycurl/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -53,16 +53,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/python/pylxml/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/pylxml/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -48,16 +48,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 COMPONENT_TEST_ARGS=	test
 COMPONENT_TEST_CMD=	$(MAKE) -i
 COMPONENT_TEST_DIR=	$(SOURCE_DIR)
--- a/components/python/pyopenssl/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/pyopenssl/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -42,16 +42,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 COMPONENT_TEST_DIR = $(COMPONENT_SRC)/OpenSSL/test
 # The .so files are under ./OpenSSL/64 not ./64/OpenSSL so the
 # $(PYTHON_VENDOR_PACKAGES) variable for 64bit Python is wrong.
--- a/components/python/python-ldap/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/python-ldap/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -43,21 +43,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G $(CC_BITS)
-CFLAGS= $(CC_BITS)
-CPPFLAGS=
-LDFLAGS=
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-PYTHON_ENV += CPPFLAGS="$(CPPFLAGS)"
-PYTHON_ENV += LDFLAGS="$(LDFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 COMPONENT_TEST_DIR =    $(SOURCE_DIR)/Tests
 COMPONENT_TEST_CMD =	$(SHELL)
 COMPONENT_TEST_ARGS =   runtests.sh
--- a/components/python/python27/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/python27/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -110,22 +110,48 @@
 # 64 bit shared objects need to go in a 64-bit directory
 COMPONENT_INSTALL_ARGS.64 += DESTSHARED=$(CONFIGURE_PREFIX)/lib/python2.7/lib-dynload
 
-# Setup pyconfig.h file to support 32 & 64 bit.
-# If the /usr/lib/python2.7/lib2to3/*.pickle files are older than the related
-# *.txt files in the same directory, it will rebuild them anytime you try to
-# build a Python module.  So here we also touch the pickle files to avoid this.
-#
+# Simplify the definitions of CC, CXX, CFLAGS and LDFLAGS so they hard-code
+# neither paths from our build systems nor Studio-specific options.
+COMPONENT_PRE_INSTALL_ACTION= \
+            (cd $(@D) ; $(GSED) -i -e 's/^CC=.*/CC=\t\tcc/' \
+		-e 's/^CXX=.*/CXX=\t\tCC/' \
+		-e 's/^CFLAGS=.*/CFLAGS=\t\t\$$\(BASECFLAGS) \$$\(OPT) \$$\(EXTRA_CFLAGS)/' \
+		-e 's|^LDFLAGS=.*|LDFLAGS=|' \
+		Makefile)
+
+# Because we stripped the Makefile above, we need to pass several things in the
+# environment, and use -e to tell gmake to pay attention to the environment.
+COMPONENT_INSTALL_ENV +=	CC="$(CC)"
+COMPONENT_INSTALL_ENV +=	CXX="$(CXX)"
+COMPONENT_INSTALL_ENV +=	CFLAGS="$(CFLAGS)"
+COMPONENT_INSTALL_ENV +=	LDFLAGS="$(LDFLAGS)"
+COMPONENT_INSTALL_ARGS +=	-e
+
+# 1. Setup pyconfig.h file to support 32 & 64 bit.
+# 2. If the /usr/lib/python2.7/lib2to3/*.pickle files are older than the
+#    related *.txt files in the same directory, it will rebuild them any time
+#    you try to build a Python module.  So here we also touch the pickle files
+#    to avoid this.
+# 3. Strip build machine paths from _sysconfigdata.py & config/Makefile.
+#    Note that although the 64-bit version is not used (and thus commented
+#    out in the manifest), we still need to specify the 32-/64-bit paths,
+#    otherwise the 64-bit build will fail to find the 32-bit path.
+CONFIG_MAKEFILE.32=	lib/python2.7/config/Makefile
+CONFIG_MAKEFILE.64=	lib/$(MACH64)/python2.7/config/Makefile
+CONFIG_MAKEFILE=	$(CONFIG_MAKEFILE.$(BITS))
 COMPONENT_POST_INSTALL_ACTION= \
             (cd $(PROTOUSRDIR) ;  \
              $(MV) include/python2.7/pyconfig.h include/python2.7/pyconfig-$(BITS).h ; \
-             $(TOUCH) lib/python2.7/lib2to3/*.pickle)
+             $(TOUCH) lib/python2.7/lib2to3/*.pickle ; \
+	     $(GSED) -i -e 's|$(SOURCE_DIR)|.|g' -e 's|$(COMPONENT_DIR)|..|g' \
+		-e 's|$(SPRO_VROOT)/bin/||g' lib/python2.7/_sysconfigdata.py \
+		$(CONFIG_MAKEFILE))
 
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
 $(INSTALL_32):  $(INSTALL_64)
 configure:	$(CONFIGURE_32_and_64)
-
 build:		$(BUILD_32_and_64)
 install:	$(INSTALL_32_and_64)
 
--- a/components/python/python34/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/python34/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -122,9 +122,31 @@
 
 ASLR_MODE = $(ASLR_ENABLE)
 
+# Simplify the definitions of CC, CXX, CFLAGS and LDFLAGS so they hard-code
+# neither paths from our build systems nor Studio-specific options.
+COMPONENT_PRE_INSTALL_ACTION= \
+    (cd $(@D) ; \
+     $(GSED) -i -e 's/^CC=.*/CC=\t\tcc/' -e 's/^CXX=.*/CXX=\t\tCC/' \
+	-e 's/^CFLAGS=.*/CFLAGS=\t\t\$$\(BASECFLAGS) \$$\(OPT) \$$\(EXTRA_CFLAGS)/' \
+	-e 's|^LDFLAGS=.*|LDFLAGS=|' Makefile)
+
+# Because we stripped the Makefile above, we need to pass several things in the
+# environment, and use -e to tell gmake to pay attention to the environment.
+COMPONENT_INSTALL_ENV +=	CC="$(CC)"
+COMPONENT_INSTALL_ENV +=	CXX="$(CXX)"
+COMPONENT_INSTALL_ENV +=	CFLAGS="$(CFLAGS)"
+COMPONENT_INSTALL_ENV +=	LDFLAGS="$(LDFLAGS)"
+COMPONENT_INSTALL_ARGS +=	-e
+
+# Strip build machine paths from _sysconfigdata.py & config/Makefile.
+COMPONENT_POST_INSTALL_ACTION= \
+    (cd $(PROTOUSRLIBDIR)/python3.4 ; \
+     $(GSED) -i -e 's|$(SOURCE_DIR)|.|g' -e 's|$(COMPONENT_DIR)|..|g' \
+	-e 's|$(SPRO_VROOT)/bin/||g' lib-dynload/64/_sysconfigdata.py \
+	config-3.4m/Makefile)
+
 # common targets
 configure:	$(CONFIGURE_64)
-
 build:		$(BUILD_64)
 install:	$(INSTALL_64)
 
--- a/components/python/simplejson/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/simplejson/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -46,16 +46,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 COMPONENT_TEST_DIR= $(COMPONENT_SRC) 
 COMPONENT_TEST_ARGS= ./setup.py test
 
--- a/components/python/sqlalchemy/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/sqlalchemy/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -44,16 +44,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 COMPONENT_TEST_DIR=	$(SOURCE_DIR)
 COMPONENT_TEST_ARGS=	setup.py test
 COMPONENT_TEST_ENV=	PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
--- a/components/python/twisted/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/twisted/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -50,16 +50,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/python/zope-interface/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/python/zope-interface/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -46,16 +46,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 COMPONENT_TEST_ARGS=	../runtests.sh
 COMPONENT_TEST_CMD=	/bin/sh
 COMPONENT_TEST_DIR=	$(SOURCE_DIR)
--- a/components/rdiff-backup/Makefile	Wed Nov 26 01:17:06 2014 -0800
+++ b/components/rdiff-backup/Makefile	Thu Nov 27 08:49:20 2014 -0800
@@ -43,21 +43,6 @@
 include $(WS_TOP)/make-rules/ips.mk
 include $(WS_TOP)/make-rules/setup.py.mk
 
-# Needed to get around a broken /usr/lib/python2.7/config/Makefile
-# See CR #16837431.
-LD=$(CC)
-LDSHARED=$(CC) -G $(CC_BITS)
-CFLAGS= $(CC_BITS)
-CPPFLAGS=
-LDFLAGS=
-PYTHON_ENV += CC="$(CC)"
-PYTHON_ENV += LDSHARED="$(LDSHARED)"
-PYTHON_ENV += LD="$(LD)"
-PYTHON_ENV += CFLAGS="$(CFLAGS)"
-PYTHON_ENV += CPPFLAGS="$(CPPFLAGS)"
-PYTHON_ENV += LDFLAGS="$(LDFLAGS)"
-COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
-
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets
--- a/make-rules/setup.py.mk	Wed Nov 26 01:17:06 2014 -0800
+++ b/make-rules/setup.py.mk	Thu Nov 27 08:49:20 2014 -0800
@@ -62,6 +62,7 @@
 
 PYTHON_ENV =	CC="$(CC)"
 PYTHON_ENV +=	CFLAGS="$(CFLAGS)"
+PYTHON_ENV +=	PATH="$(PATH):$(SPRO_VROOT)/bin"
 
 COMPONENT_BUILD_ENV += $(PYTHON_ENV)
 COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
upstream/oracle/userland-gate