|
 |
810981d |
diff -up ncurses-6.3-20221126/misc/gen-pkgconfig.in.config ncurses-6.3-20221126/misc/gen-pkgconfig.in
|
|
|
810981d |
--- ncurses-6.3-20221126/misc/gen-pkgconfig.in.config 2022-10-08 18:45:20.000000000 +0200
|
|
|
810981d |
+++ ncurses-6.3-20221126/misc/gen-pkgconfig.in 2022-11-29 17:04:43.353766420 +0100
|
|
|
8e7a911 |
@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ];
|
|
|
dd29b7f |
fi
|
|
|
dd29b7f |
|
|
|
dd29b7f |
lib_flags=
|
|
|
e848e11 |
-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
|
|
|
dd29b7f |
+for opt in -L$libdir @LIBS@
|
|
|
dd29b7f |
do
|
|
|
dd29b7f |
case $opt in
|
|
|
dd29b7f |
-l*) # LIBS is handled specially below
|
|
|
810981d |
diff -up ncurses-6.3-20221126/misc/ncurses-config.in.config ncurses-6.3-20221126/misc/ncurses-config.in
|
|
|
810981d |
--- ncurses-6.3-20221126/misc/ncurses-config.in.config 2022-07-26 23:36:28.000000000 +0200
|
|
|
810981d |
+++ ncurses-6.3-20221126/misc/ncurses-config.in 2022-11-29 17:06:04.381597412 +0100
|
|
|
65c1eb1 |
@@ -41,7 +41,6 @@ exec_prefix="@exec_prefix@"
|
|
|
c27798d |
|
|
|
c27798d |
bindir="@bindir@"
|
|
|
9a91bc2 |
includedir="@includedir@"
|
|
|
c27798d |
-libdir="@libdir@"
|
|
|
58d63cc |
datarootdir="@datarootdir@"
|
|
|
c27798d |
datadir="@datadir@"
|
|
|
c27798d |
mandir="@mandir@"
|
|
|
65c1eb1 |
@@ -101,7 +100,7 @@ fi
|
|
|
0b8bb22 |
# There is no portable way to find the list of standard library directories.
|
|
|
26a4533 |
# Require a POSIX shell anyway, to keep this simple.
|
|
|
26a4533 |
lib_flags=
|
|
|
e848e11 |
-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ $LIBS
|
|
|
dd29b7f |
+for opt in $LIBS
|
|
|
26a4533 |
do
|
|
|
26a4533 |
case $opt in
|
|
|
65c1eb1 |
-specs*) # ignore linker specs-files which were used to build library
|
|
|
810981d |
@@ -120,13 +119,13 @@ do
|
|
|
e848e11 |
lib_check=`echo "x$opt" | sed -e 's/^.-L//'`
|
|
|
8e7a911 |
[ -d "$lib_check" ] || continue
|
|
|
8e7a911 |
case "$lib_check" in
|
|
|
26a4533 |
- @LD_SEARCHPATH@) # skip standard libdir
|
|
|
8e7a911 |
+ ////) # skip standard libdir (disabled for multilib)
|
|
|
8e7a911 |
if [ "$lib_check" = "$libdir" ]
|
|
|
8e7a911 |
then
|
|
|
8e7a911 |
lib_first=yes
|
|
|
8e7a911 |
IFS_save="$IFS"
|
|
|
8e7a911 |
IFS='|'
|
|
|
8e7a911 |
- LIBDIRS="@LD_SEARCHPATH@"
|
|
|
8e7a911 |
+ LIBDIRS=""
|
|
|
8e7a911 |
for lib_check in $LIBDIRS
|
|
|
8e7a911 |
do
|
|
|
8e7a911 |
if [ -d "$lib_check" ]
|
|
|
810981d |
@@ -274,7 +273,6 @@ ENDECHO
|
|
|
810981d |
echo "$INCS"
|
|
|
c27798d |
;;
|
|
|
c27798d |
--libdir)
|
|
|
c27798d |
- echo "${libdir}"
|
|
|
c27798d |
;;
|
|
|
c27798d |
--mandir)
|
|
|
c27798d |
echo "${mandir}"
|