diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-10-11 16:33:37 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-10-11 16:33:37 +0000 |
| commit | b5c37fd879eeb9025db34aefaa46c55c1f7ad3ff (patch) | |
| tree | f80ee184a7d4b33c0c1d624d4d4a0e24def4b978 /patches/ncurses-6.1.local.patch | |
| parent | a9d4e0c31878c583ffaf67a98673178808c0a8f5 (diff) | |
| download | midipix_build-b5c37fd879eeb9025db34aefaa46c55c1f7ad3ff.tar.bz2 midipix_build-b5c37fd879eeb9025db34aefaa46c55c1f7ad3ff.tar.xz | |
patches/ncurses{{,{t,}w},w_host}-6.0.local.patch: removes obsolete patch.
patches/ncurses{,tw}{,_host}-6.1.local.patch: updated.
vars/ncurses{,tw}_host.vars: unset ${LD_LIBRARY_PATH} pre-install.
Diffstat (limited to 'patches/ncurses-6.1.local.patch')
| -rw-r--r-- | patches/ncurses-6.1.local.patch | 59 |
1 files changed, 56 insertions, 3 deletions
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: |