summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--patches/ncurses-6.0.local.patch33
-rw-r--r--patches/ncurses-6.1.local.patch59
l---------patches/ncurses_host-6.1.local.patch1
l---------patches/ncursestw-6.0.local.patch1
l---------patches/ncursestw_host-6.1.local.patch1
l---------patches/ncursesw-6.0.local.patch1
-rw-r--r--patches/ncursesw_host-6.0.local.patch67
l---------vars/ncurses_host.vars1
-rw-r--r--vars/ncursestw_host.vars13
9 files changed, 72 insertions, 105 deletions
diff --git a/patches/ncurses-6.0.local.patch b/patches/ncurses-6.0.local.patch
deleted file mode 100644
index 6b86c27b..00000000
--- a/patches/ncurses-6.0.local.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- ncurses-6.0/configure.orig 2015-08-05 09:20:32.000000000 +0000
-+++ ncurses-6.0/configure 2016-02-23 11:33:12.718112802 +0000
-@@ -5856,7 +5856,7 @@
- LD_RPATH_OPT="-rpath "
- fi
- ;;
--(linux*|gnu*|k*bsd*-gnu)
-+(linux*|gnu*|k*bsd*-gnu|midipix*)
- LD_RPATH_OPT="-Wl,-rpath,"
- ;;
- (openbsd[2-9].*|mirbsd*)
-@@ -6188,7 +6188,7 @@
- fi
- cf_cv_rm_so_locs=yes
- ;;
-- (linux*|gnu*|k*bsd*-gnu)
-+ (linux*|gnu*|k*bsd*-gnu|midipix*)
- if test "$DFT_LWR_MODEL" = "shared" ; then
- LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
---- ncurses-6.0/misc/Makefile.in.orig 2015-08-05 23:15:41.000000000 +0000
-+++ ncurses-6.0/misc/Makefile.in 2016-06-23 08:40:43.767712775 +0000
-@@ -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 :
diff --git a/patches/ncurses-6.1.local.patch b/patches/ncurses-6.1.local.patch
index 52448cac..3cad8166 100644
--- a/patches/ncurses-6.1.local.patch
+++ b/patches/ncurses-6.1.local.patch
@@ -32,9 +32,62 @@ diff -ru a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
LDFLAGS=
if test "$libdir" != "/usr/lib" ; then
LDFLAGS="$LDFLAGS -L\${libdir}"
-diff -ru a/misc/Makefile.in b/misc/Makefile.in
---- a/misc/Makefile.in 2017-12-31 20:34:42.000000000 +0000
-+++ b/misc/Makefile.in 2019-08-19 14:51:50.598061950 +0000
+--- ncurses-6.1/misc/run_tic.in.orig 2017-10-24 00:16:22.000000000 +0000
++++ ncurses-6.1/misc/run_tic.in 2019-10-11 16:25:12.380000000 +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}
+--- ncurses-6.1/misc/Makefile.in.orig 2017-12-31 20:34:42.000000000 +0000
++++ ncurses-6.1/misc/Makefile.in 2019-10-11 16:27:12.376000000 +0000
+@@ -83,17 +83,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
+@@ -101,7 +101,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@@cf_config_suffix@-config
@@ -113,12 +113,12 @@
# pkg-config is not installed. Work around that by creating the library
# directory during this rule:
diff --git a/patches/ncurses_host-6.1.local.patch b/patches/ncurses_host-6.1.local.patch
new file mode 120000
index 00000000..4c06615b
--- /dev/null
+++ b/patches/ncurses_host-6.1.local.patch
@@ -0,0 +1 @@
+ncurses-6.1.local.patch \ No newline at end of file
diff --git a/patches/ncursestw-6.0.local.patch b/patches/ncursestw-6.0.local.patch
deleted file mode 120000
index 59cdfd8c..00000000
--- a/patches/ncursestw-6.0.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-ncurses-6.0.local.patch \ No newline at end of file
diff --git a/patches/ncursestw_host-6.1.local.patch b/patches/ncursestw_host-6.1.local.patch
new file mode 120000
index 00000000..4c06615b
--- /dev/null
+++ b/patches/ncursestw_host-6.1.local.patch
@@ -0,0 +1 @@
+ncurses-6.1.local.patch \ No newline at end of file
diff --git a/patches/ncursesw-6.0.local.patch b/patches/ncursesw-6.0.local.patch
deleted file mode 120000
index 59cdfd8c..00000000
--- a/patches/ncursesw-6.0.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-ncurses-6.0.local.patch \ No newline at end of file
diff --git a/patches/ncursesw_host-6.0.local.patch b/patches/ncursesw_host-6.0.local.patch
deleted file mode 100644
index a4f46e76..00000000
--- a/patches/ncursesw_host-6.0.local.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- 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/ncurses_host.vars b/vars/ncurses_host.vars
new file mode 120000
index 00000000..b37b4636
--- /dev/null
+++ b/vars/ncurses_host.vars
@@ -0,0 +1 @@
+ncursestw_host.vars \ No newline at end of file
diff --git a/vars/ncursestw_host.vars b/vars/ncursestw_host.vars
new file mode 100644
index 00000000..850a124d
--- /dev/null
+++ b/vars/ncursestw_host.vars
@@ -0,0 +1,13 @@
+#
+# set -o errexit -o noglob are assumed.
+#
+
+pkg_ncurses_host_install_make_pre() {
+ unset LD_LIBRARY_PATH;
+};
+
+pkg_ncursestw_host_install_make_pre() {
+ pkg_ncurses_host_install_make_pre "${@}";
+};
+
+# vim:filetype=sh
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 14:38:00 +0000