mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-fs/e2fsprogs: include dilfridge@'s changes to merged e2fsprogs-libs
From his overlay at https://gitweb.gentoo.org/dev/dilfridge.git/plain/sys-fs/e2fsprogs/e2fsprogs-1.46.3-r100.ebuild?id=8551292e0a0f847ab7072ffab9626a3003dca1ab. Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -80,8 +80,6 @@ multilib_src_configure() {
|
||||
$(tc-has-tls || echo --disable-tls)
|
||||
$(multilib_native_use_enable fuse fuse2fs)
|
||||
$(use_enable nls)
|
||||
--disable-libblkid
|
||||
--disable-libuuid
|
||||
$(multilib_native_use_enable tools e2initrd-helper)
|
||||
--disable-fsck
|
||||
--disable-uuidd
|
||||
@@ -92,14 +90,15 @@ multilib_src_configure() {
|
||||
# we use blkid/uuid from util-linux now
|
||||
if use kernel_linux ; then
|
||||
export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
|
||||
myeconfargs+=( --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 "${myeconfargs[@]}"
|
||||
ECONF_SOURCE="${S}" \
|
||||
CC="$(tc-getCC)" \
|
||||
BUILD_CC="$(tc-getBUILD_CC)" \
|
||||
BUILD_LD="$(tc-getBUILD_LD)" \
|
||||
econf "${myeconfargs[@]}"
|
||||
|
||||
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
|
||||
eerror "INTL sanity check failed, aborting build."
|
||||
|
||||
Reference in New Issue
Block a user