cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python tweaks;

Browse Source 
- sync WANTLIB
- use do-gen instead of post-patch for the "subst and regen
autoconf files" target
- ALL_TARGET needs setting differently between 2.7 and 3.x;
rather than checking against 3.6 for "all", check against 2.7
for "all ./Lib/plat-openbsd6". needed for newer 3.x.
This commit is contained in:
sthen 2019-04-21 09:32:19 +00:00
parent 62802f8697
commit c3e90e6a46
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/python/2.7/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.59 2019/04/03 05:23:40 rpointel Exp $
# $OpenBSD: Makefile,v 1.60 2019/04/21 09:32:19 sthen Exp $
# IMPORTANT! If you make any changes to the Python ports, be sure
# to also update files/CHANGES.OpenBSD for your change. This is a
@ -10,6 +10,8 @@ PATCHLEVEL = .16
SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
REVISION-main = 0
CONFIGURE_ARGS += --with-ensurepip=no
PORTROACH = limit:^2\.7

3
lang/python/2.7/pkg/PLIST-tools
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tools,v 1.11 2018/05/03 20:09:25 rpointel Exp $
@comment $OpenBSD: PLIST-tools,v 1.12 2019/04/21 09:32:19 sthen Exp $
@option no-default-conflict
@option is-branch
@conflict python-tools->=2.7,<2.8
@ -212,7 +212,6 @@ lib/python2.7/Tools/scripts/pickle2db.py
lib/python2.7/Tools/scripts/pindent.py
lib/python2.7/Tools/scripts/ptags.py
lib/python2.7/Tools/scripts/pydoc
@comment lib/python2.7/Tools/scripts/pydoc.orig
lib/python2.7/Tools/scripts/pydocgui.pyw
lib/python2.7/Tools/scripts/pysource.py
lib/python2.7/Tools/scripts/redemo.py

4
lang/python/3.6/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2019/02/28 09:11:28 rpointel Exp $
# $OpenBSD: Makefile,v 1.18 2019/04/21 09:32:19 sthen Exp $
# IMPORTANT! If you make any changes to the Python ports, be sure
# to also update files/CHANGES.OpenBSD for your change. This is a
@ -9,6 +9,8 @@ VERSION = 3.6
PATCHLEVEL = .8
SHARED_LIBS = python3.6m 0.0
VERSION_SPEC = >=3.6,<3.7
REVISION-main = 1
REVISION = 0
CONFIGURE_ARGS += --with-ensurepip=no

15
lang/python/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.127 2018/10/31 23:48:19 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.128 2019/04/21 09:32:19 sthen Exp $
# IMPORTANT! If you make any changes to the Python ports, be sure
# to also update files/CHANGES.OpenBSD for your change. This is a
@ -69,8 +69,8 @@ LIB_DEPENDS-main = ${MODGCC4_CPPLIBDEP} \
devel/libffi \
devel/gettext
RUN_DEPENDS-main =
WANTLIB-main = bz2 c crypto expat ffi intl m ncursesw panelw pthread \
readline sqlite3 ssl ${COMPILER_LIBCXX} util z
WANTLIB-main = bz2 c crypto expat ffi intl m curses panel pthread \
readline sqlite3 ssl util z
.if ${VERSION} != "2.7"
LIB_DEPENDS-main += archivers/xz
WANTLIB-main += lzma
@ -128,17 +128,18 @@ FAKE_FLAGS += RANLIB=:
# and QtWebKit require W|X mappings.
USE_WXNEEDED = Yes
.if ${VERSION} == "3.6"
ALL_TARGET = all
.else
.if ${VERSION} == "2.7"
ALL_TARGET = all ./Lib/plat-openbsd6
.else
ALL_TARGET = all
.endif
post-extract:
rm -r ${WRKDIST}/Modules/expat
post-patch:
do-gen:
${SUBST_CMD} ${WRKSRC}/configure.ac
${MODGNU_gen}
post-configure:
@cd ${WRKSRC} && ${MAKE_PROGRAM} Makefile