Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 16 years ago
parent
commit
189a66baaa
2 changed files with 11 additions and 0 deletions
  1. +5
    -0
      package/base/e2fsprogs/e2fsprogs.conf
  2. +6
    -0
      package/base/util-linux-ng/util-linux-ng.conf

+ 5
- 0
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"

+ 6
- 0
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:

Loading…
Cancel
Save