summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-02-17 00:19:46 +0000
committerMike Frysinger <vapier@gentoo.org>2007-02-17 00:19:46 +0000
commit89852b5d815405edb69c978f19d1f5c898d90861 (patch)
tree575d3b23b343a7fef601ac019b28ceee2b634d3f /dev-util
parentallow built_with_use to work even with hidden IUSE expanded vars #167166 (diff)
downloadgentoo-2-89852b5d815405edb69c978f19d1f5c898d90861.tar.gz
gentoo-2-89852b5d815405edb69c978f19d1f5c898d90861.tar.bz2
gentoo-2-89852b5d815405edb69c978f19d1f5c898d90861.zip
Add fix from upstream #166933 by Dennis Schridde.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/mingw-runtime/ChangeLog7
-rw-r--r--dev-util/mingw-runtime/files/mingw-runtime-3.11-include.patch30
-rw-r--r--dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.ebuild3
3 files changed, 38 insertions, 2 deletions
diff --git a/dev-util/mingw-runtime/ChangeLog b/dev-util/mingw-runtime/ChangeLog
index f1454d97fd4b..7ed5d75a4ace 100644
--- a/dev-util/mingw-runtime/ChangeLog
+++ b/dev-util/mingw-runtime/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/mingw-runtime
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.4 2007/02/14 23:25:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.5 2007/02/17 00:19:46 vapier Exp $
+
+ 17 Feb 2007; Mike Frysinger <vapier@gentoo.org>
+ +files/mingw-runtime-3.11-include.patch,
+ mingw-runtime-3.11_p20061202.ebuild:
+ Add fix from upstream #166933 by Dennis Schridde.
*mingw-runtime-3.11_p20061202 (14 Feb 2007)
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.11-include.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.11-include.patch
new file mode 100644
index 000000000000..082a3567f417
--- /dev/null
+++ b/dev-util/mingw-runtime/files/mingw-runtime-3.11-include.patch
@@ -0,0 +1,30 @@
+Fix from upstream
+
+http://bugs.gentoo.org/166933
+
+Index: Makefile.in
+===================================================================
+RCS file: /cvs/src/src/winsup/mingw/Makefile.in,v
+retrieving revision 1.69
+diff -r1.69 Makefile.in
+112c112
+< INCLUDES+= -I$(srcdir)/include \
+---
+> INCLUDES = -I$(srcdir)/include \
+116,117c116,117
+< ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
+< ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN)
+---
+> ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE) $(MNO_CYGWIN)
+> ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE) $(MNO_CYGWIN)
+Index: mingwex/Makefile.in
+===================================================================
+RCS file: /cvs/src/src/winsup/mingw/mingwex/Makefile.in,v
+retrieving revision 1.35
+diff -r1.35 Makefile.in
+111,112c111,112
+< ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
+< ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN)
+---
+> ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) $(W32API_INCLUDE) $(MNO_CYGWIN)
+> ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE) $(MNO_CYGWIN)
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.ebuild
index 7a3eca3e19a8..163c37b1b0cb 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.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/mingw-runtime/mingw-runtime-3.11_p20061202.ebuild,v 1.1 2007/02/14 23:25:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.ebuild,v 1.2 2007/02/17 00:19:46 vapier Exp $
# This version does not work as the configure script expects the installed
# cross-compiler to be able to link binaries ... except we haven't provided
@@ -51,6 +51,7 @@ src_unpack() {
sed -i \
-e "/W32API_INCLUDE/s:=.*:='-I /usr/${CTARGET}/usr/include':" \
$(find -name configure) || die
+ epatch "${FILESDIR}"/${PN}-3.11-include.patch #166933
epatch "${FILESDIR}"/${PN}-3.9-DESTDIR.patch
}