diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2021-06-04 14:18:37 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2021-06-10 17:12:30 +0000 |
| commit | 712927d32f8c753ba4e4ff250d9b795bf7391383 (patch) | |
| tree | 13131c6062c9913a7753ce6721021bd0c69dddd9 | |
| parent | 3ea5cea62b96b9cc28c69f4b753b03d18fbf5154 (diff) | |
| download | ports-712927d32f8c753ba4e4ff250d9b795bf7391383.tar.gz ports-712927d32f8c753ba4e4ff250d9b795bf7391383.zip | |
lang/python3[89]: remove LIBFFI option
Python now requires libffi from ports and does not build with LIBFFI
disabled, so remove the option.
PR: 256141
Reported by: majo-bugs.freebsd.org@cerny.sk
Reviewed by: koobs (python)
Approved by: koobs (python)
MFH: 2020Q2 (bugfix)
(cherry picked from commit 64be746e535b0ca620460c95a819b81ac2159d01)
| -rw-r--r-- | lang/python38/Makefile | 17 | ||||
| -rw-r--r-- | lang/python39/Makefile | 17 |
2 files changed, 10 insertions, 24 deletions
diff --git a/lang/python38/Makefile b/lang/python38/Makefile index b0d976496459..1e5ce8fae508 100644 --- a/lang/python38/Makefile +++ b/lang/python38/Makefile @@ -13,6 +13,8 @@ COMMENT= Interpreted object-oriented programming language LICENSE= PSFL +LIB_DEPENDS= libffi.so:devel/libffi + USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes @@ -29,7 +31,8 @@ PYTHON_VERSION= python${PYTHON_VER} PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm -CONFIGURE_ARGS+= --enable-shared --without-ensurepip +CONFIGURE_ARGS+= --enable-shared --without-ensurepip \ + --with-system-ffi CONFIGURE_ENV+= OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}" # Null out OPT to respect user CFLAGS and remove optimizations INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files @@ -48,13 +51,12 @@ PLIST_SUB= ABI=${ABIFLAGS} \ XYZDOT=${PORTVERSION} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 -OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC +OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC OPTIONS_DEFAULT= LIBFFI PYMALLOC OPTIONS_RADIO= HASH OPTIONS_RADIO_HASH= FNV SIPHASH OPTIONS_SUB= yes -LIBFFI_DESC= Use libffi from ports instead of bundled version NLS_DESC= Enable gettext support for the locale module PYMALLOC_DESC= Enable specialized mallocs @@ -68,9 +70,6 @@ SIPHASH_CONFIGURE_ON= --with-hash-algorithm=siphash24 DEBUG_CONFIGURE_WITH= pydebug IPV6_CONFIGURE_ENABLE= ipv6 -LIBFFI_CONFIGURE_ON= --with-system-ffi -LIBFFI_LIB_DEPENDS= libffi.so:devel/libffi - # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat # to break in Python 2.7, or preprocessor complaints in Python >= 3.3 # Upstream Issue: https://bugs.python.org/issue6299 @@ -95,12 +94,6 @@ PLIST_FILES+= bin/python${PYTHON_VER}${ABIFLAGS} \ libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}-embed.pc .endif -# https://bugs.python.org/issue22521 -# https://bugs.python.org/issue23042 -.if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI} -BROKEN= You must use libffi from ports on i386. Enable the LIBFFI option -.endif - .if ${ARCH} == sparc64 CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif diff --git a/lang/python39/Makefile b/lang/python39/Makefile index 5836df0d3b61..8306283f0fab 100644 --- a/lang/python39/Makefile +++ b/lang/python39/Makefile @@ -13,6 +13,8 @@ COMMENT= Interpreted object-oriented programming language LICENSE= PSFL +LIB_DEPENDS= libffi.so:devel/libffi + USES= compiler:c11 cpe ncurses pathfix pkgconfig readline:port \ shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in @@ -30,7 +32,8 @@ PYTHON_VERSION= python${PYTHON_VER} PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm -CONFIGURE_ARGS+= --enable-shared --without-ensurepip +CONFIGURE_ARGS+= --enable-shared --without-ensurepip \ + --with-system-ffi CONFIGURE_ENV+= OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}" # Null out OPT to respect user CFLAGS and remove optimizations INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files @@ -49,13 +52,12 @@ PLIST_SUB= ABI=${ABIFLAGS} \ XYZDOT=${PORTVERSION} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 -OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC +OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC OPTIONS_DEFAULT= LIBFFI PYMALLOC OPTIONS_RADIO= HASH OPTIONS_RADIO_HASH= FNV SIPHASH OPTIONS_SUB= yes -LIBFFI_DESC= Use libffi from ports instead of bundled version NLS_DESC= Enable gettext support for the locale module PYMALLOC_DESC= Enable specialized mallocs @@ -69,9 +71,6 @@ SIPHASH_CONFIGURE_ON= --with-hash-algorithm=siphash24 DEBUG_CONFIGURE_WITH= pydebug IPV6_CONFIGURE_ENABLE= ipv6 -LIBFFI_CONFIGURE_ON= --with-system-ffi -LIBFFI_LIB_DEPENDS= libffi.so:devel/libffi - # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat # to break in Python 2.7, or preprocessor complaints in Python >= 3.3 # Upstream Issue: https://bugs.python.org/issue6299 @@ -96,12 +95,6 @@ PLIST_FILES+= bin/python${PYTHON_VER}${ABIFLAGS} \ libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}-embed.pc .endif -# https://bugs.python.org/issue22521 -# https://bugs.python.org/issue23042 -.if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI} -BROKEN= You must use libffi from ports on i386. Enable the LIBFFI option -.endif - .if ${ARCH} == sparc64 CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif |