openkylin
/
curl
mirror of https://gitee.com/openkylin/curl.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

In order to (partially) multi-arch-ify curl-config, remove all 

mention of @includedir@ and @libdir@ from the script.  On Debian, the actual
header and library directories are architecture-dependent, but will always be
in the C compiler's default search path, so -I and -L options are not
necessary (and may be harmful in multi-arch environments.)
Origin: vendor
Bug-Debian: http://bugs.debian.org/731998
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2017-01-10

Gbp-Pq: Name 11_omit-directories-from-config.patch
This commit is contained in:
Benjamin Moody 2022-05-13 20:09:08 +08:00 committed by openKylinBot
parent ef0e400332
commit 2749cb5e03
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
curl-config.in
View File

@ -23,7 +23,6 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
includedir=@includedir@
cppflag_curl_staticlib=@CPPFLAG_CURL_STATICLIB@ cppflag_curl_staticlib=@CPPFLAG_CURL_STATICLIB@
usage() usage()
@ -147,19 +146,11 @@ while test $# -gt 0; do
else else
CPPFLAG_CURL_STATICLIB="" CPPFLAG_CURL_STATICLIB=""
fi fi
if test "X@includedir@" = "X/usr/include"; then
echo "$CPPFLAG_CURL_STATICLIB" echo "$CPPFLAG_CURL_STATICLIB"
else
echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
fi
;; ;;
--libs) --libs)
if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
CURLLIBDIR="-L@libdir@ "
else
CURLLIBDIR="" CURLLIBDIR=""
fi
if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
else else
@ -172,7 +163,7 @@ while test $# -gt 0; do
--static-libs) --static-libs)
if test "X@ENABLE_STATIC@" != "Xno" ; then if test "X@ENABLE_STATIC@" != "Xno" ; then
echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ echo -Wl,-Bstatic -lcurl -Wl,-Bdynamic @LDFLAGS@ @LIBCURL_LIBS@
else else
echo "curl was built with static libraries disabled" >&2 echo "curl was built with static libraries disabled" >&2
exit 1 exit 1