vapier 15/03/16 21:34:05
Modified: setools-3.3.8-r7.ebuild setools-3.3.8-r5.ebuild
ChangeLog
Log:
Use new toolchain helpers for selecting the bfd linker #467136 by Amadeusz
Sławiński. Clean up quoting/redundant die/semicolons too.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.4 app-admin/setools/setools-3.3.8-r7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild?r1=1.3&r2=1.4
Index: setools-3.3.8-r7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- setools-3.3.8-r7.ebuild 3 Mar 2015 19:57:39 -0000 1.3
+++ setools-3.3.8-r7.ebuild 16 Mar 2015 21:34:05 -0000 1.4
@@ -1,11 +1,11 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v
1.3 2015/03/03 19:57:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v
1.4 2015/03/16 21:34:05 vapier Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 python3_4 )
-inherit autotools java-pkg-opt-2 python-r1 eutils
+inherit autotools java-pkg-opt-2 python-r1 eutils toolchain-funcs
DESCRIPTION="SELinux policy tools"
HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml";
@@ -56,14 +56,9 @@
PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python
libseaudit/swig/python libsefs/swig/python python"
pkg_setup() {
- local myld=$(tc-getLD)
-
if use java; then
java-pkg-opt-2_pkg_setup
fi
-
- ${myld} -v | grep -q "GNU gold" && \
- ewarn "Bug #467136 shows us that the gold linker doesn't work with
setools for now."
}
src_prepare() {
@@ -95,6 +90,7 @@
}
src_configure() {
+ tc-ld-disable-gold #467136
econf \
--with-java-prefix=${JAVA_HOME} \
--disable-selinux-check \
@@ -111,29 +107,29 @@
}
src_compile() {
- emake LD="$(tc-getLD).bfd" || die "Failed to build setools"
+ emake
if use python; then
building() {
python_export PYTHON_INCLUDEDIR
python_export PYTHON_SITEDIR
python_export PYTHON_LIBS
- emake LD="$(tc-getLD).bfd" \
+ emake \
SWIG_PYTHON_CPPFLAGS="-I${PYTHON_INCLUDEDIR}" \
PYTHON_LDFLAGS="${PYTHON_LIBS}" \
pyexecdir="${PYTHON_SITEDIR}" \
pythondir="${PYTHON_SITEDIR}" \
- -C ${1};
+ -C "$1"
}
local dir
for dir in ${PYTHON_DIRS}; do
- python_foreach_impl building ${dir};
+ python_foreach_impl building ${dir}
done
fi
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install
if use python; then
installation() {
@@ -141,12 +137,12 @@
emake DESTDIR="${D}" \
pyexecdir="${PYTHON_SITEDIR}" \
pythondir="${PYTHON_SITEDIR}" \
- -C ${1} install
+ -C "$1" install
}
local dir
for dir in ${PYTHON_DIRS}; do
- python_foreach_impl installation ${dir};
+ python_foreach_impl installation "${dir}"
done
fi
}
1.3 app-admin/setools/setools-3.3.8-r5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.8-r5.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.8-r5.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.8-r5.ebuild?r1=1.2&r2=1.3
Index: setools-3.3.8-r5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r5.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setools-3.3.8-r5.ebuild 30 Jul 2014 12:04:04 -0000 1.2
+++ setools-3.3.8-r5.ebuild 16 Mar 2015 21:34:05 -0000 1.3
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r5.ebuild,v
1.2 2014/07/30 12:04:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r5.ebuild,v
1.3 2015/03/16 21:34:05 vapier Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
-inherit autotools java-pkg-opt-2 python-r1 eutils
+inherit autotools java-pkg-opt-2 python-r1 eutils toolchain-funcs
DESCRIPTION="SELinux policy tools"
HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml";
@@ -56,14 +56,9 @@
PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python
libseaudit/swig/python libsefs/swig/python python"
pkg_setup() {
- local myld=$(tc-getLD)
-
if use java; then
java-pkg-opt-2_pkg_setup
fi
-
- ${myld} -v | grep -q "GNU gold" && \
- ewarn "Bug #467136 shows us that the gold linker doesn't work with
setools for now."
}
src_prepare() {
@@ -107,6 +102,7 @@
}
src_configure() {
+ tc-ld-disable-gold #467136
econf \
--with-java-prefix=${JAVA_HOME} \
--disable-selinux-check \
@@ -123,29 +119,29 @@
}
src_compile() {
- emake LD="$(tc-getLD).bfd" || die "Failed to build setools"
+ emake
if use python; then
building() {
python_export PYTHON_INCLUDEDIR
python_export PYTHON_SITEDIR
python_export PYTHON_LIBS
- emake LD="$(tc-getLD).bfd" \
+ emake \
SWIG_PYTHON_CPPFLAGS="-I${PYTHON_INCLUDEDIR}" \
PYTHON_LDFLAGS="${PYTHON_LIBS}" \
pyexecdir="${PYTHON_SITEDIR}" \
pythondir="${PYTHON_SITEDIR}" \
- -C ${1};
+ -C "$1"
}
local dir
for dir in ${PYTHON_DIRS}; do
- python_foreach_impl building ${dir};
+ python_foreach_impl building ${dir}
done
fi
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install
if use python; then
installation() {
@@ -153,12 +149,12 @@
emake DESTDIR="${D}" \
pyexecdir="${PYTHON_SITEDIR}" \
pythondir="${PYTHON_SITEDIR}" \
- -C ${1} install
+ -C "$1" install
}
local dir
for dir in ${PYTHON_DIRS}; do
- python_foreach_impl installation ${dir};
+ python_foreach_impl installation "${dir}"
done
fi
}
1.99 app-admin/setools/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?rev=1.99&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?rev=1.99&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?r1=1.98&r2=1.99
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- ChangeLog 3 Mar 2015 19:57:39 -0000 1.98
+++ ChangeLog 16 Mar 2015 21:34:05 -0000 1.99
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/setools
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.98
2015/03/03 19:57:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.99
2015/03/16 21:34:05 vapier Exp $
+
+ 16 Mar 2015; Mike Frysinger <[email protected]> setools-3.3.8-r5.ebuild,
+ setools-3.3.8-r7.ebuild:
+ Use new toolchain helpers for selecting the bfd linker #467136 by Amadeusz
+ Sławiński. Clean up quoting/redundant die/semicolons too.
03 Mar 2015; Sven Vermeulen <[email protected]> setools-3.3.8-r7.ebuild:
Fix bug #542032 - SWIG version check does not work
