vapier 14/08/05 10:40:46 Modified: e2fsprogs-libs-1.42.11.ebuild ChangeLog Log: Re-enable libuuid/libblkid for non-Linux platforms #278667 by Alexis Ballier. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.3 sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild?r1=1.2&r2=1.3 Index: e2fsprogs-libs-1.42.11.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- e2fsprogs-libs-1.42.11.ebuild 5 Aug 2014 07:57:48 -0000 1.2 +++ e2fsprogs-libs-1.42.11.ebuild 5 Aug 2014 10:40:46 -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/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild,v 1.2 2014/08/05 07:57:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild,v 1.3 2014/08/05 10:40:46 vapier Exp $ EAPI="4" @@ -41,20 +41,23 @@ } multilib_src_configure() { + local myconf=() # we use blkid/uuid from util-linux now - ac_cv_lib_uuid_uuid_generate=yes \ - ac_cv_lib_blkid_blkid_get_cache=yes \ + if use kernel_linux ; then + export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes + myconf+=( --disable-lib{blkid,uuid} ) + fi ac_cv_path_LDCONFIG=: \ ECONF_SOURCE="${S}" \ CC="$(tc-getCC)" \ BUILD_CC="$(tc-getBUILD_CC)" \ BUILD_LD="$(tc-getBUILD_LD)" \ econf \ - --disable-lib{blkid,uuid} \ --disable-quota \ $(tc-is-static-only || echo --enable-elf-shlibs) \ $(tc-has-tls || echo --disable-tls) \ - $(use_enable nls) + $(use_enable nls) \ + "${myconf[@]}" } multilib_src_compile() { @@ -63,7 +66,7 @@ multilib_src_install() { emake V=1 STRIP=: DESTDIR="${D}" install || die - multilib_is_native_abi && gen_usr_ldscript -a com_err ss + multilib_is_native_abi && gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') # configure doesn't have an option to disable static libs :/ use static-libs || find "${ED}" -name '*.a' -delete } 1.124 sys-libs/e2fsprogs-libs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog?rev=1.124&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog?rev=1.124&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog?r1=1.123&r2=1.124 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- ChangeLog 5 Aug 2014 07:57:48 -0000 1.123 +++ ChangeLog 5 Aug 2014 10:40:46 -0000 1.124 @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/e2fsprogs-libs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.123 2014/08/05 07:57:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.124 2014/08/05 10:40:46 vapier Exp $ + + 05 Aug 2014; Mike Frysinger <[email protected]> e2fsprogs-libs-1.42.11.ebuild: + Re-enable libuuid/libblkid for non-Linux platforms #278667 by Alexis Ballier. 05 Aug 2014; Mike Frysinger <[email protected]> +files/e2fsprogs-libs-1.42.11-prototypes.patch, e2fsprogs-libs-1.42.11.ebuild:
