diff options
author | 2011-09-29 21:09:25 +0000 | |
---|---|---|
committer | 2011-09-29 21:09:25 +0000 | |
commit | 61fa0e34f139980274b4eb9423c12e02b32bc926 (patch) | |
tree | 4cabe6e5331befe7cb52bc6035cd9a706f83594b /sys-apps | |
parent | Version bump, bug 382259 (diff) | |
download | gentoo-2-61fa0e34f139980274b4eb9423c12e02b32bc926.tar.gz gentoo-2-61fa0e34f139980274b4eb9423c12e02b32bc926.tar.bz2 gentoo-2-61fa0e34f139980274b4eb9423c12e02b32bc926.zip |
Version bumped. Respect LDFLAGS
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/ccs-tools/ChangeLog | 9 | ||||
-rw-r--r-- | sys-apps/ccs-tools/ccs-tools-1.8.3_p20110929.ebuild | 71 | ||||
-rw-r--r-- | sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20110929-ldflags.patch | 52 |
3 files changed, 131 insertions, 1 deletions
diff --git a/sys-apps/ccs-tools/ChangeLog b/sys-apps/ccs-tools/ChangeLog index f42b8822c6c7..9e81069e9c05 100644 --- a/sys-apps/ccs-tools/ChangeLog +++ b/sys-apps/ccs-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/ccs-tools # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ChangeLog,v 1.8 2011/03/02 00:36:22 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ChangeLog,v 1.9 2011/09/29 21:09:25 naota Exp $ + +*ccs-tools-1.8.3_p20110929 (29 Sep 2011) + + 29 Sep 2011; Naohiro Aota <naota@gentoo.org> + +ccs-tools-1.8.3_p20110929.ebuild, + +files/ccs-tools-1.8.3_p20110929-ldflags.patch: + Version bumped. Respect LDFLAGS *ccs-tools-1.8.0_p20110214 (02 Mar 2011) diff --git a/sys-apps/ccs-tools/ccs-tools-1.8.3_p20110929.ebuild b/sys-apps/ccs-tools/ccs-tools-1.8.3_p20110929.ebuild new file mode 100644 index 000000000000..0f7d80ef15f7 --- /dev/null +++ b/sys-apps/ccs-tools/ccs-tools-1.8.3_p20110929.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ccs-tools-1.8.3_p20110929.ebuild,v 1.1 2011/09/29 21:09:25 naota Exp $ + +EAPI=3 +inherit eutils multilib toolchain-funcs + +MY_P="${P/_p/-}" +DESCRIPTION="TOMOYO Linux tools" +HOMEPAGE="http://tomoyo.sourceforge.jp/" +SRC_URI="mirror://sourceforge.jp/tomoyo/49693/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RESTRICT="test" + +DEPEND="sys-libs/ncurses + sys-libs/readline" +RDEPEND="${DEPEND} + sys-apps/which" + +S="${WORKDIR}/ccstools" + +src_prepare() { + epatch "${FILESDIR}"/${P}-ldflags.patch + sed -i \ + -e "s:gcc:$(tc-getCC):" \ + -e "s/\(CFLAGS.*:=\).*/\1 ${CFLAGS}/" \ + -e "s:/usr/lib:/usr/$(get_libdir):g" \ + -e "s:= /:= ${EPREFIX}/:g" \ + Include.make || die +} + +src_test() { + cd "${S}/kernel_test" + emake || die + ./testall.sh || die +} + +src_install() { + emake INSTALLDIR="${D}" install || die + +# insinto /etc/ccs +# doins ccstools.conf || die + + dodoc README.ccs +} + +pkg_postinst() { + elog "Execute the following command to setup the initial policy configuration:" + elog + elog "emerge --config =${CATEGORY}/${PF}" + elog + elog "For more information, please visit the following." + elog + elog "For >=kernel-2.6.36:" + elog "http://tomoyo.sourceforge.jp/2.3/" + elog + elog "For >=kernel-2.6.30:" + elog "http://tomoyo.sourceforge.jp/2.2/" + elog + elog "For <kernel-2.6.30 + ccs-patch:" + elog "http://tomoyo.sourceforge.jp/1.8/" +} + +pkg_config() { + /usr/$(get_libdir)/ccs/init_policy.sh +} diff --git a/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20110929-ldflags.patch b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20110929-ldflags.patch new file mode 100644 index 000000000000..7d2a31c98929 --- /dev/null +++ b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20110929-ldflags.patch @@ -0,0 +1,52 @@ +diff --git a/sbin/Makefile b/sbin/Makefile +index cc61f13..3bdb292 100644 +--- a/sbin/Makefile ++++ b/sbin/Makefile +@@ -9,7 +9,7 @@ install: all + $(INSTALL) -m 0700 $(BUILD_FILES) $(INSTALLDIR)$(SBINDIR) + + .c: +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + + clean: + rm -f -- $(BUILD_FILES) +diff --git a/usr_lib_ccs/Makefile b/usr_lib_ccs/Makefile +index 8181201..bee5eae 100644 +--- a/usr_lib_ccs/Makefile ++++ b/usr_lib_ccs/Makefile +@@ -11,7 +11,7 @@ install: all + $(INSTALL) -m 0644 ../README.ccs ../COPYING.ccs $(INSTALLDIR)/$(USRLIBDIR)/ccs/ + + .c: +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + + clean: + rm -f -- $(BUILD_FILES) +diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile +index 69a8d13..cd03d76 100644 +--- a/usr_sbin/Makefile ++++ b/usr_sbin/Makefile +@@ -15,17 +15,17 @@ + sleep 10 + + libccstools.so: ccstools.c ccstools.h +- $(CC) $(CFLAGS) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.3 -o libccstools.so.3.0.0 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.3 -o libccstools.so.3.0.0 + ln -sf libccstools.so.3.0.0 libccstools.so + + .c: +- $(CC) $(CFLAGS) -o $@ $< -lccstools -L. ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lccstools -L. + + ccs-editpolicy: ccstools.h editpolicy*.c readline.h /usr/include/curses.h libccstools.so +- $(CC) $(CFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON ++ $(CC) $(CFLAGS) $(LDFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON + + ccs-queryd: ccstools.h ccs-queryd.c readline.h /usr/include/curses.h libccstools.so +- $(CC) $(CFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L. ++ $(CC) $(CFLAGS) $(LDFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L. + + install: all + mkdir -p -m 0755 $(INSTALLDIR)$(USRLIBDIR) |