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

fix configure.ac to not discard -g in CFLAGS (#496778)

Browse Source
This commit is contained in:
Kamil Dudka 2009-04-22 10:14:36 +00:00
parent 3a66d91e5f
commit 45fab4b7bc
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
curl-7.19.4-debug.patch Normal file
View File

@ -0,0 +1,15 @@
diff -ruNp curl-7.19.4.orig/configure.ac curl-7.19.4/configure.ac
--- curl-7.19.4.orig/configure.ac 2009-02-13 15:25:15.000000000 +0100
+++ curl-7.19.4/configure.ac 2009-04-22 11:56:32.171305420 +0200
@@ -241,7 +241,10 @@ dnl ************************************
CURL_CHECK_COMPILER
CURL_SET_COMPILER_BASIC_OPTS
-CURL_SET_COMPILER_DEBUG_OPTS
+
+dnl do not perturb CFLAGS given by the build system
+dnl CURL_SET_COMPILER_DEBUG_OPTS
+
CURL_SET_COMPILER_OPTIMIZE_OPTS
CURL_SET_COMPILER_WARNING_OPTS

22
curl-7.19.4-flags.patch
View File

@ -1,22 +0,0 @@
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

10
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: 7%{?dist} Release: 8%{?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,7 +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 Patch7: curl-7.19.4-debug.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)
@ -56,7 +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 %patch7 -p1 -b .debug
# Convert docs to UTF-8 # Convert docs to UTF-8
for f in CHANGES README; do for f in CHANGES README; do
@ -65,6 +65,7 @@ for f in CHANGES README; do
done done
%build %build
autoconf
export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT" export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT"
%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \ %configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \ --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
@ -148,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4 %{_datadir}/aclocal/libcurl.m4
%changelog %changelog
* Wed Apr 22 2009 Kamil Dudka <kdudka@redhat.com> 7.19.4-8
- fix configure.ac to not discard -g in CFLAGS (#496778)
* Tue Apr 21 2009 Debarshi Ray <rishi@fedoraproject.org> 7.19.4-7 * Tue Apr 21 2009 Debarshi Ray <rishi@fedoraproject.org> 7.19.4-7
- Fixed configure to respect the environment's CFLAGS and CPPFLAGS settings. - Fixed configure to respect the environment's CFLAGS and CPPFLAGS settings.