diff --git a/Documentation/Developers/CHANGELOG-ESDEN b/Documentation/Developers/CHANGELOG-ESDEN index 8e10b51e5..8801e287d 100644 --- a/Documentation/Developers/CHANGELOG-ESDEN +++ b/Documentation/Developers/CHANGELOG-ESDEN @@ -2,6 +2,9 @@ This is a changelog for Dietlibc-Target, Alpha Target and all changes esden does for ROCKLinux ;-) +*) 2003-09-12 (2.0.0-rc1 - 2.0.0-rc2) + - fixed zlib and e2fsprogs + *) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2) - fixed iproute2 for dietlibc - added bin86 and nasm to dietlibc target (needed for lilo) and also fixed for diff --git a/package/base/dietlibc/pkg_e2fsprogs_post.conf b/package/base/dietlibc/pkg_e2fsprogs_post.conf new file mode 100644 index 000000000..233133301 --- /dev/null +++ b/package/base/dietlibc/pkg_e2fsprogs_post.conf @@ -0,0 +1 @@ +[ "$pkg_dietlibc_useit" = 1 ] && [ "$diet_dynamic_static" == "static" ] && var_remove confopt " " "--enable-elf-shlibs" diff --git a/package/base/dietlibc/pkg_zlib_post.conf b/package/base/dietlibc/pkg_zlib_post.conf new file mode 100644 index 000000000..4912807e4 --- /dev/null +++ b/package/base/dietlibc/pkg_zlib_post.conf @@ -0,0 +1 @@ +[ "$pkg_dietlibc_useit" = 1 ] && [ "$diet_dynamic_static" == "static" ] && var_remove confopt " " "--shared" diff --git a/package/base/e2fsprogs/e2fsprogs.conf b/package/base/e2fsprogs/e2fsprogs.conf index d51071b9d..4380c0ddb 100644 --- a/package/base/e2fsprogs/e2fsprogs.conf +++ b/package/base/e2fsprogs/e2fsprogs.conf @@ -28,7 +28,7 @@ MAKE="$MAKE ELF_INSTALL_DIR=$root/lib" if [ $stagelevel -gt 1 ] then - [ "$dietlibc_dynamic_static" = "dynamic" ] && confopt="$confopt --enable-elf-shlibs" + confopt="$confopt --enable-elf-shlibs" makeinstopt="$makeinstopt install-libs" fi diff --git a/package/base/linux24/disable-broken.lst b/package/base/linux24/disable-broken.lst index e4de0542c..036627a7e 100644 --- a/package/base/linux24/disable-broken.lst +++ b/package/base/linux24/disable-broken.lst @@ -21,5 +21,4 @@ # --- ROCK-COPYRIGHT-NOTE-END --- CONFIG_EXAMPLE 2000-10-01 2.4.0 example.c -CONFIG_IPMI_HANDLER 2003-06-23 2.4.21-acpi diff --git a/package/base/zlib/zlib.conf b/package/base/zlib/zlib.conf index 584aafa1a..24c47e8b3 100644 --- a/package/base/zlib/zlib.conf +++ b/package/base/zlib/zlib.conf @@ -30,7 +30,7 @@ zlib_pm() { cp -v algorithm.txt $docdir } -[ "$diet_dynamic_static" != "static" ] && var_insert confopt " " "--shared" +var_insert confopt " " "--shared" var_insert CC_WRAPPER_INSERT " " "-fPIC" hook_add preconf 3 "unset AR" hook_add postmake 3 "zlib_pm"