nspr version update 4.9.2 old patch removed
PATCH 1/1 nspr version update 4.9.2 old patch removed
Signed-off-by Alexander Khryukin <[email protected]>
--- package/libnspr/libnspr-fix-flags.patch | 65 --------------------------------- package/libnspr/libnspr.mk | 2 +- 2 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 package/libnspr/libnspr-fix-flags.patch
package/libnspr/libnspr-fix-flags.patch deleted +0 -65
@@ -1,65 +0,0 @@ -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 <[email protected]> - -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 - ;;
package/libnspr/libnspr.mk +1 -1
@@ -3,7 +3,7 @@ # libnspr # ############################################################# -LIBNSPR_VERSION = 4.8.7 +LIBNSPR_VERSION = 4.9.2 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src/ LIBNSPR_SUBDIR = mozilla/nsprpub
Signature · 1 line
1.7.11.3
PATCH 1/1 nspr version update 4.9.2 old patch removed
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexander" == Alexander Khryukin <[email protected]> writes:
Alexander> Signed-off-by: Alexander Khryukin <[email protected]>
Committed, thanks.
I also removed our nspr.pc, as upstream now provides one.
Signature · 1 line
Bye, Peter Korsgaard