ncurses/ncurses-config.patch

53 lines
1.3 KiB
Diff
Raw Normal View History

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 8f00b82..009d215 100644
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then
2020-01-10 15:39:25 +08:00
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 --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 7f8ba69..e483af5 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -41,7 +41,6 @@ exec_prefix="@exec_prefix@"
2019-09-30 11:09:29 -04:00
bindir="@bindir@"
includedir="@includedir@"
-libdir="@libdir@"
datarootdir="@datarootdir@"
datadir="@datadir@"
mandir="@mandir@"
@@ -101,7 +100,7 @@ fi
2020-01-10 15:39:25 +08:00
# There is no portable way to find the list of standard library directories.
# Require a POSIX shell anyway, to keep this simple.
lib_flags=
-for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
+for opt in $LIBS
do
case $opt in
2020-07-27 11:51:14 +08:00
-specs*) # ignore linker specs-files which were used to build library
@@ -113,9 +112,6 @@ do
2020-01-10 15:39:25 +08:00
-L*)
[ -d ${opt##-L} ] || continue
case ${opt##-L} in
- @LD_SEARCHPATH@) # skip standard libdir
- continue
- ;;
*)
found=no
for check in $lib_flags
@@ -235,7 +231,6 @@ ENDECHO
2019-09-30 11:09:29 -04:00
echo $INCS
;;
--libdir)
- echo "${libdir}"
;;
--mandir)
echo "${mandir}"