On Thu, Oct 27, 2005 at 02:25:58PM +0200, Lennert Buytenhek wrote:
> > I incorporated Lennert's suggestion and created a patch that fixes the
> > problem on at least i386.
>
> It seems like you've missed two more places in debian/rules2:
>
> ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
> ifeq ($(DEB_HOST_GNU_SYSTEM), linux)
>
> This affects generation of the *.shlibs and shlibs.local files,
> not sure whether that's a problem.
During build, I get:
dpkg-shlibdeps: warning: unable to find dependency information for shared
library libstdc++-libc6.2-2 (soname 3, path
/debian/gcc295/work1/gcc-2.95-2.95.4.ds15/debian/libstdc++2.10-glibc2.2/usr/lib/libstdc++-libc6.2-2.so.3,
dependency field Depends)
This seems to be fixed by changing the two places mentioned above to
linux-gnu as well. I've attached a new version of Matt's patch with
these fixes included.
--- gcc-2.95-2.95.4.ds15/debian/rules2.orig 2005-10-28 11:41:02.000000000
+0200
+++ gcc-2.95-2.95.4.ds15/debian/rules2 2005-10-28 11:43:58.000000000 +0200
@@ -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
@@ -109,7 +109,7 @@
endif
# MULTILIBS is one or more of "gcc g++ stdc++ chill objc g77"
# MULTIDIRS is in the format "32" or "{m68000,m68020,m68040}"
-ifeq ($(DEB_HOST_GNU_TYPE),sparc64-linux)
+ifeq ($(DEB_HOST_GNU_TYPE),sparc64-linux-gnu)
CONFARGS += --with-cpu=ultrasparc
MULTIDIRS := 32
MULTILIBS := gcc
@@ -131,7 +131,7 @@
MULTIDIRS := 64
MULTILIBS := gcc
endif
-ifeq ($(DEB_HOST_GNU_TYPE),alpha-linux)
+ifeq ($(DEB_HOST_GNU_TYPE),alpha-linux-gnu)
MULTIDIRS := ieee
MULTILIBS += g77
endif
@@ -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)}' \
@@ -1397,7 +1397,7 @@
# dh_makeshlibs -a
ifneq ($(SNAPSHOT),yes)
ifeq ($(with_gplusplus),yes)
- ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
ifeq ($(DEB_HOST_ARCH),powerpc)
echo "libstdc++$(LIBC_IF)$(CXX_IF) $(LIBSTDCXX_IF)
libstdc++$(PKG_SONAME)$(libstdc_eh_ver) (>= $(lib_pkg_req_version))" \
> debian/$(p_lib).shlibs
@@ -1474,7 +1474,7 @@
ifeq ($(with_gplusplus),yes)
: # dh_shlibdeps ... I hope I got it correct now ...
: # we don't want the dep. on libstdc++, it's hardwired in control
- ifeq ($(DEB_HOST_GNU_SYSTEM), linux)
+ ifeq ($(DEB_HOST_GNU_SYSTEM), linux-gnu)
echo "libstdc++$(LIBC_IF)$(CXX_IF) $(LIBSTDCXX_IF) $(p_lib) (>=
$(lib_pkg_req_version))" \
> debian/shlibs.local
else
--- gcc-2.95-2.95.4.ds15/debian/rules.conf.orig 2005-10-28 11:41:02.000000000
+0200
+++ gcc-2.95-2.95.4.ds15/debian/rules.conf 2005-10-28 11:42:06.000000000
+0200
@@ -8,7 +8,7 @@
include debian/rules.defs
# FIRST_PRIMARY - first gcc version built as primary compiler
-ifeq ($(DEB_HOST_GNU_TYPE),i386-linux)
+ifeq ($(DEB_HOST_GNU_TYPE),i386-linux-gnu)
FIRST_PRIMARY = 2.91.63-1.1
endif
ifeq ($(DEB_HOST_ARCH),sparc)
@@ -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
--- gcc-2.95-2.95.4.ds15/debian/rules.defs.orig 2005-10-28 11:41:02.000000000
+0200
+++ gcc-2.95-2.95.4.ds15/debian/rules.defs 2005-10-28 11:42:06.000000000
+0200
@@ -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
