You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
1.8 KiB
56 lines
1.8 KiB
diff -up ncurses-6.2-20210501/misc/gen-pkgconfig.in.config ncurses-6.2-20210501/misc/gen-pkgconfig.in |
|
--- ncurses-6.2-20210501/misc/gen-pkgconfig.in.config 2021-05-04 15:25:14.136139064 +0200 |
|
+++ ncurses-6.2-20210501/misc/gen-pkgconfig.in 2021-05-04 15:26:46.473363104 +0200 |
|
@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; |
|
fi |
|
|
|
lib_flags= |
|
-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@ |
|
+for opt in -L$libdir @LIBS@ |
|
do |
|
case $opt in |
|
-l*) # LIBS is handled specially below |
|
diff -up ncurses-6.2-20210501/misc/ncurses-config.in.config ncurses-6.2-20210501/misc/ncurses-config.in |
|
--- ncurses-6.2-20210501/misc/ncurses-config.in.config 2021-04-18 00:22:52.000000000 +0200 |
|
+++ ncurses-6.2-20210501/misc/ncurses-config.in 2021-05-04 15:28:41.567642360 +0200 |
|
@@ -41,7 +41,6 @@ exec_prefix="@exec_prefix@" |
|
|
|
bindir="@bindir@" |
|
includedir="@includedir@" |
|
-libdir="@libdir@" |
|
datarootdir="@datarootdir@" |
|
datadir="@datadir@" |
|
mandir="@mandir@" |
|
@@ -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= |
|
-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ $LIBS |
|
+for opt in $LIBS |
|
do |
|
case $opt in |
|
-specs*) # ignore linker specs-files which were used to build library |
|
@@ -114,13 +113,13 @@ do |
|
lib_check=`echo "x$opt" | sed -e 's/^.-L//'` |
|
[ -d "$lib_check" ] || continue |
|
case "$lib_check" in |
|
- @LD_SEARCHPATH@) # skip standard libdir |
|
+ ////) # 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 |
|
echo $INCS |
|
;; |
|
--libdir) |
|
- echo "${libdir}" |
|
;; |
|
--mandir) |
|
echo "${mandir}"
|
|
|