patches/ncursesw_host-6.0.local.patch: correctly install share/{tabset,terminfo}/.

vars/python[23]_host.vars:pkg_python[23]_host_fetch_download(): provisional sbpython[23]/project/config/cfgdefs.sh patch.

3 files changed, 75 insertions, 0 deletions

diff --git a/patches/ncursesw_host-6.0.local.patch b/patches/ncursesw_host-6.0.local.patch
new file mode 100644
index 00000000..a4f46e76
--- /dev/null
+++ b/patches/ncursesw_host-6.0.local.patch
@@ -0,0 +1,67 @@
+--- ncurses-6.0/misc/Makefile.in.orig	2015-08-05 23:15:41.000000000 +0000
++++ ncurses-6.0/misc/Makefile.in	2019-03-13 12:31:25.236000000 +0000
+@@ -84,17 +84,17 @@
+ install : @MISC_INSTALL_DATA@ install.libs
+ 
+ install.data :	terminfo.tmp \
+-		$(DESTDIR)$(libdir) \
+-		$(DESTDIR)$(datadir) \
+-		$(DESTDIR)$(tabsetdir)
++		$(DESTDIR)/lib \
++		$(DESTDIR)/share \
++		$(DESTDIR)/share/tabset
+ 	DESTDIR=${DESTDIR} \
+-	prefix=${prefix} \
+-	exec_prefix=${exec_prefix} \
+-	bindir=${bindir} \
++	prefix="" \
++	exec_prefix="" \
++	bindir=bin \
+ 	top_srcdir=${top_srcdir} \
+ 	srcdir=${srcdir} \
+-	datadir=${datadir} \
+-	ticdir=${ticdir} \
++	datadir=share \
++	ticdir=share/terminfo \
+ 	source=terminfo.tmp \
+ 	cross_compiling=@cross_compiling@ \
+ 	$(SHELL) ./run_tic.sh
+@@ -102,7 +102,7 @@
+ 		$(SHELL) -c 'for i in * ; do \
+ 			if test -f $$i ; then \
+ 			echo installing $$i; \
+-			$(INSTALL_DATA) $$i $(DESTDIR)$(tabsetdir)/$$i; \
++			$(INSTALL_DATA) $$i $(DESTDIR)/share/tabset/$$i; \
+ 			fi; done'
+ 
+ NCURSES_CONFIG	= ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
+@@ -110,8 +110,8 @@
+ install.libs :: $(DESTDIR)$(bindir) ncurses-config
+ 	$(INSTALL_SCRIPT) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
+ 
+-@MAKE_PC_FILES@install.libs :: pc-files $(DESTDIR)$(PKG_CONFIG_LIBDIR)
+-@MAKE_PC_FILES@	$(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
++@MAKE_PC_FILES@install.libs :: pc-files $(PKG_CONFIG_LIBDIR)
++@MAKE_PC_FILES@	$(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(PKG_CONFIG_LIBDIR)/$$name; done'
+ 
+ @MAKE_PC_FILES@sources :: pc-files
+ @MAKE_PC_FILES@pc-files :
+--- ncurses-6.0/misc/run_tic.in.orig	2012-10-06 19:00:51.000000000 +0000
++++ ncurses-6.0/misc/run_tic.in	2019-03-13 12:31:25.236000000 +0000
+@@ -42,16 +42,8 @@
+ #	make install.data
+ 
+ : ${suffix:=@EXEEXT@}
+-: ${DESTDIR:=@DESTDIR@}
+-: ${prefix:=@prefix@}
+-: ${exec_prefix:=@exec_prefix@}
+-: ${bindir:=@bindir@}
+-: ${top_srcdir:=@top_srcdir@}
+-: ${srcdir:=@srcdir@}
+ : ${datarootdir:=@datarootdir@}
+-: ${datadir:=@datadir@}
+ : ${TIC_PATH:=@TIC_PATH@}
+-: ${ticdir:=@TERMINFO@}
+ : ${source:=@TERMINFO_SRC@}
+ : ${LN_S:="@LN_S@"}
+ : ${cross_compiling:=no}
diff --git a/vars/python2_host.vars b/vars/python2_host.vars
index c6343f20..d94910dd 100644
--- a/vars/python2_host.vars
+++ b/vars/python2_host.vars
@@ -5,6 +5,10 @@
 pkg_python2_host_fetch_download() {
 	ex_rtl_fileop rm "${PKG_BASE_DIR}/sbpython2";
 	ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main";
+	ex_rtl_fileop cp ../sbpython2/project/config/cfgdefs.sh ../sbpython2/project/config/cfgdefs.sh.orig;
+	sed -i"" -e"s/-ltinfo/&w/" -e"s/mb_ncurses_libs='\([^']\+\)'/mb_ncurses_libs='\1 -ltinfow'/" ../sbpython2/project/config/cfgdefs.sh;
+	sed -i"" -e'108a\
+cfgtest_ldflags_append "-L$mb_prefix/lib"' ../sbpython2/project/config/cfgdefs.sh;
 	ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract;
 };
 
diff --git a/vars/python3_host.vars b/vars/python3_host.vars
index f2c72716..b2456b42 100644
--- a/vars/python3_host.vars
+++ b/vars/python3_host.vars
@@ -5,6 +5,10 @@
 pkg_python3_host_fetch_download() {
 	ex_rtl_fileop rm "${PKG_BASE_DIR}/sbpython3";
 	ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main";
+	ex_rtl_fileop cp ../sbpython3/project/config/cfgdefs.sh ../sbpython3/project/config/cfgdefs.sh.orig;
+	sed -i"" -e"s/-ltinfo/&w/" -e"s/mb_ncurses_libs='\([^']\+\)'/mb_ncurses_libs='\1 -ltinfow'/" ../sbpython3/project/config/cfgdefs.sh;
+	sed -i"" -e'108a\
+cfgtest_ldflags_append "-L$mb_prefix/lib"' ../sbpython3/project/config/cfgdefs.sh;
 	ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract;
 };