New Version

5 files changed, 102 insertions, 1 deletions

diff --git a/dev-util/xmingw-gcc/ChangeLog b/dev-util/xmingw-gcc/ChangeLog
index c3903f697ecd..4277723b6bb6 100644
--- a/dev-util/xmingw-gcc/ChangeLog
+++ b/dev-util/xmingw-gcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/xmingw-gcc
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/ChangeLog,v 1.6 2004/06/25 02:51:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/ChangeLog,v 1.7 2004/09/10 15:51:31 cretin Exp $
+
+*xmingw-gcc-3.4.1 (10 Sep 2004)
+
+  10 Sep 2004; Stefan Jones <cretin@gentoo.org>:
+  New version
 
   05 Apr 2004; Stefan Jones <cretin@gentoo.org>:
   Fix compile problem due to missing path, #46776 
diff --git a/dev-util/xmingw-gcc/Manifest b/dev-util/xmingw-gcc/Manifest
index aeac0962f541..ea4001d1a81e 100644
--- a/dev-util/xmingw-gcc/Manifest
+++ b/dev-util/xmingw-gcc/Manifest
@@ -1,4 +1,8 @@
+MD5 2a49d7e1cc3cec78c1d8980362b86872 xmingw-gcc-3.4.1.ebuild 1801
 MD5 3b27429dd2bb01904e721249b521a121 xmingw-gcc-3.3.1.ebuild 1982
 MD5 84811c18188bca0da0c357b2484711af ChangeLog 648
+MD5 038c37c9fd551b9edb8167ad74a7c438 xmingw-gcc-3.4.1.ebuild.bad 2091
+MD5 8f19d88fb59c78e728862642831634ab files/gcc-3.4.1-includefix.diff 682
 MD5 fe157877214b1306a195eec777847350 files/digest-xmingw-gcc-3.3.1 279
+MD5 d94869dc65ae2aec7ac12e6527d74d17 files/digest-xmingw-gcc-3.4.1 279
 MD5 f15585878583770a2d6c7d0ce5014264 files/gcc-3.3.1-includefix.diff 798
diff --git a/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.1 b/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.1
new file mode 100644
index 000000000000..dc1897121fc4
--- /dev/null
+++ b/dev-util/xmingw-gcc/files/digest-xmingw-gcc-3.4.1
@@ -0,0 +1,4 @@
+MD5 31b459062499f9f68d451db9cbf3205c gcc-3.4.1.tar.bz2 27182385
+MD5 f99a57c39ca784b3aaededd9f7c384d5 gcc-3.4.1-20040711-1-src.diff.gz 85777
+MD5 21e9970d7c828eabd380132aa806dd41 mingw-runtime-3.3-src.tar.gz 271695
+MD5 395369c2c0c67394e54855f7516de3d3 w32api-2.5-src.tar.gz 980189
diff --git a/dev-util/xmingw-gcc/files/gcc-3.4.1-includefix.diff b/dev-util/xmingw-gcc/files/gcc-3.4.1-includefix.diff
new file mode 100644
index 000000000000..9107aba8646e
--- /dev/null
+++ b/dev-util/xmingw-gcc/files/gcc-3.4.1-includefix.diff
@@ -0,0 +1,18 @@
+--- gcc-3.4.1/gcc/config/i386/t-cygming.jj	2004-07-21 19:00:22.495332312 +0200
++++ gcc-3.4.1/gcc/config/i386/t-cygming	2004-07-21 19:01:08.511336816 +0200
+@@ -8,7 +8,8 @@
+ # If we are building next to winsup, this will let us find the real
+ # limits.h when building libgcc2.  Otherwise, winsup must be installed
+ # first.
+-LIBGCC2_INCLUDES = -I$(srcdir)/../winsup/w32api/include
++LIBGCC2_INCLUDES = -I$(srcdir)/../winsup/w32api/include \
++	-I$(srcdir)/../winsup/cygwin/include
+ 
+ LIB2FUNCS_EXTRA = $(srcdir)/config/i386/w32-shared-ptr.c
+ 
+@@ -19,3 +20,5 @@
+ 	$(srcdir)/config/i386/winnt.c
+ 
+ STMP_FIXINC=stmp-fixinc
++
++CRTSTUFF_CFLAGS += -isystem $(srcdir)/../winsup/cygwin/include
diff --git a/dev-util/xmingw-gcc/xmingw-gcc-3.4.1.ebuild b/dev-util/xmingw-gcc/xmingw-gcc-3.4.1.ebuild
new file mode 100644
index 000000000000..3bd229242c1d
--- /dev/null
+++ b/dev-util/xmingw-gcc/xmingw-gcc-3.4.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-gcc/xmingw-gcc-3.4.1.ebuild,v 1.1 2004/09/10 15:51:31 cretin Exp $
+
+MY_P=${P/xmingw-/}
+S=${WORKDIR}/${MY_P}
+MINGW_PATCH=gcc-3.4.1-20040711-1-src.diff.gz
+RUNTIME=mingw-runtime-3.3
+W32API=w32api-2.5
+
+DESCRIPTION="The GNU Compiler Collection - i386-mingw32msvc-gcc only"
+HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${MY_P}/${MY_P}.tar.bz2
+		mirror://sourceforge/mingw/${MINGW_PATCH}
+		mirror://sourceforge/mingw/${RUNTIME}-src.tar.gz
+		mirror://sourceforge/mingw/${W32API}-src.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="dev-util/xmingw-binutils"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	unpack ${RUNTIME}-src.tar.gz
+	unpack ${W32API}-src.tar.gz
+	cd ${S}; gzip -dc ${DISTDIR}/${MINGW_PATCH} | patch -p1
+	patch -p1 < ${FILESDIR}/gcc-3.4.1-includefix.diff
+
+	mkdir -p ${S}/winsup/cygwin ${S}/winsup/w32api
+	cd ${S}/winsup/cygwin;ln -s ${WORKDIR}/${RUNTIME}/include .
+	cd ${S}/winsup/w32api;ln -s ${WORKDIR}/${W32API}/include .
+}
+
+src_compile() {
+	export PATH=$PATH:/opt/xmingw/bin:/opt/xmingw/i386-mingw32msvc/bin
+	unset CFLAGS CXXFLAGS
+	if has_version dev-util/xmingw-runtime \
+	&& has_version dev-util/xmingw-w32api
+	then
+		lang=c,c++
+	else
+		lang=c
+	fi
+
+	./configure \
+		--target=i386-mingw32msvc \
+		--prefix=/opt/xmingw \
+		--enable-languages=${lang} \
+		--disable-shared \
+		--disable-nls \
+		--enable-threads \
+		--with-gcc \
+		--with-gnu-ld \
+		--with-gnu-as \
+		--disable-win32-registry \
+		--enable-sjlj-exceptions \
+		--without-x \
+		--without-newlib \
+			|| die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	export PATH=$PATH:/opt/xmingw/bin:/opt/xmingw/i386-mingw32msvc/bin
+	make DESTDIR="${D}" install || die "make install failed"
+}