diff options
| author | jlam <jlam> | 1999-07-16 18:43:48 +0000 |
|---|---|---|
| committer | jlam <jlam> | 1999-07-16 18:43:48 +0000 |
| commit | aa54a3707e4d0dd799f4cce1d9a70a688b81c4ce (patch) | |
| tree | e7cdf8b49afed6e4042b0a05ee3eac51832686d8 | |
| parent | 09fed8fe5fc2671f7a0e744e9c42501c040bf73d (diff) | |
| download | pkgsrc-aa54a3707e4d0dd799f4cce1d9a70a688b81c4ce.tar.gz | |
Change order of -L directives and libraries to linker so that
libncurses.la is listed first. This allows a previous installation
of ncurses to exist and have the build of the current ncurses still
find the correct libs.
| -rw-r--r-- | devel/ncurses/patches/patch-ab | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab index 4d3a14e3d00..2aff5678235 100644 --- a/devel/ncurses/patches/patch-ab +++ b/devel/ncurses/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.4 1999/07/06 07:51:04 jlam Exp $ +$NetBSD: patch-ab,v 1.5 1999/07/16 18:43:48 jlam Exp $ --- configure.orig Thu Feb 12 18:46:01 1998 -+++ configure Fri Jul 2 03:04:33 1999 ++++ configure Thu Jul 15 03:09:54 1999 @@ -1628,6 +1628,7 @@ test -z "$cf_dir" && cf_dir=/usr/man cf_rename="" @@ -37,7 +37,7 @@ $NetBSD: patch-ab,v 1.4 1999/07/06 07:51:04 jlam Exp $ # dependencies and linker-arguments for utility-programs PROG_ARGS="$TEST_ARGS" -@@ -5353,16 +5356,16 @@ +@@ -5353,16 +5356,13 @@ EOF TEST_DEPS="${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" @@ -48,16 +48,15 @@ $NetBSD: patch-ab,v 1.4 1999/07/06 07:51:04 jlam Exp $ done echo "$ac_t""$cf_cv_src_modules" 1>&6 -TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS" +- +- +TEST_ARGS="-L\$(libdir) $TEST_ARGS" - - -PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS" -+PROG_ARGS="-L\$(libdir) $PROG_ARGS" SRC_SUBDIRS="man include" -@@ -5888,7 +5891,7 @@ +@@ -5888,7 +5888,7 @@ case $cf_item in @@ -66,7 +65,7 @@ $NetBSD: patch-ab,v 1.4 1999/07/06 07:51:04 jlam Exp $ debug) cf_suffix='_g.a' ;; profile) cf_suffix='_p.a' ;; shared) -@@ -5931,7 +5934,7 @@ +@@ -5931,7 +5931,7 @@ case $cf_item in @@ -75,7 +74,7 @@ $NetBSD: patch-ab,v 1.4 1999/07/06 07:51:04 jlam Exp $ debug) cf_suffix='_g.a' ;; profile) cf_suffix='_p.a' ;; shared) -@@ -6120,7 +6123,7 @@ +@@ -6120,7 +6120,7 @@ for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"` do echo " @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f `basename $i`) ; ../headers.sh \$(INSTALL_DATA) \$(INSTALL_PREFIX)\$(includedir) \$(srcdir) $i" >>$cf_dir/Makefile |