Piotr Esden-Tempski <pe1724@bingo-ev.de>:

patch that is fixing what I messed up in zlib and e2fsprogs.


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1378 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

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

package/base/dietlibc/pkg_e2fsprogs_post.conf

@@ -0,0 +1 @@
+[ "$pkg_dietlibc_useit" = 1 ] && [ "$diet_dynamic_static" == "static" ] && var_remove confopt " " "--enable-elf-shlibs"

package/base/dietlibc/pkg_zlib_post.conf

@@ -0,0 +1 @@
+[ "$pkg_dietlibc_useit" = 1 ] && [ "$diet_dynamic_static" == "static" ] && var_remove confopt " " "--shared"

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
 

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
 

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"