From 189a66baaadbbe9af0dec30f0f68687507bd2008 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Sun, 23 Nov 2008 12:48:44 +0000 Subject: [PATCH] Stefan Fiedler: e2fsprogs, util-linux-ng: fix for uclibc build [2008101921234827727] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9146 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/e2fsprogs/e2fsprogs.conf | 5 +++++ package/base/util-linux-ng/util-linux-ng.conf | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/base/e2fsprogs/e2fsprogs.conf b/package/base/e2fsprogs/e2fsprogs.conf index 9570eb4b5..459886855 100644 --- a/package/base/e2fsprogs/e2fsprogs.conf +++ b/package/base/e2fsprogs/e2fsprogs.conf @@ -35,6 +35,11 @@ if [ "$ROCKCFG_DIETLIBC_e2fsprogs" == "1" ] ; then var_append extraconfopt " " "--enable-dynamic-e2fsck" fi +if [ "$ROCKCFG_PKG_UCLIBC_USEIT" == "1" ] ; then + # e2fsprogs needs a ___tls_get_addr symbol in libc when using TLS + var_append extraconfopt " " "--disable-tls" +fi + hook_add premake 3 "chmod -v 0755 configure ; \ cp -v configure{,.orig} ; \ sed -e \"/libdir=.*\/lib/s@/lib@/$multilib@g\" configure.orig > configure" diff --git a/package/base/util-linux-ng/util-linux-ng.conf b/package/base/util-linux-ng/util-linux-ng.conf index c55b89ca5..8dd8a4c34 100644 --- a/package/base/util-linux-ng/util-linux-ng.conf +++ b/package/base/util-linux-ng/util-linux-ng.conf @@ -35,6 +35,12 @@ var_append extraconfopt ' ' '--enable-rdev' var_append extraconfopt ' ' '--enable-write' var_append extraconfopt ' ' '--disable-wall' +if [ "$ROCKCFG_PKG_UCLIBC_USEIT" = 1 ] ; then + # E.g. mkfs doesn't link to an external libintl by itself, + # causing a build failure if using NLS. + var_append CC_WRAPPER_APPEND " " "-lintl" +fi + var_append INSTALL_WRAPPER_FILTER '|' 'sed -e"s,/usr/bin/\(arch\|dmesg\|more\|mount\|umount\),/bin/\1," -e"s,/usr/sbin/\(addpart\|agetty\|blockdev\|cfdisk\|ctrlaltdel\|delpart\|fdisk\|fsck.cramfs\|fsck.minix\|hwclock\|losetup\|mkfs\|mkfs.bfs\|mkfs.cramfs\|mkfs.minix\|mkswap\|partx\|pivot_root\|raw\|sfdisk\|swapoff\|swapon\),/sbin/\1,"' # The following programs are no longer available in util-linux-ng: