Bladeren bron

fix macos x host compile

Waldemar Brodkorb 12 jaren geleden
bovenliggende
commit
caec125486
3 gewijzigde bestanden met toevoegingen van 21 en 3 verwijderingen
  1. 1 1
      package/python2/Makefile
  2. 10 1
      package/python2/patches/patch-Makefile_pre_in
  3. 10 1
      package/python2/patches/patch-setup_py

+ 1 - 1
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
 

+ 10 - 1
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

+ 10 - 1
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'],