This patch fixes a bug in the dbus package which prevents it from compiling on brcm-2.4 (Ticket #10274). In turn, it also prevents the avahi package from compiling on brcm-2.4. (Changeset 27521 is a workaround).
The cause of the problem was that the existing patches, which were correct, were being applied to the file "configure", which was then being overwritten from configure.ac, obliterating the effects of the patches. The fix was to apply the patches to configure.ac instead so that it generates a correctly patched "configure" file. Two patch files are deleted and two replacement patch files are added. Tested on the "backfire" branch revision 29195, building brcm-2.4 and ixp4xx. Signed-off-by: Mike Brady<mikebr...@eircom.net>
Index: patches/01-dbus-nopie-fix.patch =================================================================== --- patches/01-dbus-nopie-fix.patch (revision 29185) +++ patches/01-dbus-nopie-fix.patch (working copy) @@ -1,22 +0,0 @@ ---- a/configure -+++ b/configure -@@ -20927,19 +20927,6 @@ if test "x$GCC" = "xyes"; then - ;; - esac - -- case " $CFLAGS " in -- *[\ \ ]-fPIE[\ \ ]*) ;; -- *) if cc_supports_flag -fPIE; then -- PIE_CFLAGS="-fPIE" -- if ld_supports_flag -z,relro; then -- PIE_LDFLAGS="-pie -Wl,-z,relro" -- else -- PIE_LDFLAGS="-pie" -- fi -- fi -- ;; -- esac -- - ### Disabled warnings, and compiler flag overrides - - # Let's just ignore unused for now Index: patches/003-dbus-nopie-fix.patch =================================================================== --- patches/003-dbus-nopie-fix.patch (revision 0) +++ patches/003-dbus-nopie-fix.patch (revision 0) @@ -0,0 +1,22 @@ +--- a/configure.in ++++ b/configure.in +@@ -257,19 +257,6 @@ if test "x$GCC" = "xyes"; then + ;; + esac + +- case " $CFLAGS " in +- *[\ \ ]-fPIE[\ \ ]*) ;; +- *) if cc_supports_flag -fPIE; then +- PIE_CFLAGS="-fPIE" +- if ld_supports_flag -z,relro; then +- PIE_LDFLAGS="-pie -Wl,-z,relro" +- else +- PIE_LDFLAGS="-pie" +- fi +- fi +- ;; +- esac +- + ### Disabled warnings, and compiler flag overrides + + # Let's just ignore unused for now Index: patches/002-no_wno_pointer_sign.patch =================================================================== --- patches/002-no_wno_pointer_sign.patch (revision 29185) +++ patches/002-no_wno_pointer_sign.patch (working copy) @@ -1,12 +0,0 @@ -diff -urN dbus-1.2.4.6permissive/configure dbus-1.2.4.6permissive.new/configure ---- dbus-1.2.4.6permissive/configure 2009-05-06 19:35:38.000000000 +0200 -+++ dbus-1.2.4.6permissive.new/configure 2010-03-26 17:40:13.000000000 +0100 -@@ -20958,7 +20958,7 @@ - esac - case " $CFLAGS " in - *[\ \ ]-Wno-pointer-sign[\ \ ]*) ;; -- *) CFLAGS="$CFLAGS -Wno-pointer-sign" ;; -+ *) CFLAGS="$CFLAGS" ;; - esac - - # http://bugs.freedesktop.org/show_bug.cgi?id=19195 Index: patches/004-no_wno_pointer_sign.patch =================================================================== --- patches/004-no_wno_pointer_sign.patch (revision 0) +++ patches/004-no_wno_pointer_sign.patch (revision 0) @@ -0,0 +1,11 @@ +--- a/configure.in ++++ b/configure.in +@@ -275,7 +275,7 @@ if test "x$GCC" = "xyes"; then + esac + case " $CFLAGS " in + *[\ \ ]-Wno-pointer-sign[\ \ ]*) ;; +- *) CFLAGS="$CFLAGS -Wno-pointer-sign" ;; ++ *) CFLAGS="$CFLAGS" ;; + esac + + # http://bugs.freedesktop.org/show_bug.cgi?id=19195
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
