diff options
| author | Benjamin Moody <benjamin.moody@gmail.com> | 2021-06-25 20:59:54 +0200 |
|---|---|---|
| committer | Paul Gevers <elbrus@debian.org> | 2021-06-25 20:59:54 +0200 |
| commit | ff0b8cd3f0c4b87ad9b2ca6fa9dec1c6d9109ca4 (patch) | |
| tree | 1e481878b4f0af78c0e46ab5f8cdcf0642e39bce | |
| parent | ff49c3d357518f522165df67fe0e2d43faf75795 (diff) | |
In order to (partially) multi-arch-ify curl-config, remove all
Origin: vendor
Bug-Debian: http://bugs.debian.org/731998
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2017-01-10
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.)
Gbp-Pq: Name 11_omit-directories-from-config.patch
| -rw-r--r-- | curl-config.in | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/curl-config.in b/curl-config.in index 8b4a29a9..60dbe7ce 100644 --- a/curl-config.in +++ b/curl-config.in @@ -23,7 +23,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -includedir=@includedir@ cppflag_curl_staticlib=@CPPFLAG_CURL_STATICLIB@ usage() @@ -147,19 +146,11 @@ while test $# -gt 0; do else CPPFLAG_CURL_STATICLIB="" fi - if test "X@includedir@" = "X/usr/include"; then - echo "$CPPFLAG_CURL_STATICLIB" - else - echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@" - fi + echo "$CPPFLAG_CURL_STATICLIB" ;; --libs) - if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then - CURLLIBDIR="-L@libdir@ " - else - CURLLIBDIR="" - fi + CURLLIBDIR="" if test "X@ENABLE_SHARED@" = "Xno"; then echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ else @@ -172,7 +163,7 @@ while test $# -gt 0; do --static-libs) if test "X@ENABLE_STATIC@" != "Xno" ; then - echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ + echo -Wl,-Bstatic -lcurl -Wl,-Bdynamic @LDFLAGS@ @LIBCURL_LIBS@ else echo "curl was built with static libraries disabled" >&2 exit 1 |