diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2019-02-09 13:57:03 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2019-02-09 13:57:59 +0100 |
| commit | fbd38277371e11131cea7b96d42d62f61d72cb29 (patch) | |
| tree | 6ba3b888c92664a2e995451ab4fa06865f77384c /media-libs/raptor/files | |
| parent | Revert "media-libs/raptor: Added libidn2 to (R)DEPEND." (diff) | |
| download | gentoo-fbd38277371e11131cea7b96d42d62f61d72cb29.tar.gz gentoo-fbd38277371e11131cea7b96d42d62f61d72cb29.tar.bz2 gentoo-fbd38277371e11131cea7b96d42d62f61d72cb29.zip | |
media-libs/raptor: Don't use curl-config
Closes: https://bugs.gentoo.org/552474
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'media-libs/raptor/files')
| -rw-r--r-- | media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch b/media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch new file mode 100644 index 000000000000..bab174176cbe --- /dev/null +++ b/media-libs/raptor/files/raptor-2.0.15-dont_use_curl-config.patch @@ -0,0 +1,59 @@ +https://bugs.gentoo.org/552474 + +--- raptor2-2.0.15/configure.ac ++++ raptor2-2.0.15/configure.ac +@@ -524,49 +524,12 @@ + fi + fi + +-dnl curl +-AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="") +- +-if test "X$curl_config" != "Xno" ; then +- if test "X$curl_config" != "X" ; then +- AC_MSG_CHECKING(for $curl_config) +- +- if test -f $curl_config ; then +- CURL_CONFIG=$curl_config +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no - searching PATH) +- fi +- fi +- if test "X$CURL_CONFIG" = "X" ; then +- AC_CHECK_PROGS(CURL_CONFIG, curl-config) +- fi +-fi +- + libcurl_source=no +-if test "X$CURL_CONFIG" != "X"; then +- LIBCURL_CFLAGS=`$CURL_CONFIG --cflags` +- LIBCURL_LIBS=`$CURL_CONFIG --libs` +- +- CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS" +- LIBS="$LIBS $LIBCURL_LIBS" +- AC_CHECK_HEADER(curl/curl.h) +- AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no) +- +- AC_MSG_CHECKING(for libcurl via curl-config) +- if test $have_curl_easy_init = yes; then +- libcurl_source="curl-config" +- LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'` +- fi +- CPPFLAGS="$oCPPFLAGS" +- LIBS="$oLIBS" +-else +- PKG_CHECK_MODULES([LIBCURL],[libcurl],[ +- LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` +- libcurl_source="pkg-config" +- ], [:]) +- AC_MSG_CHECKING(for libcurl via pkg-config) +-fi ++PKG_CHECK_MODULES([LIBCURL],[libcurl],[ ++ LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` ++ libcurl_source="pkg-config" ++], [:]) ++AC_MSG_CHECKING(for libcurl via pkg-config) + + if test "$libcurl_source" = "no"; then + AC_MSG_RESULT(no - not found) |