diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-08-05 10:40:46 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-08-05 10:40:46 +0000 |
| commit | f9e8f74bb4ee423ac73c49bf74cd6aec6b4748ab (patch) | |
| tree | 6edfed6a6e3f760df8d817969ecea41085101ad5 /sys-libs/e2fsprogs-libs | |
| parent | Version bump, as requested by Milton in bug #517574. (diff) | |
| download | gentoo-2-f9e8f74bb4ee423ac73c49bf74cd6aec6b4748ab.tar.gz gentoo-2-f9e8f74bb4ee423ac73c49bf74cd6aec6b4748ab.tar.bz2 gentoo-2-f9e8f74bb4ee423ac73c49bf74cd6aec6b4748ab.zip | |
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)
Diffstat (limited to 'sys-libs/e2fsprogs-libs')
| -rw-r--r-- | sys-libs/e2fsprogs-libs/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog index 75110ff39d54..e73f52cda79c 100644 --- a/sys-libs/e2fsprogs-libs/ChangeLog +++ b/sys-libs/e2fsprogs-libs/ChangeLog @@ -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 <vapier@gentoo.org> e2fsprogs-libs-1.42.11.ebuild: + Re-enable libuuid/libblkid for non-Linux platforms #278667 by Alexis Ballier. 05 Aug 2014; Mike Frysinger <vapier@gentoo.org> +files/e2fsprogs-libs-1.42.11-prototypes.patch, e2fsprogs-libs-1.42.11.ebuild: diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild index ea8732f0686e..308c2705c241 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild @@ -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 @@ src_prepare() { } 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_compile() { 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 } |