8ac04d29f8
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/ncurses#b8c069e2deb9a36ea2d81ca48ca91e79336b9f15
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
diff -up ncurses-6.2-20200222/misc/gen-pkgconfig.in.config ncurses-6.2-20200222/misc/gen-pkgconfig.in
|
|
--- ncurses-6.2-20200222/misc/gen-pkgconfig.in.config 2020-02-12 01:09:26.000000000 +0100
|
|
+++ ncurses-6.2-20200222/misc/gen-pkgconfig.in 2020-02-26 15:46:18.899263947 +0100
|
|
@@ -80,7 +80,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.2-20200222/misc/ncurses-config.in.config ncurses-6.2-20200222/misc/ncurses-config.in
|
|
--- ncurses-6.2-20200222/misc/ncurses-config.in.config 2020-02-03 00:34:34.000000000 +0100
|
|
+++ ncurses-6.2-20200222/misc/ncurses-config.in 2020-02-26 15:47:12.827386582 +0100
|
|
@@ -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 @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
|
|
+for opt in $LIBS
|
|
do
|
|
case $opt in
|
|
-specs*) # ignore linker specs-files which were used to build library
|
|
@@ -113,9 +112,6 @@ do
|
|
-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
|
|
echo $INCS
|
|
;;
|
|
--libdir)
|
|
- echo "${libdir}"
|
|
;;
|
|
--mandir)
|
|
echo "${mandir}"
|