Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5758 from commodo/python-fix-macos-x-build

Browse source 
python,python3: attempt to fix Mac OS X host build issues
This commit is contained in:
Hannu Nyman 2018-03-14 23:10:52 +02:00 committed by GitHub
commit a296a374c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lang/python/python/Makefile
View file

@ -268,9 +268,13 @@ define PyPackage/python/filespec
endef endef
HOST_LDFLAGS += \ HOST_LDFLAGS += \
-Wl,--no-as-needed -lrt \
$$$$(pkg-config --static --libs libcrypto libssl) $$$$(pkg-config --static --libs libcrypto libssl)
ifeq ($(HOST_OS),Linux)
HOST_LDFLAGS += \
-Wl,--no-as-needed -lrt
endif
HOST_CONFIGURE_ARGS+= \ HOST_CONFIGURE_ARGS+= \
--without-cxx-main \ --without-cxx-main \
--without-pymalloc \ --without-pymalloc \
@ -278,7 +282,6 @@ HOST_CONFIGURE_ARGS+= \
--prefix=$(HOST_PYTHON_DIR) \ --prefix=$(HOST_PYTHON_DIR) \
--exec-prefix=$(HOST_PYTHON_DIR) \ --exec-prefix=$(HOST_PYTHON_DIR) \
--with-system-expat=$(STAGING_DIR_HOSTPKG) \ --with-system-expat=$(STAGING_DIR_HOSTPKG) \
--with-system-ffi=no \
--with-ensurepip=install \ --with-ensurepip=install \
CONFIG_SITE= CONFIG_SITE=

7
lang/python/python3/Makefile
View file

@ -264,9 +264,13 @@ define Py3Package/python3/filespec
endef endef
HOST_LDFLAGS += \ HOST_LDFLAGS += \
-Wl,--no-as-needed -lrt \
$$$$(pkg-config --static --libs libcrypto libssl) $$$$(pkg-config --static --libs libcrypto libssl)
ifeq ($(HOST_OS),Linux)
HOST_LDFLAGS += \
-Wl,--no-as-needed -lrt
endif
HOST_CONFIGURE_ARGS+= \ HOST_CONFIGURE_ARGS+= \
--without-cxx-main \ --without-cxx-main \
--without-pymalloc \ --without-pymalloc \
@ -274,7 +278,6 @@ HOST_CONFIGURE_ARGS+= \
--prefix=$(HOST_PYTHON3_DIR) \ --prefix=$(HOST_PYTHON3_DIR) \
--exec-prefix=$(HOST_PYTHON3_DIR) \ --exec-prefix=$(HOST_PYTHON3_DIR) \
--with-system-expat=$(STAGING_DIR_HOSTPKG) \ --with-system-expat=$(STAGING_DIR_HOSTPKG) \
--with-system-ffi=no \
--with-ensurepip=install \ --with-ensurepip=install \
CONFIG_SITE= CONFIG_SITE=