mcst-linux-kernel/patches-2024.06.26/apr-1.7.0/0004-fix_apr_config.patch

30 lines
811 B
Diff
Raw Permalink Normal View History

2024-07-09 13:51:45 +03:00
diff -Naur old/apr-config.in new/apr-config.in
--- old/apr-config.in 2022-04-25 13:11:23.977199757 +0300
+++ new/apr-config.in 2022-04-25 13:30:04.982677947 +0300
@@ -36,10 +36,10 @@
CPPFLAGS="@EXTRA_CPPFLAGS@"
CFLAGS="@EXTRA_CFLAGS@"
LDFLAGS="@EXTRA_LDFLAGS@"
-LIBS="@EXTRA_LIBS@"
+LIBS=
EXTRA_INCLUDES="@EXTRA_INCLUDES@"
SHLIBPATH_VAR="@shlibpath_var@"
-APR_SOURCE_DIR="@apr_srcdir@"
+APR_SOURCE_DIR="$(cd @installbuilddir@/.. ; pwd)"
APR_BUILD_DIR="@apr_builddir@"
APR_SO_EXT="@so_ext@"
APR_LIB_TARGET="@export_lib_target@"
@@ -223,11 +223,7 @@
exit 0
;;
--apr-libtool)
- if test "$location" = "installed"; then
- echo "${installbuilddir}/libtool"
- else
- echo "$APR_BUILD_DIR/libtool"
- fi
+ echo "$installbuilddir/libtool"
exit 0
;;
--help)