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 bb6919a62afb33d4326544e47d05dd7059caa2e3..e283cc83b152829f6d617bd28283ecac08c78a03 100644 (file)
--- a/binutils/binutils.nm
+++ b/binutils/binutils.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = binutils
-version    = 2.21.51.0.8
-release    = 2
+version    = 2.22
+release    = 3
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Tools
@@ -41,23 +41,22 @@ 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
-
-               cd %{DIR_SRC}/binutils-build && make tooldir=/usr %{PARALLELISMFLAGS}
+               cd %{DIR_SRC}/binutils-build
+               ../%{thisapp}/configure \
+                       %{configure_options}
+
+               make tooldir=/usr %{PARALLELISMFLAGS}
        end
 
        #def test
@@ -70,6 +69,15 @@ build
                cd %{DIR_SRC}/binutils-build && make tooldir=/usr install DESTDIR=%{BUILDROOT}
 
                cp -fv %{DIR_APP}/include/libiberty.h %{BUILDROOT}/usr/include
+
+               # Prevent packages from linking against libbfd and libopcodes,
+               # because they change too often.
+               rm -rfv %{BUILDROOT}%{libdir}/lib{bfd,opcodes}.so
+       end
+
+       # Keep static version of libiberty.
+       keep_libraries
+               %{libdir}/libiberty.a
        end
 end
 
@@ -78,5 +86,15 @@ packages
 
        package %{name}-devel
                template DEVEL
+
+               # Don't package libbfd and libopcodes in the -devel package.
+               files
+                       /usr/include
+                       %{libdir}/*.a
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
        end
 end