diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-26 14:00:21 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-26 14:00:21 +0000 |
| commit | d762d08d79e61d42dcdb58c183b53c8a6dfcb58b (patch) | |
| tree | 91abe382eead1322ccb6632490251194d00a682a | |
| parent | Bumping to 1.5_pre20100921 (diff) | |
| download | gentoo-2-d762d08d79e61d42dcdb58c183b53c8a6dfcb58b.tar.gz gentoo-2-d762d08d79e61d42dcdb58c183b53c8a6dfcb58b.tar.bz2 gentoo-2-d762d08d79e61d42dcdb58c183b53c8a6dfcb58b.zip | |
Fix building with make >= 3.82 wrt #334847 by Diego E. Pettenò.
(Portage version: 2.2_rc87/cvs/Linux x86_64)
| -rw-r--r-- | dev-util/vdkbuilder/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch | 23 | ||||
| -rw-r--r-- | dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild | 22 |
3 files changed, 45 insertions, 8 deletions
diff --git a/dev-util/vdkbuilder/ChangeLog b/dev-util/vdkbuilder/ChangeLog index 6dba9f5c13ba..76f91513c942 100644 --- a/dev-util/vdkbuilder/ChangeLog +++ b/dev-util/vdkbuilder/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/vdkbuilder -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/ChangeLog,v 1.25 2009/07/14 09:27:27 flameeyes Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/ChangeLog,v 1.26 2010/09/26 14:00:21 ssuominen Exp $ + + 26 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> + vdkbuilder-2.4.0.ebuild, +files/vdkbuilder-2.4.0-make-382.patch: + Fix building with make >= 3.82 wrt #334847 by Diego E. Pettenò. 14 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org> vdkbuilder-2.4.0.ebuild: diff --git a/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch b/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch new file mode 100644 index 000000000000..4b0dc099607c --- /dev/null +++ b/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch @@ -0,0 +1,23 @@ +http://bugs.gentoo.org/334847 + +--- intl/Makefile.in ++++ intl/Makefile.in +@@ -202,12 +202,12 @@ + # The dependency for intlh.inst is different in gettext and all other + # packages. Because we cannot you GNU make features we have to solve + # the problem while rewriting Makefile.in. +-@GT_YES@intlh.inst: intlh.inst.in ../config.status +-@GT_YES@ cd .. \ +-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ +-@GT_YES@ $(SHELL) ./config.status +-@GT_NO@.PHONY: intlh.inst +-@GT_NO@intlh.inst: ++intlh.inst: intlh.inst.in ../config.status ++ cd .. \ ++ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ ++ $(SHELL) ./config.status ++.PHONY: intlh.inst ++intlh.inst: + + # Tell versions [3.59,3.63) of GNU make not to export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild b/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild index 2833fe5ec453..36a7a202e7f8 100644 --- a/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild +++ b/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild @@ -1,20 +1,24 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild,v 1.9 2009/10/12 08:10:16 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild,v 1.10 2010/09/26 14:00:21 ssuominen Exp $ -IUSE="nls debug" +inherit eutils MY_P=${PN}2-${PV} -S=${WORKDIR}/${MY_P} + DESCRIPTION="The Visual Development Kit used for VDK Builder." HOMEPAGE="http://vdkbuilder.sf.net" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="ppc sparc x86" +IUSE="nls debug" + +RDEPEND=">=dev-libs/vdk-2.4.0" +DEPEND="${RDEPEND}" -DEPEND=">=dev-libs/vdk-2.4.0" +S=${WORKDIR}/${MY_P} custom_cflags() { for files in * @@ -27,6 +31,12 @@ custom_cflags() { done } +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-make-382.patch +} + src_compile() { local myconf="" |