diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-06-19 23:48:27 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-06-20 22:38:35 +0200 |
| commit | 792ddde39da3b200bc34ff0204db74bb3fe2bd57 (patch) | |
| tree | 4cf3ec0677e5f4393a299b62fe5f76a8f0a9566f /package/libnspr/libnspr-fix-flags.patch | |
| parent | 15be013f186b7133c1b6a0a4a8dcf976922f4864 (diff) | |
libnspr: fix build issue on ARM with certain toolchains
Fixes issues like
http://autobuild.buildroot.org/results/aed444bf37b9e289866a9b6c754ed74a3cc0f3b2/build-end.log.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/libnspr/libnspr-fix-flags.patch')
| -rw-r--r-- | package/libnspr/libnspr-fix-flags.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/package/libnspr/libnspr-fix-flags.patch b/package/libnspr/libnspr-fix-flags.patch new file mode 100644 index 000000000..d5ad4fa01 --- /dev/null +++ b/package/libnspr/libnspr-fix-flags.patch @@ -0,0 +1,65 @@ +Fix build issues on ARM with certain toolchains + +Some gcc/binutils combinations do not like having a space between +"-Wa," and the following assembler option, so we simply remove those +spaces. + +However, fixing the configure.in is not sufficient, because libnspr +absolutely requires the prehistoric autoconf 2.13 to re-generate the +configure script. So, since the patch to the configure script is not +horrible, we also patch this script directly. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/mozilla/nsprpub/configure.in +=================================================================== +--- a/mozilla/nsprpub/configure.in ++++ b/mozilla/nsprpub/configure.in +@@ -925,8 +925,8 @@ + case "$target_cpu" in + arm*) + if test "$GNU_CC"; then +- CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb" +- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb" ++ CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb" ++ CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb" + ASFLAGS="$ASFLAGS -march=armv7-a -mthumb" + else + AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains]) +@@ -940,8 +940,8 @@ + case "$target_cpu" in + arm*) + if test "$GNU_CC"; then +- CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork" +- CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork" ++ CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork" ++ CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork" + ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork" + fi + ;; +Index: b/mozilla/nsprpub/configure +=================================================================== +--- a/mozilla/nsprpub/configure ++++ b/mozilla/nsprpub/configure +@@ -3101,8 +3101,8 @@ + case "$target_cpu" in + arm*) + if test "$GNU_CC"; then +- CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb" +- CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa, -march=armv7-a -Wa, -mthumb" ++ CFLAGS="$CFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb" ++ CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -Wa,-march=armv7-a -Wa,-mthumb" + ASFLAGS="$ASFLAGS -march=armv7-a -mthumb" + else + { echo "configure: error: --enable-thumb2 is not supported for non-GNU toolchains" 1>&2; exit 1; } +@@ -3116,8 +3116,8 @@ + case "$target_cpu" in + arm*) + if test "$GNU_CC"; then +- CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork" +- CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa, -march=armv5te -Wa, -mthumb-interwork" ++ CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork" ++ CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -Wa,-march=armv5te -Wa,-mthumb-interwork" + ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork" + fi + ;; |