rpms/curl
8
0
Fork 1
Code Issues Pull Requests Releases Activity

Fixed configure to respect the environment's CFLAGS and CPPFLAGS settings.

Browse Source
This commit is contained in:
Kamil Dudka 2009-04-21 16:12:16 +00:00
parent c4e2b73edf
commit 3a66d91e5f
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
curl-7.19.4-flags.patch Normal file
View File

@ -0,0 +1,22 @@
diff -urNp curl-7.19.4.orig/configure curl-7.19.4/configure
--- curl-7.19.4.orig/configure 2009-04-21 10:59:47.000000000 +0530
+++ curl-7.19.4/configure 2009-04-21 11:19:13.000000000 +0530
@@ -16,6 +16,9 @@
## M4sh Initialization. ##
## --------------------- ##
+fedora_CPPFLAGS="$CPPFLAGS"
+fedora_CFLAGS="$CFLAGS"
+
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -46881,6 +46884,8 @@ fi
+CFLAGS="$CFLAGS $fedora_CFLAGS"
+CPPFLAGS="$CPPFLAGS $fedora_CPPFLAGS"
squeeze CFLAGS
squeeze CPPFLAGS

9
curl.spec
View File

@ -1,7 +1,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl Name: curl
Version: 7.19.4 Version: 7.19.4
Release: 6%{?dist} Release: 7%{?dist}
License: MIT License: MIT
Group: Applications/Internet Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@ -11,6 +11,7 @@ Patch3: curl-7.17.1-badsocket.patch
Patch4: curl-7.19.4-tool-leak.patch Patch4: curl-7.19.4-tool-leak.patch
Patch5: curl-7.19.4-enable-aes.patch Patch5: curl-7.19.4-enable-aes.patch
Patch6: curl-7.19.4-nss-leak.patch Patch6: curl-7.19.4-nss-leak.patch
Patch7: curl-7.19.4-flags.patch
Provides: webclient Provides: webclient
URL: http://curl.haxx.se/ URL: http://curl.haxx.se/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -55,6 +56,7 @@ use cURL's capabilities internally.
%patch4 -p1 -b .toolleak %patch4 -p1 -b .toolleak
%patch5 -p1 -b .enableaes %patch5 -p1 -b .enableaes
%patch6 -p1 -b .nssleak %patch6 -p1 -b .nssleak
%patch7 -p1 -b .flags
# Convert docs to UTF-8 # Convert docs to UTF-8
for f in CHANGES README; do for f in CHANGES README; do
@ -146,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4 %{_datadir}/aclocal/libcurl.m4
%changelog %changelog
* Tue Apr 21 2009 Debarshi Ray <rishi@fedoraproject.org> 7.19.4-7
- Fixed configure to respect the environment's CFLAGS and CPPFLAGS settings.
* Tue Apr 14 2009 Kamil Dudka <kdudka@redhat.com> 7.19.4-6 * Tue Apr 14 2009 Kamil Dudka <kdudka@redhat.com> 7.19.4-6
- upstream patch fixing memory leak in lib/nss.c (#453612) - upstream patch fixing memory leak in lib/nss.c (#453612)
- remove redundant dependency of libcurl-devel on libssh2-devel - remove redundant dependency of libcurl-devel on libssh2-devel
@ -156,7 +161,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Mar 12 2009 Kamil Dudka <kdudka@redhat.com> 7.19.4-4 * Thu Mar 12 2009 Kamil Dudka <kdudka@redhat.com> 7.19.4-4
- fix memory leak in src/main.c (accepted by upstream) - fix memory leak in src/main.c (accepted by upstream)
- avoid using %ifarch - avoid using %%ifarch
* Wed Mar 11 2009 Kamil Dudka <kdudka@redhat.com> 7.19.4-3 * Wed Mar 11 2009 Kamil Dudka <kdudka@redhat.com> 7.19.4-3
- make libcurl-devel multilib-ready (bug #488922) - make libcurl-devel multilib-ready (bug #488922)