diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-04-06 11:26:29 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-04-06 11:26:29 +0100 |
| commit | 0b34be07625808976bb62318a2520960fdbc4926 (patch) | |
| tree | 254d3b5db329fb6a2cc082f5a243e684fc9c1f6b /patches | |
| parent | 2c5ce2e826a8af69d14429ea4da158bf94d31ca7 (diff) | |
| download | midipix_build-0b34be07625808976bb62318a2520960fdbc4926.tar.bz2 midipix_build-0b34be07625808976bb62318a2520960fdbc4926.tar.xz | |
groups/010.host_deps.group:python[23]_host:${PKG_URLS_GIT}: update subdir to build/sbpython[23].
groups/010.host_deps.group:python2_host:${PKG_SUBDIR}: set to Python-${PKG_PYTHON2_HOST_VERSION}.
groups/221.native_packages_dev.group:python[23]:${PKG_URLS_GIT}: update subdir to build/sbpython[23].
groups/221.native_packages_dev.group:python2:${PKG_SUBDIR}: set to Python-${PKG_PYTHON2_VERSION}.
patches/python2_host-2.7.15.local.patch: split from vars/python2_host.vars.
patches/python3_host-3.6.3.local.patch: split from vars/python3_host.vars.
vars/python[23]{_host,}.vars: deleted
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/python2_host-2.7.15.local.patch | 32 | ||||
| -rw-r--r-- | patches/python3_host-3.6.3.local.patch | 54 |
2 files changed, 86 insertions, 0 deletions
diff --git a/patches/python2_host-2.7.15.local.patch b/patches/python2_host-2.7.15.local.patch new file mode 100644 index 00000000..c237daa8 --- /dev/null +++ b/patches/python2_host-2.7.15.local.patch @@ -0,0 +1,32 @@ +--- ./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' + fi ++cfgtest_ldflags_append "-L$mb_prefix/lib" + } + + +@@ -306,8 +307,8 @@ + fi + + # ncurses libs (common part) +- mb_ncurses_libs='-lpanelw -lncursesw' +- mb_ncurses_tinfo='-ltinfo' ++ mb_ncurses_libs='-lpanelw -lncursesw -ltinfow' ++ mb_ncurses_tinfo='-ltinfow' + + 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 +@@ -1017,7 +1017,7 @@ + PYEXT_OSSAUDIODEV_LOBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.lo) + PYEXT_OSSAUDIODEV_OBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.o) + +-PYEXT_OSSAUDIODEV_SHARED = pyext/ossaudiodev$(OS_LIB_SUFFIX) ++#PYEXT_OSSAUDIODEV_SHARED = pyext/ossaudiodev$(OS_LIB_SUFFIX) + PYEXT_OSSAUDIODEV_STATIC = pyext/ossaudiodev$(OS_ARCHIVE_EXT) + + $(PYEXT_OSSAUDIODEV_SHARED): $(PYEXT_OSSAUDIODEV_LOBJS) diff --git a/patches/python3_host-3.6.3.local.patch b/patches/python3_host-3.6.3.local.patch new file mode 100644 index 00000000..cd0bb169 --- /dev/null +++ b/patches/python3_host-3.6.3.local.patch @@ -0,0 +1,54 @@ +--- ./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' + fi ++cfgtest_ldflags_append "-L$mb_prefix/lib" + } + + +@@ -306,8 +307,8 @@ + fi + + # ncurses libs (common part) +- mb_ncurses_libs='-lpanelw -lncursesw' +- mb_ncurses_tinfo='-ltinfo' ++ mb_ncurses_libs='-lpanelw -lncursesw -ltinfow' ++ mb_ncurses_tinfo='-ltinfow' + + 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 +@@ -1012,7 +1012,7 @@ + PYEXT_OSSAUDIODEV_LOBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.lo) + PYEXT_OSSAUDIODEV_OBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.o) + +-PYEXT_OSSAUDIODEV_SHARED = pyext/ossaudiodev$(PYTHON_SOEXT) ++#PYEXT_OSSAUDIODEV_SHARED = pyext/ossaudiodev$(PYTHON_SOEXT) + 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 +@@ -1068,7 +1068,7 @@ + PYEXT_OSSAUDIODEV_LOBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.lo) + PYEXT_OSSAUDIODEV_OBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.o) + +-PYEXT_OSSAUDIODEV_SHARED = pyext/ossaudiodev$(PYTHON_SOEXT) ++#PYEXT_OSSAUDIODEV_SHARED = pyext/ossaudiodev$(PYTHON_SOEXT) + 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 +@@ -1068,7 +1068,7 @@ + PYEXT_OSSAUDIODEV_LOBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.lo) + PYEXT_OSSAUDIODEV_OBJS = $(PYEXT_OSSAUDIODEV_SRCS:.c=.o) + +-PYEXT_OSSAUDIODEV_SHARED = pyext/ossaudiodev$(PYTHON_SOEXT) ++#PYEXT_OSSAUDIODEV_SHARED = pyext/ossaudiodev$(PYTHON_SOEXT) + PYEXT_OSSAUDIODEV_STATIC = pyext/ossaudiodev$(OS_ARCHIVE_EXT) + + $(PYEXT_OSSAUDIODEV_SHARED): $(PYEXT_OSSAUDIODEV_LOBJS) |