tag 323512 patch thanks On Tue, Oct 11, 2005 at 08:48:10PM +0200, Lennert Buytenhek wrote: [that this bug is caused by the new dpkg-dev]
Thanks for investigating this. In that case, the following, untested patch should fix this problem. -- Matt
diff -ru gcc-2.95-2.95.4.ds15.orig/debian/rules2
gcc-2.95-2.95.4.ds15/debian/rules2
--- gcc-2.95-2.95.4.ds15.orig/debian/rules2 2005-10-11 16:28:58.588619400
-0700
+++ gcc-2.95-2.95.4.ds15/debian/rules2 2005-10-11 16:37:17.779730816 -0700
@@ -33,7 +33,7 @@
#docdir = usr/doc
cxx_inc_dir = g++-$(LIBSTDCXX_IF)
-ifeq ($(DEB_HOST_GNU_SYSTEM), linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
lib_arlib = libstdc++-$(LIBSTDCXX_IF)$(LIBC_IF)$(CXX_IF)-$(lib_version).a
lib_marlink = libstdc++$(LIBC_IF)$(CXX_IF).a.$(LIBSTDCXX_IF)
lib_shlib = libstdc++-$(LIBSTDCXX_IF)$(LIBC_IF)$(CXX_IF)-$(lib_version).so
@@ -349,7 +349,7 @@
ifeq ($(with_check),yes)
rm -f test-protocol
- ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
-echo "Running testsuite ..."; \
if [ -e /proc/meminfo ]; then \
m=`awk '/^((Mem|Swap)Free|Cached)/{m+=$$2}END{print int(m*.9)}' \
@@ -392,7 +392,7 @@
check:
rm -f test-protocol
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
-echo "Running testsuite ..."; \
if [ -e /proc/meminfo ]; then \
m=`awk '/^((Mem|Swap)Free|Cached)/{m+=$$2}END{print int(m*.9)}' \
diff -ru gcc-2.95-2.95.4.ds15.orig/debian/rules.conf
gcc-2.95-2.95.4.ds15/debian/rules.conf
--- gcc-2.95-2.95.4.ds15.orig/debian/rules.conf 2005-10-11 16:28:58.505632016
-0700
+++ gcc-2.95-2.95.4.ds15/debian/rules.conf 2005-10-11 16:30:13.696201312
-0700
@@ -66,7 +66,7 @@
if_config := $(shell cd $(srcdir); \
topsrcdir=$(srcdir); \
- target_os=$(DEB_HOST_GNU_SYSTEM)-gnu; \
+ target_os=$(DEB_HOST_GNU_SYSTEM); \
target=$(DEB_HOST_GNU_TYPE); \
enable_libstdcxx_v3=$(with_libstdcxx_v3); \
. config.if >/dev/null 2>&1; \
@@ -164,7 +164,7 @@
LGP_PKG_SONAME = $(LGPSONAME)
endif
else
- ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
PKG_SONAME = $(SONAME)-glibc$(GLIBC_VER)
LGP_PKG_SONAME = $(LGPSONAME)-glibc$(GLIBC_VER)
else
diff -ru gcc-2.95-2.95.4.ds15.orig/debian/rules.defs
gcc-2.95-2.95.4.ds15/debian/rules.defs
--- gcc-2.95-2.95.4.ds15.orig/debian/rules.defs 2005-10-11 16:28:58.506631864
-0700
+++ gcc-2.95-2.95.4.ds15/debian/rules.defs 2005-10-11 16:37:22.778970816
-0700
@@ -73,7 +73,7 @@
# build the libg++ library (deprecated)
with_libgpp := no
ifeq ($(with_gplusplus),yes)
- ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
with_libgpp := yes
endif
endif
signature.asc
Description: Digital signature
