[pkgsrc/trunk]: pkgsrc/devel/ncurses Run the built tic with the built libncur...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef158885a7ba
branches:  trunk
changeset: 438398:ef158885a7ba
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Sep 07 11:11:41 2020 +0000

description:
Run the built tic with the built libncurses, not the installed one, as
the build system intends (but fails) to do. This fixes "make package",
for instance, when tic needs to use a newly provided symbol.

This fix applies to fewer dynamic linkers than ${WRKSRC}/misc/shlib --
not the macOS dyld, for instance -- so making the provided script work
as intended will be more widely effective than this patch.

diffstat:

 devel/ncurses/Makefile.common                |   7 +++++-
 devel/ncurses/distinfo                       |   3 +-
 devel/ncurses/patches/patch-misc_run__tic.in |  29 ++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diffs (71 lines):

diff -r ead9efa58bd5 -r ef158885a7ba devel/ncurses/Makefile.common
--- a/devel/ncurses/Makefile.common     Mon Sep 07 11:10:38 2020 +0000
+++ b/devel/ncurses/Makefile.common     Mon Sep 07 11:11:41 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2020/06/01 07:01:19 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.47 2020/09/07 11:11:41 schmonz Exp $
 #
 # used by devel/ncurses/Makefile
 # used by devel/ncursesw/Makefile
@@ -38,6 +38,11 @@
 SUBST_SED.rpath+=      -e "s|-L\\(.libdir\\)|${COMPILER_RPATH_FLAG}\\1 -L\\1|"
 SUBST_MESSAGE.rpath=   Fixing rpath in ncurses-config.
 
+SUBST_CLASSES+=                setenv
+SUBST_FILES.setenv=    misc/run_tic.in
+SUBST_STAGE.setenv=    pre-configure
+SUBST_VARS.setenv=     SETENV
+
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS.Darwin+=        --disable-mixed-case
diff -r ead9efa58bd5 -r ef158885a7ba devel/ncurses/distinfo
--- a/devel/ncurses/distinfo    Mon Sep 07 11:10:38 2020 +0000
+++ b/devel/ncurses/distinfo    Mon Sep 07 11:11:41 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2020/09/04 10:33:14 js Exp $
+$NetBSD: distinfo,v 1.46 2020/09/07 11:11:41 schmonz Exp $
 
 SHA1 (ncurses-6.2.tar.gz) = 56e410fb77f2b5501a0b2f6a995376f3cefe1097
 RMD160 (ncurses-6.2.tar.gz) = bedfe81f33b3e55e44d14126c9c2821d7f222701
@@ -6,6 +6,7 @@
 Size (ncurses-6.2.tar.gz) = 3425862 bytes
 SHA1 (patch-c++_Makefile.in) = 32611b5fe66df676f35c39212402b77d99ca8e19
 SHA1 (patch-configure) = c0074d959a9981b3811519328f42a0c18a51c5a4
+SHA1 (patch-misc_run__tic.in) = a6a8dd89da1a2fbbc5fcabfa6d41ce3a41b75722
 SHA1 (patch-misc_terminfo.src) = d9eede4b159358f396693141ed9d9c2a76647917
 SHA1 (patch-mk-1st.awk) = adf9d68ee565da80078cfcfa8969a4ef806d65de
 SHA1 (patch-ncurses_base_lib_initscr.c) = e514e2bb4862a2617b30c6ad715bc1c50cb76f0e
diff -r ead9efa58bd5 -r ef158885a7ba devel/ncurses/patches/patch-misc_run__tic.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ncurses/patches/patch-misc_run__tic.in      Mon Sep 07 11:11:41 2020 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-misc_run__tic.in,v 1.1 2020/09/07 11:11:41 schmonz Exp $
+
+Run the built tic with the built libncurses, not the installed one, as
+the build system intends (but fails) to do. This fixes "make package",
+for instance, when tic needs to use a newly provided symbol.
+
+This fix applies to fewer dynamic linkers than ${WRKSRC}/misc/shlib --
+not the macOS dyld, for instance -- so making the provided script work
+as intended will be more widely effective than this patch.
+
+--- misc/run_tic.in.orig       2020-02-02 23:34:34.000000000 +0000
++++ misc/run_tic.in
+@@ -76,10 +76,13 @@ then
+                       ;;
+               esac
+               export PATH
+-              if test @DFT_LWR_MODEL@ = shared
++              if test @DFT_LWR_MODEL@ = shared || test @DFT_LWR_MODEL@ = libtool
+               then
+-                      SHLIB="sh $srcdir/shlib"
+-                      TIC_PATH="$SHLIB tic"
++                      #SHLIB="sh $srcdir/shlib"
++                      #TIC_PATH="$SHLIB tic"
++                      # shlib is supposed to set this (or OPSYS equivalent)
++                      # for its child, but sure seems not to
++                      TIC_PATH="@SETENV@ LD_LIBRARY_PATH=${DESTDIR}${prefix}/lib tic"
+               else
+                       TIC_PATH="tic"
+               fi