summaryrefslogtreecommitdiff
path: root/curl/0101-curl-7.58.0-multilib.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-10-10 11:40:39 -0400
committerB Stack <bgstack15@gmail.com>2019-10-10 11:40:39 -0400
commitd3505e0bcb1d6015c6e70104a2b64dd347565ad1 (patch)
tree9167181d853d25a3e57645aca40155990124905f /curl/0101-curl-7.58.0-multilib.patch
parentWIP: ffs for el8 rc1 (diff)
downloadstackrpms-d3505e0bcb1d6015c6e70104a2b64dd347565ad1.tar.gz
stackrpms-d3505e0bcb1d6015c6e70104a2b64dd347565ad1.tar.bz2
stackrpms-d3505e0bcb1d6015c6e70104a2b64dd347565ad1.zip
moved ffs deps to new repo
Diffstat (limited to 'curl/0101-curl-7.58.0-multilib.patch')
-rw-r--r--curl/0101-curl-7.58.0-multilib.patch88
1 files changed, 0 insertions, 88 deletions
diff --git a/curl/0101-curl-7.58.0-multilib.patch b/curl/0101-curl-7.58.0-multilib.patch
deleted file mode 100644
index 38340e1..0000000
--- a/curl/0101-curl-7.58.0-multilib.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2a4754a3a7cf60ecc36d83cbe50b8c337cb87632 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Fri, 12 Apr 2013 12:04:05 +0200
-Subject: [PATCH] prevent multilib conflicts on the curl-config script
-
----
- curl-config.in | 21 +++------------------
- docs/curl-config.1 | 4 +++-
- libcurl.pc.in | 1 +
- 3 files changed, 7 insertions(+), 19 deletions(-)
-
-diff --git a/curl-config.in b/curl-config.in
-index 150004d..95d0759 100644
---- a/curl-config.in
-+++ b/curl-config.in
-@@ -76,7 +76,7 @@ while test $# -gt 0; do
- ;;
-
- --cc)
-- echo "@CC@"
-+ echo "gcc"
- ;;
-
- --prefix)
-@@ -143,32 +143,19 @@ while test $# -gt 0; do
- ;;
-
- --libs)
-- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
-- CURLLIBDIR="-L@libdir@ "
-- else
-- CURLLIBDIR=""
-- fi
-- if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
-- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
-- else
-- echo ${CURLLIBDIR}-lcurl
-- fi
-+ echo -lcurl
- ;;
- --ssl-backends)
- echo "@SSL_BACKENDS@"
- ;;
-
- --static-libs)
-- if test "X@ENABLE_STATIC@" != "Xno" ; then
-- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@
-- else
-- echo "curl was built with static libraries disabled" >&2
-- exit 1
-- fi
-+ echo "curl was built with static libraries disabled" >&2
-+ exit 1
- ;;
-
- --configure)
-- echo @CONFIGURE_OPTIONS@
-+ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
- ;;
-
- *)
-diff --git a/docs/curl-config.1 b/docs/curl-config.1
-index 14a9d2b..ffcc004 100644
---- a/docs/curl-config.1
-+++ b/docs/curl-config.1
-@@ -70,7 +70,9 @@ no, one or several names. If more than o
- comma-separated. (Added in 7.58.0)
- .IP "--static-libs"
- Shows the complete set of libs and other linker options you will need in order
--to link your application with libcurl statically. (Added in 7.17.1)
-+to link your application with libcurl statically. Note that Fedora/RHEL libcurl
-+packages do not provide any static libraries, thus cannot be linked statically.
-+(Added in 7.17.1)
- .IP "--version"
- Outputs version information about the installed libcurl.
- .IP "--vernum"
-diff --git a/libcurl.pc.in b/libcurl.pc.in
-index 2ba9c39..f8f8b00 100644
---- a/libcurl.pc.in
-+++ b/libcurl.pc.in
-@@ -29,6 +29,7 @@ libdir=@libdir@
- includedir=@includedir@
- supported_protocols="@SUPPORT_PROTOCOLS@"
- supported_features="@SUPPORT_FEATURES@"
-+configure_options=@CONFIGURE_OPTIONS@
-
- Name: libcurl
- URL: https://curl.haxx.se/
bgstack15