Jonathan Nieder wrote:
> How about this patch
> (untested)?
[...]
> +++ b/debian/rules.conf
[...]
> @@ -784,6 +781,7 @@ substvars-file:
> echo 'binutils:Version=$(BINUTILSV)'; \
> echo 'dep:libgcc=$(LIBGCC_DEP)'; \
> echo 'dep:libgccbiarch=$(LIBGCC_BIARCH_DEP)'; \
> + echo 'dep:libc=$(LIBC_DEP) (>= $(libc_ver)'; \
Ok, the build finally finished. Missing closing paren. Everything
else seems to have gone fine. Revised patch attached.
debian/changelog | 7 +++++++
debian/control.m4 | 2 +-
debian/rules.conf | 6 ++----
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9668cc2b..ed44ff09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gcc-4.6 (4.6.2-15.1) local; urgency=low
+
+ * libstdc++ depends on libc (>= 2.11) for STB_GNU_UNIQUE support
+ (Eugene V. Lyubimkin). Closes: #584572.
+
+ -- Jonathan Nieder <jrnie...@gmail.com> Fri, 24 Feb 2012 02:38:01 -0600
+
gcc-4.6 (4.6.2-15) unstable; urgency=low
* Update to SVN 20120219 (r184373) from the gcc-4_6-branch.
diff --git a/debian/control.m4 b/debian/control.m4
index 9d793b44..cbae8a86 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -1827,7 +1827,7 @@ Package: libstdc++CXX_SO`'LS
Architecture: ifdef(`TARGET',`all',`any')
Section: ifdef(`TARGET',`devel',`libs')
Priority: ifdef(`TARGET',`extra',PRI(required))
-Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
+Depends: BASEDEP, ${dep:libc}, ${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: libstdc++CXX_SO-TARGET-dcv1',
ifdef(`MULTIARCH', `Multi-Arch: same
Pre-Depends: multiarch-support
diff --git a/debian/rules.conf b/debian/rules.conf
index 719c34d8..23bfa1b9 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -145,11 +145,8 @@ endif
#BINUTILS_BUILD_DEP += , binutils-gold (>= $(BINUTILSV)) [$(gold_archs)]
# libc-dev dependencies
-libc_ver := 2.5
+libc_ver := 2.11
libc_dev_ver := $(libc_ver)
-ifneq (,$(findstring gnat,$(PKGSOURCE)))
- libc_ver := 2.9-21
-endif
ifeq ($(with_multiarch_lib),yes)
ifeq ($(distribution),Debian)
libc_dev_ver := 2.13-5
@@ -784,6 +781,7 @@ substvars-file:
echo 'binutils:Version=$(BINUTILSV)'; \
echo 'dep:libgcc=$(LIBGCC_DEP)'; \
echo 'dep:libgccbiarch=$(LIBGCC_BIARCH_DEP)'; \
+ echo 'dep:libc=$(LIBC_DEP) (>= $(libc_ver))'; \
echo 'dep:libcdev=$(LIBC_DEV_DEP)'; \
echo 'dep:libcbiarch=$(LIBC_BIARCH_DEP)'; \
echo 'dep:libcbiarchdev=$(LIBC_BIARCH_DEV_DEP)'; \
--
1.7.9.2
