ncurses/ncurses-config.patch

57 lines
1.8 KiB
Diff
Raw Normal View History

2021-03-11 11:39:57 +00:00
diff -up ncurses-6.2-20210306/misc/gen-pkgconfig.in.config ncurses-6.2-20210306/misc/gen-pkgconfig.in
--- ncurses-6.2-20210306/misc/gen-pkgconfig.in.config 2021-01-24 01:35:28.000000000 +0100
+++ ncurses-6.2-20210306/misc/gen-pkgconfig.in 2021-03-11 12:00:58.999470612 +0100
@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ];
fi
lib_flags=
2021-03-11 11:39:57 +00:00
-for opt in -L$libdir @LDFLAGS@ @EXTRA_PKG_LDFLAGS@ @LIBS@
+for opt in -L$libdir @LIBS@
do
case $opt in
-l*) # LIBS is handled specially below
2021-03-11 11:39:57 +00:00
diff -up ncurses-6.2-20210306/misc/ncurses-config.in.config ncurses-6.2-20210306/misc/ncurses-config.in
--- ncurses-6.2-20210306/misc/ncurses-config.in.config 2021-01-24 00:47:46.000000000 +0100
+++ ncurses-6.2-20210306/misc/ncurses-config.in 2021-03-11 12:04:07.007334707 +0100
2020-02-26 14:45:49 +00:00
@@ -41,7 +41,6 @@ exec_prefix="@exec_prefix@"
bindir="@bindir@"
includedir="@includedir@"
-libdir="@libdir@"
2012-10-15 14:48:11 +00:00
datarootdir="@datarootdir@"
datadir="@datadir@"
mandir="@mandir@"
2020-02-26 14:45:49 +00:00
@@ -101,7 +100,7 @@ fi
# There is no portable way to find the list of standard library directories.
# Require a POSIX shell anyway, to keep this simple.
lib_flags=
2021-03-11 11:39:57 +00:00
-for opt in -L$libdir @LDFLAGS@ @EXTRA_PKG_LDFLAGS@ $LIBS
+for opt in $LIBS
do
case $opt in
2020-02-26 14:45:49 +00:00
-specs*) # ignore linker specs-files which were used to build library
2021-03-11 11:39:57 +00:00
@@ -114,13 +113,13 @@ do
lib_check=${opt##-L}
[ -d "$lib_check" ] || continue
case "$lib_check" in
- @LD_SEARCHPATH@) # skip standard libdir
2021-03-11 11:39:57 +00:00
+ ////) # skip standard libdir (disabled for multilib)
if [ "$lib_check" = "$libdir" ]
then
lib_first=yes
IFS_save="$IFS"
IFS='|'
- LIBDIRS="@LD_SEARCHPATH@"
+ LIBDIRS=""
for lib_check in $LIBDIRS
do
if [ -d "$lib_check" ]
@@ -268,7 +267,6 @@ ENDECHO
2018-01-29 10:43:16 +00:00
echo $INCS
;;
--libdir)
- echo "${libdir}"
;;
--mandir)
echo "${mandir}"