The gcc-304-index_macro.patch and gcc-300-libstdc++-pic.patch patches fail to apply cleanly to GCC 4.6.2 sources.
The attached patch fixes the issue.
Index: package/base/uclibc/patches/gcc-304-index_macro.patch
===================================================================
--- package/base/uclibc/patches/gcc-304-index_macro.patch (revision 39958)
+++ package/base/uclibc/patches/gcc-304-index_macro.patch (working copy)
@@ -12,13 +12,13 @@
# else
--- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps 2006-03-24 01:50:04 +0100
+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h 2006-03-24 01:50:28 +0100
-@@ -53,6 +53,9 @@
+@@ -49,6 +49,9 @@
#include <ext/memory> // For uninitialized_copy_n
#include <ext/numeric> // For power
+/* cope w/ index defined as macro, SuSv3 proposal */
+#undef index
+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-
- using std::size_t;
+ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
+ {
+ _GLIBCXX_BEGIN_NAMESPACE_VERSION
Index: package/base/uclibc/patches/gcc-300-libstdc++-pic.patch
===================================================================
--- package/base/uclibc/patches/gcc-300-libstdc++-pic.patch (revision 39958)
+++ package/base/uclibc/patches/gcc-300-libstdc++-pic.patch (working copy)
@@ -42,18 +42,11 @@
install-info: install-info-am
-@@ -660,6 +660,7 @@
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-dvi install-dvi-am \
-+ install-exec-local \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
-@@ -993,6 +994,12 @@ install_debug:
+@@ -993,6 +994,13 @@ install_debug:
(cd ${debugdir} && $(MAKE) \
toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
++.PHONY: install-exec-local
+install-exec-local:
+ifeq ($(enable_shared),yes)
+ $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
signature.asc
Description: PGP signature
----------------------------------------------------------- If you wish to unsubscribe from this mailing, send mail to [email protected] with a subject of: unsubscribe t2
