--- a/components/python/cffi/Makefile Fri Oct 07 15:08:18 2016 -0700
+++ b/components/python/cffi/Makefile Tue Oct 11 11:55:12 2016 -0700
@@ -20,29 +20,35 @@
#
#
-# 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
COMPONENT_NAME= cffi
-COMPONENT_VERSION= 0.8.2
+COMPONENT_VERSION= 1.5.2
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:8192393640f7bc304ce82669b35eb90592566a30abbb4924456f52079afc18e2
+ sha256:da9bde99872e46f7bb5cff40a9b1cc08406765efafb583c704de108b6cb821dd
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_PROJECT_URL= http://cffi.readthedocs.org/
COMPONENT_BUGDB= python-mod/cffi
-TPNO= 16913
+TPNO= 29371
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
include $(WS_MAKE_RULES)/ips.mk
+# SolarisStudio12.4 is needed for mbarrier.h
+SPRO_VROOT = $(SPRO_ROOT)/solarisstudio12.4
+
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+LDSHARED= $(CC) -G
+PYTHON_ENV += LDSHARED="$(LDSHARED)"
+
COMPONENT_TEST_DIR = $(@D)/tests
COMPONENT_TEST_ENV = $(PYTHON_ENV)
COMPONENT_TEST_ENV += PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB)
@@ -52,22 +58,17 @@
COMPONENT_TEST_ARGS += -p no:codechecker
COMPONENT_TEST_ARGS += $(TEST_SKIPS)
COMPONENT_TEST_ARGS += c testing
-# The following tests cause core dumps on SPARC (bus error, illegal hardware
-# instruction). We don't skip test_install_and_reload_module{,_package}, which
-# fail on both 64-bit platforms, since those don't cause the interpreter to
-# crash.
-$(BUILD_DIR)/sparcv7-%/.tested: TEST_SKIPS = -k "not test_callback_return_type and not test_struct_packed and not test_opaque_integer_as_function_result"
-$(BUILD_DIR)/sparcv9-%/.tested: TEST_SKIPS = -k "not test_callback and not test_a_lot_of_callbacks and not test_struct_packed and not test_opaque_integer_as_function_result and not test_wchar"
# Copy the tests and a few of the source files they read into a scratch
# directory so running the tests don't leave turds in the source directory.
COMPONENT_PRE_TEST_ACTION = \
$(MKDIR) $(@D)/tests/doc/source; \
- $(CP) -r $(SOURCE_DIR)/c $(SOURCE_DIR)/testing $(@D)/tests; \
+ $(CP) -r $(SOURCE_DIR)/c $(SOURCE_DIR)/testing $(SOURCE_DIR)/cffi $(@D)/tests; \
$(CP) $(SOURCE_DIR)/setup.py $(@D)/tests; \
$(CP) \
$(SOURCE_DIR)/doc/source/conf.py \
$(SOURCE_DIR)/doc/source/index.rst \
+ $(SOURCE_DIR)/doc/source/installation.rst \
$(@D)/tests/doc/source
# common targets
@@ -77,6 +78,11 @@
test: $(TEST_32_and_64)
+system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+
REQUIRED_PACKAGES += library/libffi
+REQUIRED_PACKAGES += library/python/pycparser-27
+REQUIRED_PACKAGES += library/python/pycparser-34
+REQUIRED_PACKAGES += library/python/pycparser-35
REQUIRED_PACKAGES += system/library