diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2004-03-15 22:12:28 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-03-15 22:12:28 +0000 |
commit | 78bc3aed04539116021203a5a11730ec9e5164f3 (patch) | |
tree | f400a8a5867a412fc0d2b050348daf988873d0f9 /dev-util/xmingw-runtime | |
parent | don't assign to P; use emake; error messages; tidy (Manifest recommit) (diff) | |
download | gentoo-2-78bc3aed04539116021203a5a11730ec9e5164f3.tar.gz gentoo-2-78bc3aed04539116021203a5a11730ec9e5164f3.tar.bz2 gentoo-2-78bc3aed04539116021203a5a11730ec9e5164f3.zip |
don't assign to P; error messages; tidy
Diffstat (limited to 'dev-util/xmingw-runtime')
-rw-r--r-- | dev-util/xmingw-runtime/ChangeLog | 8 | ||||
-rw-r--r-- | dev-util/xmingw-runtime/xmingw-runtime-3.1.ebuild | 38 | ||||
-rw-r--r-- | dev-util/xmingw-runtime/xmingw-runtime-3.2.ebuild | 35 |
3 files changed, 45 insertions, 36 deletions
diff --git a/dev-util/xmingw-runtime/ChangeLog b/dev-util/xmingw-runtime/ChangeLog index 9ee772eec5ce..269247cfae91 100644 --- a/dev-util/xmingw-runtime/ChangeLog +++ b/dev-util/xmingw-runtime/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/xmingw-runtime -# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-runtime/ChangeLog,v 1.2 2003/10/28 19:50:17 cretin Exp $ +# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-runtime/ChangeLog,v 1.3 2004/03/15 22:12:28 mr_bones_ Exp $ + + 15 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> + xmingw-runtime-3.1.ebuild, xmingw-runtime-3.2.ebuild: + don't assign to P; error messages; tidy * xmingw-runtime-3.2 (28 Oct 2003) diff --git a/dev-util/xmingw-runtime/xmingw-runtime-3.1.ebuild b/dev-util/xmingw-runtime/xmingw-runtime-3.1.ebuild index 3978fee1d05c..5e4611d277d7 100644 --- a/dev-util/xmingw-runtime/xmingw-runtime-3.1.ebuild +++ b/dev-util/xmingw-runtime/xmingw-runtime-3.1.ebuild @@ -1,34 +1,35 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-runtime/xmingw-runtime-3.1.ebuild,v 1.1 2003/10/02 10:23:31 cretin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-runtime/xmingw-runtime-3.1.ebuild,v 1.2 2004/03/15 22:12:28 mr_bones_ Exp $ -DESCRIPTION="Free Win32 runtime and import library definitions" +MY_P=${P/xming/ming} +S=${WORKDIR}/${MY_P} +DESCRIPTION="Free Win32 runtime and import library definitions" HOMEPAGE="http://www.mingw.org" - -P=${P/xming/ming} - -SRC_URI="mirror://sourceforge/mingw/${P}-src.tar.gz" +SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="x86" IUSE="" + DEPEND="dev-util/xmingw-binutils dev-util/xmingw-gcc dev-util/xmingw-w32api" -S=${WORKDIR}/${P} - -export PATH=$PATH:/opt/xmingw/bin:/opt/xmingw/i386-mingw32msvc/bin -unset CFLAGS CXXFLAGS - -src_unpack() { - unpack ${P}-src.tar.gz -} - src_compile() { - RANLIB=i386-mingw32msvc-ranlib AR=i386-mingw32msvc-ar AS=i386-mingw32msvc-as CC=i386-mingw32msvc-gcc ./configure --target=i386-mingw32msvc --prefix=/opt/mingw32/i386-mingw32msvc + export PATH=$PATH:/opt/xmingw/bin:/opt/xmingw/i386-mingw32msvc/bin + unset CFLAGS CXXFLAGS + + RANLIB=i386-mingw32msvc-ranlib \ + AR=i386-mingw32msvc-ar \ + AS=i386-mingw32msvc-as \ + CC=i386-mingw32msvc-gcc \ + ./configure \ + --target=i386-mingw32msvc \ + --prefix=/opt/mingw32/i386-mingw32msvc \ + || die "configure failed" cd mingwex make W32API_INCLUDE=-I/opt/xmingw/i386-mingw32msvc/include || die cd .. @@ -36,5 +37,6 @@ src_compile() { } src_install() { - make install prefix=${D}/opt/xmingw/i386-mingw32msvc || die + make install prefix=${D}/opt/xmingw/i386-mingw32msvc \ + || die "make install failed" } diff --git a/dev-util/xmingw-runtime/xmingw-runtime-3.2.ebuild b/dev-util/xmingw-runtime/xmingw-runtime-3.2.ebuild index 36af433eaba9..fc3bbacdba4f 100644 --- a/dev-util/xmingw-runtime/xmingw-runtime-3.2.ebuild +++ b/dev-util/xmingw-runtime/xmingw-runtime-3.2.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-runtime/xmingw-runtime-3.2.ebuild,v 1.1 2003/10/28 19:50:17 cretin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-runtime/xmingw-runtime-3.2.ebuild,v 1.2 2004/03/15 22:12:28 mr_bones_ Exp $ -DESCRIPTION="Free Win32 runtime and import library definitions" +MY_P=${P/xming/ming} +S=${WORKDIR}/${MY_P} +DESCRIPTION="Free Win32 runtime and import library definitions" HOMEPAGE="http://www.mingw.org" -P=${P/xming/ming} -SRC_URI="mirror://sourceforge/mingw/${P}-src.tar.gz" +SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz" LICENSE="BSD" SLOT="0" @@ -18,17 +19,18 @@ DEPEND="dev-util/xmingw-binutils dev-util/xmingw-gcc dev-util/xmingw-w32api" -S=${WORKDIR}/${P} - -export PATH=$PATH:/opt/xmingw/bin:/opt/xmingw/i386-mingw32msvc/bin -unset CFLAGS CXXFLAGS - -src_unpack() { - unpack ${P}-src.tar.gz -} - src_compile() { - RANLIB=i386-mingw32msvc-ranlib AR=i386-mingw32msvc-ar AS=i386-mingw32msvc-as CC=i386-mingw32msvc-gcc ./configure --target=i386-mingw32msvc --prefix=/opt/mingw32/i386-mingw32msvc + export PATH=$PATH:/opt/xmingw/bin:/opt/xmingw/i386-mingw32msvc/bin + unset CFLAGS CXXFLAGS + + RANLIB=i386-mingw32msvc-ranlib \ + AR=i386-mingw32msvc-ar \ + AS=i386-mingw32msvc-as \ + CC=i386-mingw32msvc-gcc \ + ./configure \ + --target=i386-mingw32msvc \ + --prefix=/opt/mingw32/i386-mingw32msvc \ + || die "configure failed" cd mingwex make W32API_INCLUDE=-I/opt/xmingw/i386-mingw32msvc/include || die cd .. @@ -36,5 +38,6 @@ src_compile() { } src_install() { - make install prefix=${D}/opt/xmingw/i386-mingw32msvc || die + make install prefix=${D}/opt/xmingw/i386-mingw32msvc \ + || die "make install failed" } |