Package: gcc-3.4
Severity: wishlist
Tags: patch
Currently, some 32bit C++ development files are missing in
'libstdc++6-dev' on amd64. Without these files,
32bit C++ cross-development does not work on amd64.
The attached patch changes 'debian/rules.d/binary-libstdcxx.mk'
to include the missing 32bit files in the 'libstdc++6-dev' package.
Regards
Andreas Jochens
diff -urN ../tmp-orig/gcc-3.4-3.4.2/debian/rules.d/binary-libstdcxx.mk
./debian/rules.d/binary-libstdcxx.mk
--- ../tmp-orig/gcc-3.4-3.4.2/debian/rules.d/binary-libstdcxx.mk
2004-10-01 11:26:55.711322136 +0200
+++ ./debian/rules.d/binary-libstdcxx.mk 2004-10-01 11:04:44.650674112
+0200
@@ -82,6 +82,15 @@
dirs_pic += $(gcc_lib_dir)
files_pic += $(gcc_lib_dir)/64/libstdc++_pic.a
endif
+ifeq ($(biarch_ia32),yes)
+ dirs_dev += $(gcc_lib_dir)/32/
+ files_dev += $(gcc_lib_dir)/32/libstdc++.{a,so} \
+ $(gcc_lib_dir)/32/libsupc++.a
+ dirs_dbg += $(PF)/lib32/debug
+ files_dbg += $(PF)/lib32/debug/libstdc++.*
+ dirs_pic += $(gcc_lib_dir)
+ files_pic += $(gcc_lib_dir)/32/libstdc++_pic.a
+endif
# ----------------------------------------------------------------------
@@ -277,6 +286,9 @@
ifeq ($(biarch),yes)
mv $(d)/$(PF)/lib64/lib*c++*.{a,so} $(d)/$(gcc_lib_dir)/64/.
endif
+ifeq ($(biarch_ia32),yes)
+ mv $(d)/$(PF)/lib32/lib*c++*.{a,so} $(d)/$(gcc_lib_dir)/32/.
+endif
DH_COMPAT=2 dh_movefiles -p$(p_dev) $(files_dev)
DH_COMPAT=2 dh_movefiles -p$(p_pic) $(files_pic)
@@ -290,6 +302,11 @@
/$(PF)/lib64/libstdc++.so.$(CXX_SONAME) \
/$(gcc_lib_dir)/64/libstdc++.so
endif
+ifeq ($(biarch_ia32),yes)
+ dh_link -p$(p_dev) \
+ /$(PF)/lib32/libstdc++.so.$(CXX_SONAME) \
+ /$(gcc_lib_dir)/32/libstdc++.so
+endif
debian/dh_doclink -p$(p_dev) $(p_lib)
debian/dh_doclink -p$(p_pic) $(p_lib)
