From 0ce7280da7f66026d8dba9b85b8b52165f679140 Mon Sep 17 00:00:00 2001 From: Paul de Vrieze Date: Tue, 27 Feb 2007 21:31:50 +0000 Subject: [PATCH] Remove CFLAG munging code from configure Package-Manager: portage-2.1.2-r9 --- dev-util/subversion/ChangeLog | 6 +++- dev-util/subversion/Manifest | 20 ++++++++----- .../files/subversion-1.4.3-debug-config.patch | 29 +++++++++++++++++++ dev-util/subversion/subversion-1.4.3.ebuild | 3 +- 4 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 dev-util/subversion/files/subversion-1.4.3-debug-config.patch diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index 7bd21e1fc2e9..61a560fa0f35 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.245 2007/01/28 19:30:13 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.246 2007/02/27 21:31:50 pauldv Exp $ + + 27 Feb 2007; Paul de Vrieze + +files/subversion-1.4.3-debug-config.patch, subversion-1.4.3.ebuild: + Remove CFLAG munging from the configure script. 28 Jan 2007; Luca Longinotti subversion-1.2.3-r2.ebuild, subversion-1.2.3-r3.ebuild, diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index 3110d084c70e..5dcf948cede5 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -18,6 +18,10 @@ AUX subversion-1.4-db4.patch 570 RMD160 e07111ed95b08289b9e145dad7798430cb45e405 MD5 783cc1d1bbce7e8c5e4ae97a3384b23a files/subversion-1.4-db4.patch 570 RMD160 e07111ed95b08289b9e145dad7798430cb45e405 files/subversion-1.4-db4.patch 570 SHA256 73f2915a8334c0ebd95abb3bc1239237c683f71662281b1a183b7885f075e236 files/subversion-1.4-db4.patch 570 +AUX subversion-1.4.3-debug-config.patch 886 RMD160 0d95f3b50617469f1c5466b2e34d45ecdb1238a8 SHA1 f9f38bf70f8042a4a754830a7f456f6d2d52bf5d SHA256 b84b31b7a49b79d68ad71feb186882da495e31cec0b8ff3f42b9f261c3e03448 +MD5 5a3233a471e13f2926b3da7704e2d8fe files/subversion-1.4.3-debug-config.patch 886 +RMD160 0d95f3b50617469f1c5466b2e34d45ecdb1238a8 files/subversion-1.4.3-debug-config.patch 886 +SHA256 b84b31b7a49b79d68ad71feb186882da495e31cec0b8ff3f42b9f261c3e03448 files/subversion-1.4.3-debug-config.patch 886 AUX subversion-apr-version.patch 2867 RMD160 cc34107d60f3e1df7cb926b87e0c9cda094bbc25 SHA1 f10969a38efb1b9019340bdc5caa5ac98c795176 SHA256 3c466fa14da964999aceabd19ca5c64176cf563a0fca54498bc36c881e163601 MD5 25d9476112d0d6e3a4f7efc5be8d6a21 files/subversion-apr-version.patch 2867 RMD160 cc34107d60f3e1df7cb926b87e0c9cda094bbc25 files/subversion-apr-version.patch 2867 @@ -114,14 +118,14 @@ EBUILD subversion-1.4.2.ebuild 11593 RMD160 4a6241387fac4a0efa0b769a3a988895c8ca MD5 b30f32478fe9a4840ad03497c4b1b5b9 subversion-1.4.2.ebuild 11593 RMD160 4a6241387fac4a0efa0b769a3a988895c8ca4515 subversion-1.4.2.ebuild 11593 SHA256 68a80a1bb89ce59a50a6af17e18486f9199dd8d9220de2a17aa1589dd4b1ee18 subversion-1.4.2.ebuild 11593 -EBUILD subversion-1.4.3.ebuild 11611 RMD160 230d9d0ef96ae769b46fd4901d5076bc512ab050 SHA1 a0d7742e047afe0310a93a7cd7baf4f368a7f4d5 SHA256 97e812bf2bcf909e488322c0710308025a7d70f7fddcaf76fd80dff6f2887f2c -MD5 548bca7f695b4baa9a7c5e51a3427a02 subversion-1.4.3.ebuild 11611 -RMD160 230d9d0ef96ae769b46fd4901d5076bc512ab050 subversion-1.4.3.ebuild 11611 -SHA256 97e812bf2bcf909e488322c0710308025a7d70f7fddcaf76fd80dff6f2887f2c subversion-1.4.3.ebuild 11611 -MISC ChangeLog 41771 RMD160 9af3d9ea2613a1277a5c3803f63bde5f48a94335 SHA1 51e29705d159bbc9ab443dab0a47af3b9f42d0b8 SHA256 7fc05b3cdbe30393b77747520ce2ee0e14e15910102d914d4b09196278af4ff7 -MD5 1a385e6ebd09e9305362ec602aaea1ef ChangeLog 41771 -RMD160 9af3d9ea2613a1277a5c3803f63bde5f48a94335 ChangeLog 41771 -SHA256 7fc05b3cdbe30393b77747520ce2ee0e14e15910102d914d4b09196278af4ff7 ChangeLog 41771 +EBUILD subversion-1.4.3.ebuild 11667 RMD160 d7b856b676c76a198ef0dc8996435fa8e528f812 SHA1 28a0e5483b3b51a8f38b378dd86ab707f3b8d33f SHA256 9a5cf67e17bd2146cfef9db9b5c74df89399ee06901a5c59a0ef55195943209c +MD5 5b8332562234f4c54d349a1f07c0f886 subversion-1.4.3.ebuild 11667 +RMD160 d7b856b676c76a198ef0dc8996435fa8e528f812 subversion-1.4.3.ebuild 11667 +SHA256 9a5cf67e17bd2146cfef9db9b5c74df89399ee06901a5c59a0ef55195943209c subversion-1.4.3.ebuild 11667 +MISC ChangeLog 41943 RMD160 2bcdf0a26591fc6e13ea81e9e7a49c7548a8c133 SHA1 d1cc97552d4dde2bfae5e39e1099d16f427a8cbc SHA256 546a927cc5c9b79e344d350626a7542b86183e5703f05ef5966358e866b53f30 +MD5 cc0ff89d90fe227b20ed9b9569c1ce56 ChangeLog 41943 +RMD160 2bcdf0a26591fc6e13ea81e9e7a49c7548a8c133 ChangeLog 41943 +SHA256 546a927cc5c9b79e344d350626a7542b86183e5703f05ef5966358e866b53f30 ChangeLog 41943 MISC metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 SHA1 76e56ef0ec9c71b3032d1c501e358dd80fa1664b SHA256 4710a38e11b23d4355a7a0cba621d9680e2148aa173528491e88903487e93152 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 metadata.xml 222 diff --git a/dev-util/subversion/files/subversion-1.4.3-debug-config.patch b/dev-util/subversion/files/subversion-1.4.3-debug-config.patch new file mode 100644 index 000000000000..fe6abafec101 --- /dev/null +++ b/dev-util/subversion/files/subversion-1.4.3-debug-config.patch @@ -0,0 +1,29 @@ +--- configure.in.orig 2007-02-27 21:58:01.000000000 +0100 ++++ configure.in 2007-02-27 22:00:07.000000000 +0100 +@@ -433,7 +433,7 @@ + + AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug], +- [Turn on debugging and compile time warnings]), ++ [(gentoo) disabled, just observe CFLAGS]), + [ + if test "$enableval" = "yes" ; then + enable_debugging="yes" +@@ -441,17 +441,6 @@ + enable_debugging="no" + fi + ]) +-if test "$enable_debugging" = "yes" ; then +- dnl At the moment, we don't want optimization, because we're +- dnl debugging. +- dnl ### actually, debugging should be fine with the default -O2 +- CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-O[^ ]* //g'`"] +-else +- if test "$enable_debugging" = "no" ; then +- CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`"] +- fi +-fi +- + + AC_ARG_WITH(editor, + AC_HELP_STRING([--with-editor=PATH], diff --git a/dev-util/subversion/subversion-1.4.3.ebuild b/dev-util/subversion/subversion-1.4.3.ebuild index d2d0d0a774c4..67ad3ee07529 100644 --- a/dev-util/subversion/subversion-1.4.3.ebuild +++ b/dev-util/subversion/subversion-1.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3.ebuild,v 1.2 2007/02/24 16:10:06 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3.ebuild,v 1.3 2007/02/27 21:31:50 pauldv Exp $ inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2 @@ -64,6 +64,7 @@ src_unpack() { epatch ${FILESDIR}/subversion-hotbackup-config.patch epatch ${FILESDIR}/subversion-1.3.1-neon-config.patch epatch ${FILESDIR}/subversion-apr_cppflags.patch + epatch ${FILESDIR}/subversion-1.4.3-debug-config.patch # rapidsvn developers work with 1.3.2 export WANT_AUTOCONF=2.5 -- 2.26.2