rpm/binutils
SHA256
1
0
Fork 0
forked from pool/binutils
Code Pull Requests Activity

Accepting request 315475 from home:a_faerber:branches:devel:gcc

Browse Source 
Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.

OBS-URL: https://build.opensuse.org/request/show/315475
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/binutils?expand=0&rev=187
This commit is contained in:
Michael Matz 2015-07-07 13:41:24 +00:00 committed by Git OBS Bridge
parent 55381be6ac
commit 3731e51f95
40 changed files with 340 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
binutils.spec
View File

@ -276,15 +276,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -293,11 +293,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -380,13 +380,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -444,7 +444,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-aarch64-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-aarch64-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-arm-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-arm-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-avr-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-avr-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-epiphany-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-epiphany-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-hppa-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-hppa-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-hppa64-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-hppa64-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-i386-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-i386-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-ia64-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-ia64-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-m68k-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-m68k-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-mips-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-mips-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-ppc-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-ppc-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-ppc64-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-ppc64-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-ppc64le-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-ppc64le-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-s390-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-s390-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-s390x-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-s390x-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-sparc-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-sparc-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-sparc64-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-sparc64-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-spu-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-spu-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif

7
cross-x86_64-binutils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 7 11:00:42 UTC 2015 - afaerber@suse.de
- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
into %TARGET_OS for reuse in install and file sections.
This fixes the assumption that $TARGET_OS will match %{TARGET}*.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com

20
cross-x86_64-binutils.spec
View File

@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux" EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
%endif %endif
%if "%{TARGET}" == "avr" || "%{TARGET}" == "spu" %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
TARGET_OS=%{TARGET} %define TARGET_OS %{TARGET}
%else %else
%if "%{TARGET}" == "epiphany" %if "%{TARGET}" == "epiphany"
TARGET_OS=epiphany-elf %define TARGET_OS epiphany-elf
%else %else
%if "%{TARGET}" == "arm" %if "%{TARGET}" == "arm"
TARGET_OS=%{TARGET}-suse-linux-gnueabi %define TARGET_OS %{TARGET}-suse-linux-gnueabi
%else %else
TARGET_OS=%{TARGET}-suse-linux %define TARGET_OS %{TARGET}-suse-linux
%endif %endif
%endif %endif
%endif %endif
@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
--with-bugurl=http://bugs.opensuse.org/ \ --with-bugurl=http://bugs.opensuse.org/ \
--with-pkgversion="GNU Binutils; %{DIST}" \ --with-pkgversion="GNU Binutils; %{DIST}" \
--disable-nls \ --disable-nls \
--build=%{HOST} --target=$TARGET_OS \ --build=%{HOST} --target=%{TARGET_OS} \
%if "%{TARGET}" == "spu" %if "%{TARGET}" == "spu"
--with-sysroot=/usr/spu \ --with-sysroot=/usr/spu \
%else %else
--with-sysroot=%{_prefix}/$TARGET_OS/sys-root \ --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
%endif %endif
${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
make %{?_smp_mflags} all-bfd TARGET-bfd=headers make %{?_smp_mflags} all-bfd TARGET-bfd=headers
@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
# installing cross-TARGET-binutils and TARGET-binutils # installing cross-TARGET-binutils and TARGET-binutils
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Replace hard links by symlinks, so that rpmlint doesn't complain # Replace hard links by symlinks, so that rpmlint doesn't complain
T=$(basename %buildroot/usr/%{TARGET}*) T=$(basename %buildroot/usr/%{TARGET_OS})
for f in %buildroot/usr/$T/bin/* ; do for f in %buildroot/usr/$T/bin/* ; do
ln -sf /usr/bin/$T-$(basename $f) $f ln -sf /usr/bin/$T-$(basename $f) $f
done done
%if "%{TARGET}" == "avr" %if "%{TARGET}" == "avr"
install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
%endif %endif
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
rm -rf $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_infodir}
@ -447,7 +447,7 @@ fi;
%{_libdir}/lib*-%{version}*.so %{_libdir}/lib*-%{version}*.so
%doc %{_mandir}/man1/*.1.gz %doc %{_mandir}/man1/*.1.gz
%else %else
%{_prefix}/%{TARGET}* %{_prefix}/%{TARGET_OS}
%{_prefix}/bin/* %{_prefix}/bin/*
%endif %endif