diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-11-01 15:25:48 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-11-01 15:25:48 +0100 |
| commit | caec12548668dd7dd564ce732d8c77a76dfe4788 (patch) | |
| tree | 3e4c09bb3c2fc6d8ada6efb39d504f23f736aa60 | |
| parent | cfd377d779327c4aaed5b0b7317db794e74ade74 (diff) | |
fix macos x host compile
| -rw-r--r-- | package/python2/Makefile | 2 | ||||
| -rw-r--r-- | package/python2/patches/patch-Makefile_pre_in | 11 | ||||
| -rw-r--r-- | package/python2/patches/patch-setup_py | 11 |
3 files changed, 21 insertions, 3 deletions
diff --git a/package/python2/Makefile b/package/python2/Makefile index ad4b4d781..5c759eaca 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -96,7 +96,7 @@ CONFIGURE_ARGS:= --with-threads \ --without-cxx-main HOST_STYLE:= auto -HOST_CONFIGURE_ARGS:= --without-threads \ +HOST_CONFIGURE_ARGS:= --with-threads \ --disable-toolbox-glue \ --without-cxx-main diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in index 8c6aba5c2..26077c7fc 100644 --- a/package/python2/patches/patch-Makefile_pre_in +++ b/package/python2/patches/patch-Makefile_pre_in @@ -1,5 +1,5 @@ --- Python-2.7.5.orig/Makefile.pre.in 2013-05-12 05:32:49.000000000 +0200 -+++ Python-2.7.5/Makefile.pre.in 2013-10-30 14:10:07.000000000 +0100 ++++ Python-2.7.5/Makefile.pre.in 2013-11-01 14:54:24.000000000 +0100 @@ -227,6 +227,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ ########################################################################## # Parser @@ -8,6 +8,15 @@ PSRCS= \ Parser/acceler.c \ +@@ -456,7 +457,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx + *) quiet="";; \ + esac; \ + $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ +- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build ++ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py build + + # Build static library + # avoid long command lines, same as LIBRARY_OBJS @@ -593,7 +594,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) @$(MKDIR_P) Include diff --git a/package/python2/patches/patch-setup_py b/package/python2/patches/patch-setup_py index 0cb811de9..3a80230c2 100644 --- a/package/python2/patches/patch-setup_py +++ b/package/python2/patches/patch-setup_py @@ -1,5 +1,5 @@ --- Python-2.7.5.orig/setup.py 2013-05-12 05:32:54.000000000 +0200 -+++ Python-2.7.5/setup.py 2013-10-30 14:18:23.000000000 +0100 ++++ Python-2.7.5/setup.py 2013-11-01 14:53:38.000000000 +0100 @@ -74,7 +74,7 @@ def find_file(filename, std_dirs, paths) 'paths' is a list of additional locations to check; if the file is found in one of them, the resulting list will contain the directory. @@ -119,3 +119,12 @@ # This should work on any unixy platform ;-) # If the user has bothered specifying additional -I and -L flags # in OPT and LDFLAGS we might as well use them here. +@@ -837,7 +847,7 @@ class PyBuildExt(build_ext): + openssl_ver >= min_openssl_ver) + + if have_any_openssl: +- if have_usable_openssl: ++ if have_usable_openssl and host_platform != 'darwin': + # The _hashlib module wraps optimized implementations + # of hash functions from the OpenSSL library. + exts.append( Extension('_hashlib', ['_hashopenssl.c'], |