diff --git a/package/base/e2fsprogs/e2fsprogs.conf b/package/base/e2fsprogs/e2fsprogs.conf index 48a295792..2a4e45247 100644 --- a/package/base/e2fsprogs/e2fsprogs.conf +++ b/package/base/e2fsprogs/e2fsprogs.conf @@ -1,3 +1,4 @@ +#!/bin/bash # --- ROCK-COPYRIGHT-NOTE-BEGIN --- # # This copyright note is auto-generated by ./scripts/Create-CopyPatch. @@ -20,22 +21,21 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -if [ "$ROCKCFG_DIETLIBC_e2fsprogs" == "1" ] ; then - confopt="$confopt --with-diet-libc" - [ "$dietlibc_dynamic_static" = "dynamic" ] && confopt="$confopt --enable-dynamic-e2fsck" -fi +libdir="$root/$multilib" -confopt="$confopt --enable-fsck --libdir=$root/lib --with-root-prefix=$root/" +var_append extraconfopt " " '--enable-elf-shlibs --disable-evms' +# var_append extraconfopt " " '--with-root-prefix=$root/' -if [ $stagelevel -gt 1 -o "$crossnative" == "cross" ] ; -then - confopt="$confopt --enable-elf-shlibs" -fi +if [ "$ROCKCFG_DIETLIBC_e2fsprogs" == "1" ] ; then + var_append extraconfopt " " "--with-diet-libc" + [ "$dietlibc_dynamic_static" = "dynamic" ] && \ + var_append extraconfopt " " "--enable-dynamic-e2fsck" +fi # if you are brave, try without this and fix it... -LD=$CC +LD="$CC" # somehow "make install" seems not to exectue install-libs, which # is needed to get the headers installed (and static libraries also) var_append makeinstopt ' ' "install-libs" -postinstall="install -m 0644 ${confdir}/e2fsck.conf ${root}/etc/" +postinstall="install -m 0644 ${confdir}/e2fsck.conf $sysconfdir"