From dd29b7fab270eb9f1faed8cb5b873776c15d6847 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 12 Nov 2019 09:55:59 +0100 Subject: [PATCH] remove LDFLAGS from pkgconfig files and ncurses-config scripts (#1771137) --- ncurses-config.patch | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/ncurses-config.patch b/ncurses-config.patch index baf40df..58722e9 100644 --- a/ncurses-config.patch +++ b/ncurses-config.patch @@ -1,6 +1,18 @@ -diff -up ncurses-6.1-20191026/misc/ncurses-config.in.config ncurses-6.1-20191026/misc/ncurses-config.in ---- ncurses-6.1-20191026/misc/ncurses-config.in.config 2019-10-12 23:25:17.000000000 +0200 -+++ ncurses-6.1-20191026/misc/ncurses-config.in 2019-10-29 17:20:18.948451282 +0100 +diff -up ncurses-6.1-20191109/misc/gen-pkgconfig.in.config ncurses-6.1-20191109/misc/gen-pkgconfig.in +--- ncurses-6.1-20191109/misc/gen-pkgconfig.in.config 2019-10-13 00:27:10.000000000 +0200 ++++ 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@" 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. lib_flags= -for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS -+for opt in @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS ++for opt in $LIBS do case $opt in -Wl,-z,*) # ignore flags used to manipulate shared image