python_modules-58.0.1

Author: facekapow

.gitignore

@@ -0,0 +1,8 @@
+build
+.DS_Store
+*~
+*.rej
+*.orig
+cscope.*
+tags
+TAGS

2.6.inc

@@ -1,5 +1,5 @@
 MODULES = \
-    setuptools-18.5 \
+    setuptools-41.0.1 \
     altgraph-0.10.2 \
     modulegraph-0.10.4 \
     macholib-1.5.1 \
@@ -10,8 +10,17 @@ MODULES = \
     bonjour-py-0.3 \
     scipy-0.13.0b1 \
     pytz-2013.7 \
-    six-1.4.1 \
+    six-1.12.0 \
+    future-0.17.1 \
     python-dateutil-1.5 \
     pyparsing-2.0.1 \
     matplotlib-1.3.1 \
-    pyOpenSSL-0.13.1
+    cffi-1.12.2 \
+    pycparser-2.19 \
+    asn1crypto-0.24.0 \
+    enum34-1.1.6 \
+    ipaddress-1.0.22 \
+    cryptography-2.6.1 \
+    pyOpenSSL-19.0.0 \
+    wheel-0.33.1 \
+    recertifi-0.11.0

2.7.inc

@@ -8,12 +8,13 @@ _VERSIONERDIR := /usr/local/versioner
 # Look for /usr/local/versioner in $(SDKROOT), defaulting to /usr/local/versioner
 VERSIONERDIR := $(or $(wildcard $(SDKROOT)$(_VERSIONERDIR)),$(_VERSIONERDIR))
 PYTHONVERSIONS = $(VERSIONERDIR)/$(PYTHONPROJECT)/versions
-INCOMPATIBLE =
+INCOMPATIBLE = 2.6
 DEFAULT := $(shell sed -n '/^DEFAULT = /s///p' $(PYTHONVERSIONS))
 KNOWNVERSIONS := $(filter-out $(INCOMPATIBLE), $(shell grep '^[0-9]' $(PYTHONVERSIONS)))
 BOOTSTRAPPYTHON =
 VERSIONS = $(sort $(KNOWNVERSIONS) $(BOOTSTRAPPYTHON))
-ORDEREDVERS := $(DEFAULT) $(filter-out $(DEFAULT),$(VERSIONS))
+OTHERVERSIONS = $(filter-out $(DEFAULT),$(VERSIONS))
+ORDEREDVERS := $(DEFAULT) $(OTHERVERSIONS)
 VERSIONERFLAGS = -std=gnu99 -Wall -mdynamic-no-pic -I$(VERSIONERDIR)/$(PYTHONPROJECT) -I$(MYFIX) -framework CoreFoundation
 OSV = OpenSourceVersions
 OSL = OpenSourceLicenses
@@ -45,7 +46,6 @@ build::
 	    (echo "######## Building $$vers:" `date` '########' > "$(SYMROOT)/$$vers/LOG" 2>&1 && \
 		PATH="$(TMPPREFIX)/bin:$$PATH" \
 		VERSIONER_PYTHON_VERSION=$$vers \
-		VERSIONER_PYTHON_PREFER_32_BIT=yes \
 		$(MAKE) -f Makefile install Project=$(Project) \
 		OBJROOT="$(OBJROOT)/$$vers" \
 		DSTROOT="$(OBJROOT)/$$vers/DSTROOT" \
@@ -90,6 +90,28 @@ mergebegin:
 	@echo ####### Merging #######
 
 MERGEBIN = /usr/bin
+
+# This causes us to replace the versioner stub with the default version of perl.
+# Since we are now only shipping one version (5.18) and one slice (x86_64), there
+# is no need for the re-exec stub.  We are leaving the infrastructure in place
+# in case we ever ship a new version or a new architecture in the future.
+ifeq ($(OTHERVERSIONS),)
+mergebin:
+	mkdir -p $(DSTROOT)$(MERGEBIN)
+	cd $(OBJROOT)/$(DEFAULT)/DSTROOT$(MERGEBIN) && \
+	for f in `find . -type f ! -name "*$(DEFAULT)*" | sed 's,^\./,,'`; do \
+	    fv=$$f-$(DEFAULT) && \
+	    ditto $$f $(DSTROOT)$(MERGEBIN)/$$fv && \
+	    sed -e 's/@SEP@/-/g' -e "s/@VERSION@/$(DEFAULT)/g" $(FIX)/scriptvers.ed | ed - $(DSTROOT)$(MERGEBIN)/$$fv && \
+	    if [ ! -e $(DSTROOT)$(MERGEBIN)/$$f ]; then \
+	        ln $(DSTROOT)$(MERGEBIN)/$$fv $(DSTROOT)$(MERGEBIN)/$$f; \
+	    fi || exit 1; \
+	done && \
+	cd $(DSTROOT)/System/Library/Frameworks/Python.framework/Versions/$(DEFAULT)/Extras/bin && \
+	for f in *; do \
+	    sed -e '/^1a/,/^\./d' -e "s/@VERSION@/$(DEFAULT)/g" $(FIX)/scriptvers.ed | ed - $$f || exit 1; \
+	done
+else
 DUMMY = dummy.py
 mergebin:
 	mkdir -p $(DSTROOT)$(MERGEBIN)
@@ -111,14 +133,15 @@ mergebin:
 	    done || exit 1; \
 	done
 	rm -f $(DSTROOT)$(MERGEBIN)/$(DUMMY)
+endif
+
 
-MERGEVERSIONS = \
-    System
 mergeversions:
 	@set -x && \
 	for vers in $(VERSIONS); do \
 	    cd $(OBJROOT)/$$vers/DSTROOT && \
-	    rsync -Ra $(MERGEVERSIONS) $(DSTROOT) || exit 1; \
+	    rsync -Ra System $(DSTROOT) || exit 1; \
+	    rsync -Ra AppleInternal/Library/Python $(DSTROOT) || exit 1; \
 	done
 
 MERGEMAN = usr/share/man

CMakeLists.txt

@@ -18,7 +18,7 @@ install: realinstall postinstall
 
 realinstall: $(DIR) custompatching
 	cd $(DIR) && \
-	ARCHFLAGS="$(RC_CFLAGS)" \
+	ARCHFLAGS="$(RC_CFLAGS) -iwithsysroot /usr/local/libressl/include -L$(SDKROOT)/usr/local/libressl/lib" \
 	python setup.py install --home="$(EXTRAS)" --root="$(DSTROOT)" $(SETUPARGS)
 
 # allow custom patching before running setup.py