[PATCH v2] Enable deterministic archives
Sebastian Huber
sebastian.huber at embedded-brains.de
Wed Feb 6 10:01:06 UTC 2013
The GNU AR program as a 'D' option
(http://sourceware.org/binutils/docs/binutils/ar-cmdline.html#ar-cmdline):
[...]
`D'
Operate in deterministic mode. When adding files and the archive
index use zero for UIDs, GIDs, timestamps, and use consistent file modes
for all files. When this option is used, if ar is used with identical
options and identical input files, multiple runs will create identical
output files regardless of the input files' owners, groups, file modes,
or modification times.
If binutils was configured with --enable-deterministic-archives,
then this mode is on by default. It can be disabled with the `U'
modifier, below.
[...]
This helps to avoid artificial differences in archives and thus makes it
easier to use version control for archives (e.g. static libraries).
---
binutils/build.add | 5 +++++
rtems4.11/arm/Makefile.in | 8 +++++---
.../arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec | 6 ++++++
rtems4.11/avr/Makefile.in | 8 +++++---
.../avr/rtems-4.11-avr-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/bfin/Makefile.in | 8 +++++---
.../bfin/rtems-4.11-bfin-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/binutils-rtems.add | 1 +
rtems4.11/binutils.am | 2 ++
rtems4.11/h8300/Makefile.in | 8 +++++---
.../h8300/rtems-4.11-h8300-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/i386/Makefile.in | 8 +++++---
.../i386/rtems-4.11-i386-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/lm32/Makefile.in | 8 +++++---
.../lm32/rtems-4.11-lm32-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/m32c/Makefile.in | 8 +++++---
.../m32c/rtems-4.11-m32c-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/m32r/Makefile.in | 8 +++++---
.../m32r/rtems-4.11-m32r-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/m68k/Makefile.in | 8 +++++---
.../m68k/rtems-4.11-m68k-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/microblaze/Makefile.in | 8 +++++---
.../rtems-4.11-microblaze-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/mips/Makefile.in | 8 +++++---
.../mips/rtems-4.11-mips-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/powerpc/Makefile.in | 8 +++++---
.../rtems-4.11-powerpc-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/sh/Makefile.in | 8 +++++---
rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/sparc/Makefile.in | 8 +++++---
.../sparc/rtems-4.11-sparc-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/sparc64/Makefile.in | 8 +++++---
.../rtems-4.11-sparc64-rtems4.11-binutils.spec | 6 ++++++
rtems4.11/v850/Makefile.in | 8 +++++---
.../v850/rtems-4.11-v850-rtems4.11-binutils.spec | 6 ++++++
35 files changed, 184 insertions(+), 48 deletions(-)
create mode 100644 rtems4.11/binutils-rtems.add
diff --git a/binutils/build.add b/binutils/build.add
index 16cb5bb..8b5430a 100644
--- a/binutils/build.add
+++ b/binutils/build.add
@@ -15,6 +15,11 @@
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--with-sysroot=%{_prefix}/@tool_target@/sys-root \
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
diff --git a/rtems4.11/arm/Makefile.in b/rtems4.11/arm/Makefile.in
index 1830e0a..9b71844 100644
--- a/rtems4.11/arm/Makefile.in
+++ b/rtems4.11/arm/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec b/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec
index cfbc6ba..5aa1861 100644
--- a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec
+++ b/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/avr/Makefile.in b/rtems4.11/avr/Makefile.in
index 8f26a1e..20e0bce 100644
--- a/rtems4.11/avr/Makefile.in
+++ b/rtems4.11/avr/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec b/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec
index 51ee5ee..f0af1ef 100644
--- a/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec
+++ b/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/bfin/Makefile.in b/rtems4.11/bfin/Makefile.in
index cc12297..0717987 100644
--- a/rtems4.11/bfin/Makefile.in
+++ b/rtems4.11/bfin/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec b/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec
index 171d2d3..3aeb28b 100644
--- a/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec
+++ b/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/binutils-rtems.add b/rtems4.11/binutils-rtems.add
new file mode 100644
index 0000000..ddd7966
--- /dev/null
+++ b/rtems4.11/binutils-rtems.add
@@ -0,0 +1 @@
+%define binutils_deterministic_archives 1
diff --git a/rtems4.11/binutils.am b/rtems4.11/binutils.am
index db14d81..4561d83 100644
--- a/rtems4.11/binutils.am
+++ b/rtems4.11/binutils.am
@@ -1,8 +1,10 @@
+EXTRA_DIST += $(srcdir)/../binutils-rtems.add
EXTRA_DIST += binutils-sources.add
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add
+BINUTILS_SUBPACKAGES += $(srcdir)/../binutils-rtems.add
BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add
BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add
BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add
diff --git a/rtems4.11/h8300/Makefile.in b/rtems4.11/h8300/Makefile.in
index c46cb8e..c03c0de 100644
--- a/rtems4.11/h8300/Makefile.in
+++ b/rtems4.11/h8300/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec b/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec
index 494f18e..1f4cc78 100644
--- a/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec
+++ b/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/i386/Makefile.in b/rtems4.11/i386/Makefile.in
index 2f5215b..02822ce 100644
--- a/rtems4.11/i386/Makefile.in
+++ b/rtems4.11/i386/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec b/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec
index c6c3b24..8782880 100644
--- a/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec
+++ b/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/lm32/Makefile.in b/rtems4.11/lm32/Makefile.in
index f41df35..a364112 100644
--- a/rtems4.11/lm32/Makefile.in
+++ b/rtems4.11/lm32/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec b/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec
index 5295447..375cc55 100644
--- a/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec
+++ b/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/m32c/Makefile.in b/rtems4.11/m32c/Makefile.in
index 2e9a406..ad15d22 100644
--- a/rtems4.11/m32c/Makefile.in
+++ b/rtems4.11/m32c/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec b/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec
index 8847618..573e855 100644
--- a/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec
+++ b/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/m32r/Makefile.in b/rtems4.11/m32r/Makefile.in
index 479437a..f901cf1 100644
--- a/rtems4.11/m32r/Makefile.in
+++ b/rtems4.11/m32r/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec b/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec
index 4262f70..d7a85f8 100644
--- a/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec
+++ b/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/m68k/Makefile.in b/rtems4.11/m68k/Makefile.in
index d475dd4..f0bfd44 100644
--- a/rtems4.11/m68k/Makefile.in
+++ b/rtems4.11/m68k/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec
index 68098a8..b963391 100644
--- a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec
+++ b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/microblaze/Makefile.in b/rtems4.11/microblaze/Makefile.in
index 493177a..98ca7c0 100644
--- a/rtems4.11/microblaze/Makefile.in
+++ b/rtems4.11/microblaze/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-binutils.spec b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-binutils.spec
index 28e4897..aef3160 100644
--- a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-binutils.spec
+++ b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/mips/Makefile.in b/rtems4.11/mips/Makefile.in
index dab91cb..f0266b6 100644
--- a/rtems4.11/mips/Makefile.in
+++ b/rtems4.11/mips/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec b/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec
index d9725ee..69659c7 100644
--- a/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec
+++ b/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/powerpc/Makefile.in b/rtems4.11/powerpc/Makefile.in
index 3ce1728..f364970 100644
--- a/rtems4.11/powerpc/Makefile.in
+++ b/rtems4.11/powerpc/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec
index 9c1dba7..023351d 100644
--- a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec
+++ b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/sh/Makefile.in b/rtems4.11/sh/Makefile.in
index 88548df..713f6e2 100644
--- a/rtems4.11/sh/Makefile.in
+++ b/rtems4.11/sh/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec b/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec
index f53e873..aa65ed7 100644
--- a/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec
+++ b/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/sparc/Makefile.in b/rtems4.11/sparc/Makefile.in
index 4424d0b..b8a1f93 100644
--- a/rtems4.11/sparc/Makefile.in
+++ b/rtems4.11/sparc/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec b/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec
index 07911b4..eb3fea8 100644
--- a/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec
+++ b/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/sparc64/Makefile.in b/rtems4.11/sparc64/Makefile.in
index 2a78fd5..d04aa1f 100644
--- a/rtems4.11/sparc64/Makefile.in
+++ b/rtems4.11/sparc64/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec b/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
index 58534cd..7fc3039 100644
--- a/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
+++ b/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
diff --git a/rtems4.11/v850/Makefile.in b/rtems4.11/v850/Makefile.in
index 9576635..e446a44 100644
--- a/rtems4.11/v850/Makefile.in
+++ b/rtems4.11/v850/Makefile.in
@@ -165,9 +165,10 @@ noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
$(TARGET)-gcc.spec.in $(am__append_2) $(TARGET)-gdb.spec.in \
$(am__append_3)
-EXTRA_DIST = binutils-sources.add $(BINUTILS_SUBPACKAGES) \
- $(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
- $(GCC_SUBPACKAGES) gdb-sources.add $(GDB_SUBPACKAGES)
+EXTRA_DIST = $(srcdir)/../binutils-rtems.add binutils-sources.add \
+ $(BINUTILS_SUBPACKAGES) $(srcdir)/../gcc-prep.add \
+ $(srcdir)/gcc-sources.add $(GCC_SUBPACKAGES) gdb-sources.add \
+ $(GDB_SUBPACKAGES)
SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
MKSPEC = sed \
-e "s,[@]rpmprefix[@],$(rpmprefix),g" \
@@ -186,6 +187,7 @@ BINUTILS_PKGVERS = $(BINUTILS_VERS)
BINUTILS_RPMREL = 2
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+ $(srcdir)/../binutils-rtems.add \
$(top_srcdir)/binutils/binutils.add \
$(top_srcdir)/binutils/prep.add \
$(top_srcdir)/binutils/build.add \
diff --git a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-binutils.spec b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-binutils.spec
index ca2add8..6a99845 100644
--- a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-binutils.spec
+++ b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-binutils.spec
@@ -46,6 +46,7 @@
%endif
%{?!el5:%global _with_noarch_subpackages 1}
+%define binutils_deterministic_archives 1
%define binutils_pkgvers 2.23.1
%define binutils_version 2.23.1
%define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -107,6 +108,11 @@ cd ..
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
+%if 0%{?binutils_deterministic_archives:1}
+%if "%{binutils_version}" >= "2.23"
+ --enable-deterministic-archives \
+%endif
+%endif
--prefix=%{_prefix} --bindir=%{_bindir} \
--exec-prefix=%{_exec_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
--
1.7.7
More information about the devel
mailing list