--- a/components/python/cheetah/Makefile Fri Jul 08 15:52:25 2016 +0000
+++ b/components/python/cheetah/Makefile Fri Jul 08 11:23:08 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -54,7 +54,7 @@
COMPONENT_TEST_ARGS= cheetah/Tests/Test.py
COMPONENT_TEST_DIR= $(SOURCE_DIR)
COMPONENT_TEST_ENV= PATH=$(PROTO_DIR)/usr/bin
-COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
+COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
COMPONENT_TEST_ENV += PYTHON_VERSION=$(PYTHON_VERSION)
# common targets
--- a/components/python/greenlet/Makefile Fri Jul 08 15:52:25 2016 +0000
+++ b/components/python/greenlet/Makefile Fri Jul 08 11:23:08 2016 -0700
@@ -56,7 +56,7 @@
# One of the tests, test_exception_switch (tests.test_cpp.CPPTests),
# failed in 64-bit. Skip it for now.
COMPONENT_TEST_ENV += GREENLET_TEST_CPP=no
-COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
+COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
COMPONENT_TEST_DIR= $(COMPONENT_SRC)
COMPONENT_TEST_ARGS= setup.py test
--- a/components/python/imaging/Makefile Fri Jul 08 15:52:25 2016 +0000
+++ b/components/python/imaging/Makefile Fri Jul 08 11:23:08 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -54,7 +54,7 @@
COMPONENT_TEST_DIR= $(COMPONENT_SRC)
COMPONENT_TEST_ARGS= ./selftest.py
-COMPONENT_TEST_ENV= PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
+COMPONENT_TEST_ENV= PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
# Master test results are the same for both 32-bit and 64-bit,
# for all versions of Python, so override
@@ -75,7 +75,7 @@
fi
COMPONENT_SYSTEM_TEST_DIR= $(COMPONENT_SRC)
COMPONENT_SYSTEM_TEST_ARGS= ./selftest.py
-COMPONENT_SYSTEM_TEST_ENV= PYTHONPATH=$(PYTHON_VENDOR_PACKAGES.32)
+COMPONENT_SYSTEM_TEST_ENV= PYTHONPATH=$(PYTHON_VENDOR_PACKAGES)
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
--- a/components/python/m2crypto/Makefile Fri Jul 08 15:52:25 2016 +0000
+++ b/components/python/m2crypto/Makefile Fri Jul 08 11:23:08 2016 -0700
@@ -50,7 +50,7 @@
COMPONENT_TEST_DIR = $(COMPONENT_SRC)
COMPONENT_TEST_ENV= CC=$(CC)
COMPONENT_TEST_ENV += PATH=/usr/bin
-COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
+COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
# common targets
build: $(BUILD_32_and_64)
--- a/components/python/markupsafe/Makefile Fri Jul 08 15:52:25 2016 +0000
+++ b/components/python/markupsafe/Makefile Fri Jul 08 11:23:08 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -44,7 +44,7 @@
COMPONENT_TEST_DIR= $(COMPONENT_SRC)
COMPONENT_TEST_ARGS= setup.py test
-COMPONENT_TEST_ENV= PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
+COMPONENT_TEST_ENV= PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
# common targets
build: $(BUILD_32_and_64)
--- a/components/python/pyopenssl/Makefile Fri Jul 08 15:52:25 2016 +0000
+++ b/components/python/pyopenssl/Makefile Fri Jul 08 11:23:08 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -43,10 +43,7 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
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.
-# Everything works fine if we just add the 32bit path.
-COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
+COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
COMPONENT_TEST_CMD = $(SHELL)
COMPONENT_TEST_ARGS = $(COMPONENT_DIR)/files/runtests
--- a/components/python/pysendfile/Makefile Fri Jul 08 15:52:25 2016 +0000
+++ b/components/python/pysendfile/Makefile Fri Jul 08 11:23:08 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -46,7 +46,7 @@
COMPONENT_TEST_ARGS= test/test_sendfile.py
COMPONENT_TEST_DIR= $(SOURCE_DIR)
COMPONENT_TEST_ENV= PATH=$(PROTO_DIR)/usr/bin
-COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
+COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
COMPONENT_TEST_ENV += PYTHON_VERSION=$(PYTHON_VERSION)
# common targets
--- a/components/python/python-ldap/Makefile Fri Jul 08 15:52:25 2016 +0000
+++ b/components/python/python-ldap/Makefile Fri Jul 08 11:23:08 2016 -0700
@@ -48,7 +48,7 @@
COMPONENT_TEST_DIR = $(SOURCE_DIR)/Tests
COMPONENT_TEST_CMD = $(SHELL)
COMPONENT_TEST_ARGS = runtests.sh
-COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
+COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
# Needed to create a unique temporary directory.
COMPONENT_TEST_ENV += BUILD_DIR=$(BUILD_DIR)
--- a/components/python/sqlalchemy/Makefile Fri Jul 08 15:52:25 2016 +0000
+++ b/components/python/sqlalchemy/Makefile Fri Jul 08 11:23:08 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -45,7 +45,7 @@
COMPONENT_TEST_DIR= $(SOURCE_DIR)
COMPONENT_TEST_ARGS= setup.py test
-COMPONENT_TEST_ENV= PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES.32)
+COMPONENT_TEST_ENV= PYTHONPATH=$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
# common targets
build: $(BUILD_32_and_64)
--- a/components/subversion/Makefile Fri Jul 08 15:52:25 2016 +0000
+++ b/components/subversion/Makefile Fri Jul 08 11:23:08 2016 -0700
@@ -146,7 +146,7 @@
CONFIGURE_ENV += PYTHON="$(PYTHON.$(BITS))"
CONFIGURE_ENV += PYMODS="$(PYMODS)"
-CONFIGURE_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES.$(BITS))"
+CONFIGURE_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES)"
CONFIGURE_ENV += JAVA_ROOT="$(JAVA_ROOT)"
CONFIGURE_ENV += PERL="$(PERL)"
CONFIGURE_ENV += ac_cv_path_PERL="$(PERL)"
@@ -177,7 +177,7 @@
COMPONENT_BUILD_ENV += CXXFLAGS="$(CXXFLAGS)"
COMPONENT_BUILD_ENV += PYTHON="$(PYTHON.$(BITS))"
COMPONENT_BUILD_ENV += PYMODS="$(PYMODS)"
-COMPONENT_BUILD_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES.$(BITS))"
+COMPONENT_BUILD_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES)"
COMPONENT_BUILD_ENV += JAVA_ROOT="$(JAVA_ROOT)"
COMPONENT_BUILD_ENV += PERL="$(PERL)"
COMPONENT_BUILD_ENV += ac_cv_path_PERL="$(PERL)"
--- a/make-rules/shared-macros.mk Fri Jul 08 15:52:25 2016 +0000
+++ b/make-rules/shared-macros.mk Fri Jul 08 11:23:08 2016 -0700
@@ -516,19 +516,7 @@
# both the ruby version and the ruby library version are needed.
RUBY_VERSIONS = $(RUBY_LIB_VERSION)
-PYTHON.2.7.VENDOR_PACKAGES.32 = /usr/lib/python2.7/vendor-packages
-PYTHON.2.7.VENDOR_PACKAGES.64 = /usr/lib/python2.7/vendor-packages/64
-PYTHON.2.7.VENDOR_PACKAGES = $(PYTHON.2.7.VENDOR_PACKAGES.$(BITS))
-
-PYTHON.3.4.VENDOR_PACKAGES.64 = /usr/lib/python3.4/vendor-packages/64
-PYTHON.3.4.VENDOR_PACKAGES = $(PYTHON.3.4.VENDOR_PACKAGES.$(BITS))
-
-PYTHON.3.5.VENDOR_PACKAGES.64 = /usr/lib/python3.5/vendor-packages
-PYTHON.3.5.VENDOR_PACKAGES = $(PYTHON.3.5.VENDOR_PACKAGES.$(BITS))
-
-PYTHON_VENDOR_PACKAGES.32 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages
-PYTHON_VENDOR_PACKAGES.64 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages/64
-PYTHON_VENDOR_PACKAGES = $(PYTHON_VENDOR_PACKAGES.$(BITS))
+PYTHON_VENDOR_PACKAGES = /usr/lib/python$(PYTHON_VERSION)/vendor-packages
PYTHON.2.7.TEST = /usr/lib/python2.7/test
PYTHON.3.4.TEST = /usr/lib/python3.4/test