mirror of
https://github.com/openharmony/third_party_ncurses.git
synced 2026-07-16 08:54:49 -04:00
manjiamu
aebad2b25f
- ncurses-config.patch: adjust line numbers for ncurses-config.in - ncurses-libs.patch: rename USE_LIB_SUFFIX to ABI_SUFFIX - ncurses-kbs.patch: adjust rxvt-basic and screen.teraterm line numbers - remove cross_compile_support_ohos.patch (upstream absorbed) Signed-off-by: manjiamu <wanghao636@huawei.com>
61 lines
1.5 KiB
Diff
61 lines
1.5 KiB
Diff
diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
|
|
index a45dd54..8527305 100644
|
|
--- a/misc/gen-pkgconfig.in
|
|
+++ b/misc/gen-pkgconfig.in
|
|
@@ -85,7 +85,7 @@ if [ "$includedir" != "/usr/include" ]; then
|
|
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 --git a/misc/ncurses-config.in b/misc/ncurses-config.in
|
|
index 7b02ac2..b64379f 100644
|
|
--- a/misc/ncurses-config.in
|
|
+++ b/misc/ncurses-config.in
|
|
@@ -42,7 +42,6 @@ exec_prefix="@exec_prefix@"
|
|
|
|
bindir="@bindir@"
|
|
includedir="@includedir@"
|
|
-libdir="@libdir@"
|
|
datarootdir="@datarootdir@"
|
|
datadir="@datadir@"
|
|
mandir="@mandir@"
|
|
@@ -110,7 +109,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
|
|
@@ -131,13 +130,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=no
|
|
IFS_save="$IFS"
|
|
IFS='|'
|
|
- LIBDIRS="@LD_SEARCHPATH@"
|
|
+ LIBDIRS=""
|
|
for lib_check in $LIBDIRS
|
|
do
|
|
if [ -d "$lib_check" ]
|
|
@@ -324,7 +323,6 @@
|
|
echo "$INCS"
|
|
;;
|
|
--libdir)
|
|
- echo "${libdir}"
|
|
;;
|
|
--mandir)
|
|
echo "${mandir}"
|
|
--
|
|
2.33.0
|