vapier 14/11/15 04:17:12 Modified: unrar-5.2.2.ebuild ChangeLog Log: Build the lib & bin in diff subdirs so we can avoid the clean step. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.3 app-arch/unrar/unrar-5.2.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/unrar/unrar-5.2.2.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/unrar/unrar-5.2.2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/unrar/unrar-5.2.2.ebuild?r1=1.2&r2=1.3 Index: unrar-5.2.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.2.2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- unrar-5.2.2.ebuild 15 Nov 2014 04:16:16 -0000 1.2 +++ unrar-5.2.2.ebuild 15 Nov 2014 04:17:12 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.2.2.ebuild,v 1.2 2014/11/15 04:16:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.2.2.ebuild,v 1.3 2014/11/15 04:17:12 vapier Exp $ EAPI=5 inherit eutils flag-o-matic multilib toolchain-funcs @@ -32,27 +32,29 @@ sed -i "${sed_args[@]}" makefile } +src_configure() { + mkdir -p build-{lib,bin} + printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die + cp build-{lib,bin}/Makefile || die +} + src_compile() { unrar_make() { emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@" } - unrar_make CXXFLAGS+=" -fPIC" lib - ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname) - ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname ${PV}) - - # The stupid code compiles a lot of objects differently if - # they're going into a lib (-DRARDLL) or into the main app. - # So for now, we can't link the main app against the lib. - unrar_make clean - unrar_make + unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib + ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) + ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) + + unrar_make -C build-bin } src_install() { - dobin unrar + dobin build-bin/unrar dodoc readme.txt - dolib.so libunrar* + dolib.so build-lib/libunrar* insinto /usr/include/libunrar${PV%.*.*} doins *.hpp 1.238 app-arch/unrar/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/unrar/ChangeLog?rev=1.238&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/unrar/ChangeLog?rev=1.238&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/unrar/ChangeLog?r1=1.237&r2=1.238 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- ChangeLog 15 Nov 2014 04:16:16 -0000 1.237 +++ ChangeLog 15 Nov 2014 04:17:12 -0000 1.238 @@ -1,6 +1,9 @@ # ChangeLog for app-arch/unrar # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.237 2014/11/15 04:16:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/ChangeLog,v 1.238 2014/11/15 04:17:12 vapier Exp $ + + 15 Nov 2014; Mike Frysinger <[email protected]> unrar-5.2.2.ebuild: + Build the lib & bin in diff subdirs so we can avoid the clean step. 15 Nov 2014; Mike Frysinger <[email protected]> unrar-5.1.6.ebuild, unrar-5.2.1.ebuild, unrar-5.2.2.ebuild,
