summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-11-18 14:38:06 +0000
committerJeroen Roovers <jer@gentoo.org>2013-11-18 14:38:06 +0000
commitb1c9c2d47766861f70ee5dda78370cae0c961ec1 (patch)
treee94f6be579bd45f9094b0f21669ce821dceb5648 /app-arch
parentVersion bump. (diff)
downloadgentoo-2-b1c9c2d47766861f70ee5dda78370cae0c961ec1.tar.gz
gentoo-2-b1c9c2d47766861f70ee5dda78370cae0c961ec1.tar.bz2
gentoo-2-b1c9c2d47766861f70ee5dda78370cae0c961ec1.zip
Stop configure from mangling CFLAGS/LDFLAGS by Andrew Savchenko (bug #481810).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/dpkg/ChangeLog9
-rw-r--r--app-arch/dpkg/dpkg-1.17.1-r1.ebuild (renamed from app-arch/dpkg/dpkg-1.17.1.ebuild)6
-rw-r--r--app-arch/dpkg/files/dpkg-1.17.1-flags.patch11
3 files changed, 22 insertions, 4 deletions
diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 8cc13e0c7e1f..c9e4054f10e5 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-arch/dpkg
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.236 2013/10/02 04:43:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.237 2013/11/18 14:38:05 jer Exp $
+
+*dpkg-1.17.1-r1 (18 Nov 2013)
+
+ 18 Nov 2013; Jeroen Roovers <jer@gentoo.org> -dpkg-1.17.1.ebuild,
+ +dpkg-1.17.1-r1.ebuild, +files/dpkg-1.17.1-flags.patch:
+ Stop configure from mangling CFLAGS/LDFLAGS by Andrew Savchenko (bug
+ #481810).
*dpkg-1.16.12 (02 Oct 2013)
diff --git a/app-arch/dpkg/dpkg-1.17.1.ebuild b/app-arch/dpkg/dpkg-1.17.1-r1.ebuild
index 07118d7a946a..1d5a82451994 100644
--- a/app-arch/dpkg/dpkg-1.17.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.17.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.1.ebuild,v 1.2 2013/08/11 15:27:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.1-r1.ebuild,v 1.1 2013/11/18 14:38:05 jer Exp $
EAPI=5
inherit eutils multilib autotools toolchain-funcs
@@ -45,6 +45,8 @@ src_prepare() {
# do not expect Debian's gzip --rsyncable extension
epatch "${FILESDIR}"/${PN}-1.17.0-gzip-rsyncable.patch
+ epatch "${FILESDIR}"/${PN}-1.17.1-flags.patch
+
# Force the use of the running bash for get-version (this file is never
# installed, so no need to worry about hardcoding a temporary bash)
sed -i -e '1c\#!'"${BASH}" get-version || die
@@ -74,9 +76,7 @@ src_configure() {
$(use_with bzip2 bz2) \
$(use_with zlib) \
$(use_with lzma liblzma) \
- --disable-compiler-optimisations \
--disable-compiler-warnings \
- --disable-linker-optimisations \
--disable-silent-rules \
--disable-start-stop-daemon \
--localstatedir="${EPREFIX}"/var \
diff --git a/app-arch/dpkg/files/dpkg-1.17.1-flags.patch b/app-arch/dpkg/files/dpkg-1.17.1-flags.patch
new file mode 100644
index 000000000000..9517714fa41b
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.17.1-flags.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,8 +104,6 @@
+ # Checks for the build machinery.
+ AC_DEFINE(LIBDPKG_VOLATILE_API, 1, [Acknowledge the volatility of the API.])
+ DPKG_COMPILER_WARNINGS
+-DPKG_COMPILER_OPTIMISATIONS
+-DPKG_LINKER_OPTIMISATIONS
+ DPKG_ARCHITECTURE
+
+ AC_CONFIG_FILES([ Makefile