[OpenWrt-Devel] [PATCH] [tools] gcc: don't clobber stamp-bits with a symlink to itself

[John Szakmeister]

Several versions of gcc have an issue in libstdc++v3 where the build may
clobber stamp-bits with a link to itself.  This doesn't manifest itself
on all systems.  On several Ubuntu systems, this doesn't appear to be a
problem, but it is an issue on Fedora 16 systems.

To fix the issue, we'll simply filter out stamp-bits from the symlinks
to be generated.

Signed-off-by: John Szakmeister <john at szakmeister.net>
---
 .../gcc/patches/4.6-linaro/930-no-clobber-stamp-bits.patch    | 11 +++++++++++
 .../gcc/patches/4.8-linaro/930-no-clobber-stamp-bits.patch    | 11 +++++++++++
 toolchain/gcc/patches/4.8.0/930-no-clobber-stamp-bits.patch   | 11 +++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 toolchain/gcc/patches/4.6-linaro/930-no-clobber-stamp-bits.patch
 create mode 100644 toolchain/gcc/patches/4.8-linaro/930-no-clobber-stamp-bits.patch
 create mode 100644 toolchain/gcc/patches/4.8.0/930-no-clobber-stamp-bits.patch

diff --git a/toolchain/gcc/patches/4.6-linaro/930-no-clobber-stamp-bits.patch b/toolchain/gcc/patches/4.6-linaro/930-no-clobber-stamp-bits.patch
new file mode 100644
index 0000000..9106a4a
--- /dev/null
+++ b/toolchain/gcc/patches/4.6-linaro/930-no-clobber-stamp-bits.patch
@@ -0,0 +1,11 @@
+--- a/libstdc++-v3/include/Makefile.in
++++ b/libstdc++-v3/include/Makefile.in
+@@ -1326,7 +1326,7 @@
+ 	@$(STAMP) stamp-bits
+ 
+ stamp-bits-sup: stamp-bits ${bits_sup_headers}
+-	@-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null
++	@-cd ${bits_builddir} && $(LN_S) $(filter-out stamp-bits,$?) . 2>/dev/null
+ 	@$(STAMP) stamp-bits-sup
+ 
+ stamp-c_base: ${c_base_headers}
diff --git a/toolchain/gcc/patches/4.8-linaro/930-no-clobber-stamp-bits.patch b/toolchain/gcc/patches/4.8-linaro/930-no-clobber-stamp-bits.patch
new file mode 100644
index 0000000..dbecef2
--- /dev/null
+++ b/toolchain/gcc/patches/4.8-linaro/930-no-clobber-stamp-bits.patch
@@ -0,0 +1,11 @@
+--- a/libstdc++-v3/include/Makefile.in
++++ b/libstdc++-v3/include/Makefile.in
+@@ -1342,7 +1342,7 @@
+ 	@$(STAMP) stamp-bits
+ 
+ stamp-bits-sup: stamp-bits ${bits_sup_headers}
+-	@-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null
++	@-cd ${bits_builddir} && $(LN_S) $(filter-out stamp-bits,$?) . 2>/dev/null
+ 	@$(STAMP) stamp-bits-sup
+ 
+ stamp-c_base: ${c_base_headers}
diff --git a/toolchain/gcc/patches/4.8.0/930-no-clobber-stamp-bits.patch b/toolchain/gcc/patches/4.8.0/930-no-clobber-stamp-bits.patch
new file mode 100644
index 0000000..01a1000
--- /dev/null
+++ b/toolchain/gcc/patches/4.8.0/930-no-clobber-stamp-bits.patch
@@ -0,0 +1,11 @@
+--- a/libstdc++-v3/include/Makefile.in
++++ b/libstdc++-v3/include/Makefile.in
+@@ -1343,7 +1343,7 @@ stamp-bits: ${bits_headers}
+ 	@$(STAMP) stamp-bits
+ 
+ stamp-bits-sup: stamp-bits ${bits_sup_headers}
+-	@-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null
++	@-cd ${bits_builddir} && $(LN_S) $(filter-out stamp-bits,$?) . 2>/dev/null
+ 	@$(STAMP) stamp-bits-sup
+ 
+ stamp-c_base: ${c_base_headers}
-- 
2.1.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel