Bug#159620: Patch, try 2
Some days, it doesn't pay to get out of bed. Try this patch, instead; the
previous one attempted (and failed) to catch any netbsd* arch; this one
will simply check the list of archs.
diff -urN debian.orig/rules.defs debian/rules.defs
--- debian.orig/rules.defs Wed Sep 4 22:26:15 2002
+++ debian/rules.defs Wed Sep 4 22:32:45 2002
@@ -100,6 +100,14 @@
enabled_languages += c++
endif
+# __cxa_atexit -------------
+# The __cxa_atexit API does not exist in some libc version (NetBSD)
+with_cxa_atexit := yes
+no_cxa_atexit_archs := netbsd-i386
+ifeq ($(DEB_HOST_ARCH), $(findstring
$(DEB_HOST_ARCH),$(no_cxa_atexit_archs)))
+ with_cxa_atexit := disabled for architecture $(DEB_HOST_ARCH)
+endif
+
# Java --------------------
# java converted for V3 C++ ABI for some archs
with_java := yes
diff -urN debian.orig/rules2 debian/rules2
--- debian.orig/rules2 Wed Sep 4 22:26:16 2002
+++ debian/rules2 Wed Sep 4 22:26:35 2002
@@ -62,8 +62,11 @@
--enable-shared \
--with-system-zlib \
--enable-nls \
- --without-included-gettext \
- --enable-__cxa_atexit
+ --without-included-gettext
+
+ifeq ($(with_cxa_atexit),yes)
+ CONFARGS += --enable-__cxa_atexit
+endif
ifeq ($(with_java),yes)
CONFARGS += --enable-java-gc=boehm
--
***************************************************************************
Joel Baker System Administrator - lightbearer.com
lucifer@lightbearer.com http://users.lightbearer.com/lucifer/
Reply to: