* [gentoo-commits] gentoo-x86 commit in dev-util/emilpro: emilpro-9999.ebuild metadata.xml emilpro-3-r1.ebuild ChangeLog emilpro-3.ebuild
@ 2014-03-19 2:50 Richard Farina (zerochaos)
0 siblings, 0 replies; only message in thread
From: Richard Farina (zerochaos) @ 2014-03-19 2:50 UTC (permalink / raw
To: gentoo-commits
zerochaos 14/03/19 02:50:34
Modified: emilpro-9999.ebuild metadata.xml ChangeLog
Added: emilpro-3-r1.ebuild
Removed: emilpro-3.ebuild
Log:
enable building with system binutils, respect cxxflags
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Revision Changes Path
1.2 dev-util/emilpro/emilpro-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/emilpro-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/emilpro-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/emilpro-9999.ebuild?r1=1.1&r2=1.2
Index: emilpro-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/emilpro/emilpro-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emilpro-9999.ebuild 18 Mar 2014 04:26:05 -0000 1.1
+++ emilpro-9999.ebuild 19 Mar 2014 02:50:34 -0000 1.2
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/emilpro/emilpro-9999.ebuild,v 1.1 2014/03/18 04:26:05 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/emilpro/emilpro-9999.ebuild,v 1.2 2014/03/19 02:50:34 zerochaos Exp $
EAPI=5
-inherit cmake-utils
+inherit cmake-utils eutils
DESCRIPTION="a graphical disassembler for a large number of instruction sets"
HOMEPAGE="http://www.emilpro.com/"
@@ -16,31 +16,41 @@
SRC_URI="mirror://gnu/binutils/binutils-2.23.2.tar.bz2"
else
SRC_URI="http://www.emilpro.com/${P}.tar.gz
- mirror://gnu/binutils/binutils-2.23.2.tar.bz2"
+ !system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
KEYWORDS="~amd64"
fi
LICENSE="GPL-2"
SLOT="0"
-IUSE=""
+IUSE="+system-binutils"
DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
dev-cpp/gtkmm:3.0
dev-cpp/gtksourceviewmm:3.0
dev-cpp/libxmlpp:2.6
+ system-binutils? ( sys-devel/binutils[multitarget] )
net-misc/curl"
RDEPEND="${DEPEND}"
src_prepare() {
- sed -i "s#wget -O binutils.tar.bz2 http://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
+ epatch "${FILESDIR}"/respect-cflags.patch
+ if use system-binutils; then
+ epatch "${FILESDIR}"/use-gentoo-binutils.patch
+ else
+ sed -i "s#wget -O binutils.tar.bz2 http://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
+ fi
cmake-utils_src_prepare
}
src_compile() {
- #it builds with one thread no matter what,
- #but somehow it still fails if I don't do this
- cd "${BUILD_DIR}"
- emake -j1
+ if use system-binutils; then
+ cmake-utils_src_compile
+ else
+ #bundled binutils is broken, always builds with one thread
+ #but somehow it still fails if I don't do this
+ cd "${BUILD_DIR}"
+ emake -j1
+ fi
}
src_install() {
1.2 dev-util/emilpro/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/metadata.xml?r1=1.1&r2=1.2
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/emilpro/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml 18 Mar 2014 04:26:05 -0000 1.1
+++ metadata.xml 19 Mar 2014 02:50:34 -0000 1.2
@@ -7,4 +7,7 @@
</maintainer>
<longdescription lang="en">
</longdescription>
+<use>
+<flag name="system-binutils">Use the gentoo binutils instead of building against an unpatched vanilla version</flag>
+</use>
</pkgmetadata>
1.2 dev-util/emilpro/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/ChangeLog?r1=1.1&r2=1.2
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/emilpro/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog 18 Mar 2014 04:26:05 -0000 1.1
+++ ChangeLog 19 Mar 2014 02:50:34 -0000 1.2
@@ -1,6 +1,13 @@
# ChangeLog for dev-util/emilpro
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/emilpro/ChangeLog,v 1.1 2014/03/18 04:26:05 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/emilpro/ChangeLog,v 1.2 2014/03/19 02:50:34 zerochaos Exp $
+
+*emilpro-3-r1 (19 Mar 2014)
+
+ 19 Mar 2014; Rick Farina <zerochaos@gentoo.org> +emilpro-3-r1.ebuild,
+ +files/respect-cflags.patch, +files/use-gentoo-binutils.patch,
+ -emilpro-3.ebuild, emilpro-9999.ebuild, metadata.xml:
+ enable building with system binutils, respect cxxflags
*emilpro-3 (18 Mar 2014)
*emilpro-9999 (18 Mar 2014)
1.1 dev-util/emilpro/emilpro-3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/emilpro-3-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/emilpro-3-r1.ebuild?rev=1.1&content-type=text/plain
Index: emilpro-3-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/emilpro/emilpro-3-r1.ebuild,v 1.1 2014/03/19 02:50:34 zerochaos Exp $
EAPI=5
inherit cmake-utils eutils
DESCRIPTION="a graphical disassembler for a large number of instruction sets"
HOMEPAGE="http://www.emilpro.com/"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/SimonKagstrom/emilpro"
inherit git-r3
KEYWORDS=""
SRC_URI="mirror://gnu/binutils/binutils-2.23.2.tar.bz2"
else
SRC_URI="http://www.emilpro.com/${P}.tar.gz
!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )"
KEYWORDS="~amd64"
fi
LICENSE="GPL-2"
SLOT="0"
IUSE="+system-binutils"
DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
dev-cpp/gtkmm:3.0
dev-cpp/gtksourceviewmm:3.0
dev-cpp/libxmlpp:2.6
system-binutils? ( sys-devel/binutils[multitarget] )
net-misc/curl"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}"/respect-cflags.patch
if use system-binutils; then
epatch "${FILESDIR}"/use-gentoo-binutils.patch
else
sed -i "s#wget -O binutils.tar.bz2 http://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
fi
cmake-utils_src_prepare
}
src_compile() {
if use system-binutils; then
cmake-utils_src_compile
else
#bundled binutils is broken, always builds with one thread
#but somehow it still fails if I don't do this
cd "${BUILD_DIR}"
emake -j1
fi
}
src_install() {
dobin "${BUILD_DIR}"/emilpro
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-03-19 2:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-19 2:50 [gentoo-commits] gentoo-x86 commit in dev-util/emilpro: emilpro-9999.ebuild metadata.xml emilpro-3-r1.ebuild ChangeLog emilpro-3.ebuild Richard Farina (zerochaos)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox