From 30b734b4fc70876e2f5860119f684bd69c4f3779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Tue, 6 Apr 2021 12:47:45 +0100 Subject: subr/pkg_configure_patch.subr: infer -pnum from whether only one or both of ${PKG_{URL,URLS_GIT}} are present. patches/python2_host-2.7.15.local.patch: updated. patches/python3_host-3.6.3.local.patch: updated. --- patches/python2_host-2.7.15.local.patch | 8 ++++---- patches/python3_host-3.6.3.local.patch | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'patches') diff --git a/patches/python2_host-2.7.15.local.patch b/patches/python2_host-2.7.15.local.patch index c237daa8..d432aecb 100644 --- a/patches/python2_host-2.7.15.local.patch +++ b/patches/python2_host-2.7.15.local.patch @@ -1,5 +1,5 @@ ---- ./build/sbpython2/project/config/cfgdefs.sh.orig 2021-04-06 10:42:07.823432394 +0100 -+++ ./build/sbpython2/project/config/cfgdefs.sh 2021-04-06 10:46:44.345427809 +0100 +--- build/sbpython2/project/config/cfgdefs.sh.orig 2021-04-06 10:42:07.823432394 +0100 ++++ build/sbpython2/project/config/cfgdefs.sh 2021-04-06 10:46:44.345427809 +0100 @@ -106,6 +106,7 @@ if [ -n "$pycfg_pymalloc" ]; then cfgtest_cflags_append '-DWITH_PYMALLOC' @@ -19,8 +19,8 @@ if cfgtest_library_presence $mb_ncurses_tinfo; then mb_ncurses_libs="$mb_ncurses_libs $mb_ncurses_tinfo" ---- ./build/sbpython2/project/pyexts.mk.orig 2021-04-06 10:42:07.827432250 +0100 -+++ ./build/sbpython2/project/pyexts.mk 2021-04-06 10:49:55.946499708 +0100 +--- build/sbpython2/project/pyexts.mk.orig 2021-04-06 10:42:07.827432250 +0100 ++++ build/sbpython2/project/pyexts.mk 2021-04-06 10:49:55.946499708 +0100 @@ -1017,7 +1017,7 @@ PYEXT_OSSAUDIODEV_LOBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.lo) PYEXT_OSSAUDIODEV_OBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.o) diff --git a/patches/python3_host-3.6.3.local.patch b/patches/python3_host-3.6.3.local.patch index cd0bb169..7ec6deea 100644 --- a/patches/python3_host-3.6.3.local.patch +++ b/patches/python3_host-3.6.3.local.patch @@ -1,5 +1,5 @@ ---- ./build/sbpython3/project/config/cfgdefs.sh.orig 2021-04-05 11:17:27.238909690 +0100 -+++ ./build/sbpython3/project/config/cfgdefs.sh 2021-04-06 10:51:52.866273106 +0100 +--- build/sbpython3/project/config/cfgdefs.sh.orig 2021-04-05 11:17:27.238909690 +0100 ++++ build/sbpython3/project/config/cfgdefs.sh 2021-04-06 10:51:52.866273106 +0100 @@ -106,6 +106,7 @@ if [ -n "$pycfg_pymalloc" ]; then cfgtest_cflags_append '-DWITH_PYMALLOC' @@ -19,8 +19,8 @@ if cfgtest_library_presence $mb_ncurses_tinfo; then mb_ncurses_libs="$mb_ncurses_libs $mb_ncurses_tinfo" ---- ./build/sbpython3/project/variants/3.6.3/pyexts.mk.orig 2021-04-05 11:17:27.246909408 +0100 -+++ ./build/sbpython3/project/variants/3.6.3/pyexts.mk 2021-04-06 10:51:52.898271950 +0100 +--- build/sbpython3/project/variants/3.6.3/pyexts.mk.orig 2021-04-05 11:17:27.246909408 +0100 ++++ build/sbpython3/project/variants/3.6.3/pyexts.mk 2021-04-06 10:51:52.898271950 +0100 @@ -1012,7 +1012,7 @@ PYEXT_OSSAUDIODEV_LOBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.lo) PYEXT_OSSAUDIODEV_OBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.o) @@ -30,8 +30,8 @@ PYEXT_OSSAUDIODEV_STATIC = pyext/ossaudiodev$(OS_ARCHIVE_EXT) $(PYEXT_OSSAUDIODEV_SHARED): $(PYEXT_OSSAUDIODEV_LOBJS) ---- ./build/sbpython3/project/variants/3.7.1/pyexts.mk.orig 2021-04-05 11:17:27.246909408 +0100 -+++ ./build/sbpython3/project/variants/3.7.1/pyexts.mk 2021-04-06 10:51:52.930270793 +0100 +--- build/sbpython3/project/variants/3.7.1/pyexts.mk.orig 2021-04-05 11:17:27.246909408 +0100 ++++ build/sbpython3/project/variants/3.7.1/pyexts.mk 2021-04-06 10:51:52.930270793 +0100 @@ -1068,7 +1068,7 @@ PYEXT_OSSAUDIODEV_LOBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.lo) PYEXT_OSSAUDIODEV_OBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.o) @@ -41,8 +41,8 @@ PYEXT_OSSAUDIODEV_STATIC = pyext/ossaudiodev$(OS_ARCHIVE_EXT) $(PYEXT_OSSAUDIODEV_SHARED): $(PYEXT_OSSAUDIODEV_LOBJS) ---- ./build/sbpython3/project/variants/3.7.2/pyexts.mk.orig 2021-04-05 11:17:27.250909267 +0100 -+++ ./build/sbpython3/project/variants/3.7.2/pyexts.mk 2021-04-06 10:51:52.958269781 +0100 +--- build/sbpython3/project/variants/3.7.2/pyexts.mk.orig 2021-04-05 11:17:27.250909267 +0100 ++++ build/sbpython3/project/variants/3.7.2/pyexts.mk 2021-04-06 10:51:52.958269781 +0100 @@ -1068,7 +1068,7 @@ PYEXT_OSSAUDIODEV_LOBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.lo) PYEXT_OSSAUDIODEV_OBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.o) -- cgit v1.2.3