Changed dietlibc to apply debian patchset before our patches

base/dietlibc/dietlibc.conf

@@ -14,14 +14,17 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-# apply patched from .desc
-for x in $( match_source_file -p diff ); do
-	var_append patchfiles ' ' $x
-done
-
 # Apply debian patches (debian/diff/*.diff)
-hook_add postpatch 3 'dietlibc_debian_patches'
+hook_add prepatch 3 'dietlibc_debian_patches'
 dietlibc_debian_patches() {
+	local x=
+	for x in $( match_source_file -p diff ); do
+		case "$x" in
+			*.bz2)	bzcat "$x" | patch ${patchopt} ;;
+			*) patch ${patchopt} < "$x" ;;
+		esac
+
+	done
 	for x in debian/diff/*.diff; do
 		patch ${patchopt} < $x
 	done
@@ -44,6 +47,13 @@ dietlibc_initial_fixup() {
 	fi
 }
 
+dietlibc_install_headers() {
+	find include/* -name '*.orig' -exec rm -v '{}' \;
+
+	mkdir -p $base/build/${SDECFG_ID}${includedir}/
+	cp -rv include/* $base/build/${SDECFG_ID}${includedir}/
+}
+
 dietlibc_make_wrappers() {
 	rm -rf $toolsbin; mkdir -p $toolsbin
 	for x in gcc as ld ar ranlib nm ; do # wrapper
@@ -126,8 +136,7 @@ var_append GCC_WRAPPER_APPEND ' ' "$dietfeatures"
 if atstage toolchain; then
 	makeopt=
 	makeinstopt=
-	hook_add postmake 4 'mkdir -p $base/build/${SDECFG_ID}${includedir}/'
-	hook_add postmake 5 'cp -rv include/* $base/build/${SDECFG_ID}${includedir}/'
+	hook_add postmake 5 'dietlibc_install_headers'
 else
 	hook_add postpatch 5 'dietlibc_initial_fixup'