Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

diff --git a/binutils/binutils.nm b/binutils/binutils.nm
index 2ed2fd1514a3b6ec71bfcdcb1fde8674387b3f04..290baf0efd326735f02787d84fb987456225557f 100644 (file)
--- a/binutils/binutils.nm
+++ b/binutils/binutils.nm
@@ -5,7 +5,7 @@
 
 name       = binutils
 version    = 2.22
-release    = 2
+release    = 3
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Tools
@@ -42,9 +42,14 @@ build
        end
 
        configure_options += \
+               --build=%{DISTRO_BUILDTARGET} \
+               --host=%{DISTRO_BUILDTARGET} \
                --target=%{DISTRO_BUILDTARGET} \
                --disable-werror \
-               --disable-static
+               --disable-static \
+               --enable-64-bit-bfd \
+               --enable-plugins \
+               --with-bugurl="http://bugzilla.ipfire.org/"
 
        build
                cd %{DIR_SRC}/binutils-build

diff --git a/pth/pth.nm b/pth/pth.nm
index 67c568708a33d896584cbfbe577aa65642eb2626..6a7c0d61099f57d802db0db9452f8ab0134a5efd 100644 (file)
--- a/pth/pth.nm
+++ b/pth/pth.nm
@@ -5,7 +5,7 @@
 
 name       = pth
 version    = 2.0.7
-release    = 2
+release    = 3
 
 groups     = System/Libraries
 url        = http://www.gnu.org/software/pth
@@ -37,6 +37,13 @@ build
                        --with-mctx-stk=sas
        end
 
+       if "%{DISTRO_ARCH}" == "armv7hl"
+               configure_options += \
+                       --with-mctx-mth=sjlj \
+                       --with-mctx-dsp=ssjlj \
+                       --with-mctx-stk=sas
+       end
+
        test
                make check
        end