remove LDFLAGS from pkgconfig files and ncurses-config scripts (#1771137)

This commit is contained in:
Miroslav Lichvar 2019-11-12 09:55:59 +01:00
parent fe1d815240
commit dd29b7fab2

View File

@ -1,6 +1,18 @@
diff -up ncurses-6.1-20191026/misc/ncurses-config.in.config ncurses-6.1-20191026/misc/ncurses-config.in diff -up ncurses-6.1-20191109/misc/gen-pkgconfig.in.config ncurses-6.1-20191109/misc/gen-pkgconfig.in
--- ncurses-6.1-20191026/misc/ncurses-config.in.config 2019-10-12 23:25:17.000000000 +0200 --- ncurses-6.1-20191109/misc/gen-pkgconfig.in.config 2019-10-13 00:27:10.000000000 +0200
+++ ncurses-6.1-20191026/misc/ncurses-config.in 2019-10-29 17:20:18.948451282 +0100 +++ ncurses-6.1-20191109/misc/gen-pkgconfig.in 2019-11-12 09:52:09.693017663 +0100
@@ -78,7 +78,7 @@ if [ "$includedir" != "/usr/include" ];
fi
lib_flags=
-for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
+for opt in -L$libdir @LIBS@
do
case $opt in
-l*) # LIBS is handled specially below
diff -up ncurses-6.1-20191109/misc/ncurses-config.in.config ncurses-6.1-20191109/misc/ncurses-config.in
--- ncurses-6.1-20191109/misc/ncurses-config.in.config 2019-10-12 23:25:17.000000000 +0200
+++ ncurses-6.1-20191109/misc/ncurses-config.in 2019-11-12 09:54:42.069324995 +0100
@@ -40,7 +40,6 @@ exec_prefix="@exec_prefix@" @@ -40,7 +40,6 @@ exec_prefix="@exec_prefix@"
bindir="@bindir@" bindir="@bindir@"
@ -14,7 +26,7 @@ diff -up ncurses-6.1-20191026/misc/ncurses-config.in.config ncurses-6.1-20191026
# Require a POSIX shell anyway, to keep this simple. # Require a POSIX shell anyway, to keep this simple.
lib_flags= lib_flags=
-for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS -for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
+for opt in @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS +for opt in $LIBS
do do
case $opt in case $opt in
-Wl,-z,*) # ignore flags used to manipulate shared image -Wl,-z,*) # ignore flags used to manipulate shared image