Merge remote-tracking branch 'arne_f/automake'

[people/amarx/ipfire-3.x.git] / binutils / binutils.nm

diff --git a/binutils/binutils.nm b/binutils/binutils.nm
index 8879700fe16463b27bbb01bf178facccf2b813db..e283cc83b152829f6d617bd28283ecac08c78a03 100644 (file)
--- a/binutils/binutils.nm
+++ b/binutils/binutils.nm
@@ -5,7 +5,7 @@
 
 name       = binutils
 version    = 2.22
-release    = 1
+release    = 3
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Tools
@@ -41,21 +41,20 @@ build
                sed -i -e 's/%''{release}/%{release}/g' bfd/Makefile{.am,.in}
        end
 
+       configure_options += \
+               --build=%{DISTRO_BUILDTARGET} \
+               --host=%{DISTRO_BUILDTARGET} \
+               --target=%{DISTRO_BUILDTARGET} \
+               --disable-werror \
+               --disable-static \
+               --enable-64-bit-bfd \
+               --enable-plugins \
+               --with-bugurl="http://bugzilla.ipfire.org/"
 
        build
-               BINUTILS_TARGET_PLATFORM=$(echo "%{DISTRO_MACHINE}" | sed -e "s/-gnu//")
-
                cd %{DIR_SRC}/binutils-build
                ../%{thisapp}/configure \
-                       --host=${BINUTILS_TARGET_PLATFORM} \
-                       --build=${BINUTILS_TARGET_PLATFORM} \
-                       --target=${BINUTILS_TARGET_PLATFORM} \
-                       --prefix=/usr \
-                       --mandir=/usr/share/man \
-                       --enable-shared \
-                       --disable-nls \
-                       --disable-werror \
-                       --disable-static
+                       %{configure_options}
 
                make tooldir=/usr %{PARALLELISMFLAGS}
        end
@@ -73,12 +72,12 @@ build
 
                # Prevent packages from linking against libbfd and libopcodes,
                # because they change too often.
-               rm -rfv %{BUILDROOT}/usr/lib/lib{bfd,opcodes}.so
+               rm -rfv %{BUILDROOT}%{libdir}/lib{bfd,opcodes}.so
        end
 
        # Keep static version of libiberty.
        keep_libraries
-               /usr/lib/libiberty.a
+               %{libdir}/libiberty.a
        end
 end
 
@@ -91,7 +90,7 @@ packages
                # Don't package libbfd and libopcodes in the -devel package.
                files
                        /usr/include
-                       /usr/lib/*.a
+                       %{libdir}/*.a
                end
        end