From: Thomas E. Dickey <dickey@invisible-island.net>
Date: Sun, 4 Jan 2009 22:54:42 +0000 (+0000)
Subject: ncurses 5.7 - patch 20090104
X-Git-Tag: v5.8~110
X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=f9e12ea0198ed1c1c6f876295f31f531a7d5bf6b

ncurses 5.7 - patch 20090104

+ modify gen-pkgconfig.in to eliminate a dependency on rpath when
  deciding whether to add $LIBS to --libs output; that should be shown
  for the ncurses and tinfo libraries without taking rpath into
  account.
+ fix an overlooked change from $AR_OPTS to $ARFLAGS in mk-1st.awk,
  used in static libraries (report by Marty Jack).
---

diff --git a/NEWS b/NEWS
index 4eadf011..b8f6f3d6 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1349 2009/01/04 00:09:31 tom Exp $
+-- $Id: NEWS,v 1.1351 2009/01/04 22:43:22 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,14 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20090104
+	+ modify gen-pkgconfig.in to eliminate a dependency on rpath when
+	  deciding whether to add $LIBS to --libs output; that should be shown
+	  for the ncurses and tinfo libraries without taking rpath into
+	  account.
+	+ fix an overlooked change from $AR_OPTS to $ARFLAGS in mk-1st.awk,
+	  used in static libraries (report by Marty Jack).
+
 20090103
 	+ add a configure-time check to pick a suitable value for
 	  CC_SHARED_OPTS for Solaris (report by Dagobert Michelsen).
diff --git a/dist.mk b/dist.mk
index 285ca7f8..f0a8d90e 100644
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.679 2009/01/03 15:43:11 tom Exp $
+# $Id: dist.mk,v 1.680 2009/01/04 21:51:56 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 7
-NCURSES_PATCH = 20090103
+NCURSES_PATCH = 20090104
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 12bf11ce..36220d3d 100644
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.3 2009/01/03 22:26:47 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.4 2009/01/04 21:52:33 tom Exp $
 ##############################################################################
 # Copyright (c) 2009 Free Software Foundation, Inc.                          #
 #                                                                            #
@@ -41,7 +41,6 @@ LIB_NAME=@LIB_NAME@
 TINFO_NAME=@TINFO_NAME@
 DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
 CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
-LD_RPATH_OPT=@LD_RPATH_OPT@
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
@@ -96,9 +95,7 @@ do
 
 	# add dependencies that pkg-config cannot guess about
 	if test -z "$reqs" ; then
-		if test -z "$LD_RPATH_OPT" ; then
-			libs="$libs @LIBS@"
-		fi
+		libs="$libs @LIBS@"
 	fi
 
 	echo "** creating ${name}.pc"
diff --git a/mk-1st.awk b/mk-1st.awk
index 2494d9ce..1bf7f152 100644
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,4 +1,4 @@
-# $Id: mk-1st.awk,v 1.79 2008/12/28 01:17:54 tom Exp $
+# $Id: mk-1st.awk,v 1.80 2009/01/04 21:51:38 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -404,7 +404,7 @@ END	{
 			{
 				end_name = lib_name;
 				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
-				printf "\t$(AR) $(AR_OPTS) $@ $?\n"
+				printf "\t$(AR) $(ARFLAGS) $@ $?\n"
 				printf "\t$(RANLIB) $@\n"
 				if ( host == "vxworks" )
 				{