Package: gcc-3.2 Version: 3.2.2ds5 Severity: minor Tags: patch The workaround for GNU locale problems is overly aggressive, and breaks on systems that really don't have GNU locales (such as libc12 based systems). The following patch adds a check for known architectures that need to disable the workaround. -- Joel Baker <[EMAIL PROTECTED]>
diff -ur debian.orig/control.m4 debian/control.m4
--- debian.orig/control.m4 2003-01-25 00:17:14.000000000 +0000
+++ debian/control.m4 2003-01-25 00:22:46.000000000 +0000
@@ -33,7 +33,7 @@
Maintainer: MAINTAINER
Uploaders: Christopher C. Chimelis <[EMAIL PROTECTED]>, Matthias Klose <[EMAIL
PROTECTED]>
Standards-Version: 3.5.6
-Build-Depends: LIBC_BUILD_DEP, m4, autoconf2.13, automake1.4, libtool, gawk,
dejagnu (>= 1.4), expect (>= 5.38.0), bzip2, binutils (>= BINUTILSV) [!s390],
binutils (>= 2.13.90.0.4) [s390], debhelper (>= 3.0.25), gperf (>= 2.7-3),
bison-1.35, flex, gettext, texinfo, zlib1g-dev, libgc6-dev [libgc6_no_archs],
xlibs-dev, gnat-3.2 [ada_no_archs] | gnat (>= 3.14p-3) [i386 powerpc sparc],
libncurses5-dev, libgmp3-dev, libc6-dev-s390x [s390], tetex-bin, locales,
gcc-2.95 [m68k]
+Build-Depends: LIBC_BUILD_DEP, m4, autoconf2.13, automake1.4, libtool, gawk,
dejagnu (>= 1.4), expect (>= 5.38.0), bzip2, binutils (>= BINUTILSV) [!s390],
binutils (>= 2.13.90.0.4) [s390], debhelper (>= 3.0.25), gperf (>= 2.7-3),
bison-1.35, flex, gettext, texinfo, zlib1g-dev, libgc6-dev [libgc6_no_archs],
xlibs-dev, gnat-3.2 [ada_no_archs] | gnat (>= 3.14p-3) [i386 powerpc sparc],
libncurses5-dev, libgmp3-dev, libc6-dev-s390x [s390], tetex-bin, locales
[locale_no_archs], gcc-2.95 [m68k]
Build-Depends-Indep: doxygen, sharutils
ifdef(`TARGET', `', `
diff -ur debian.orig/rules.conf debian/rules.conf
--- debian.orig/rules.conf 2003-01-25 00:17:14.000000000 +0000
+++ debian/rules.conf 2003-01-25 00:21:57.000000000 +0000
@@ -131,7 +131,8 @@
-Denabled_languages="$(enabled_languages) $$addons" \
-Dada_no_archs="$(foreach arch,$(ada_no_archs),!$(arch))" \
-Dlibgc6_no_archs="$(foreach arch,$(libgc6_no_archs),!$(arch))" \
- debian/control.m4 > debian/control.tmp2
+ -Dlocale_no_archs="$(foreach arch,$(locale_no_archs),!$(arch))" \
+ debian/control.m4 > debian/control.tmp2 \
uniq debian/control.tmp2 > debian/control.tmp
rm -f debian/control.tmp2
[ -e debian/control ] \
diff -ur debian.orig/rules.defs debian/rules.defs
--- debian.orig/rules.defs 2003-01-25 00:17:14.000000000 +0000
+++ debian/rules.defs 2003-01-25 00:23:22.000000000 +0000
@@ -295,6 +295,13 @@
biarch := yes
endif
+# GNU locales
+force_gnu_locales := yes
+locale_no_archs := netbsd-i386
+ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),$(locale_no_archs)))
+ force_gnu_locales := disabled for $(DEB_HOST_ARCH)
+endif
+
unpack_stamp := $(stampdir)/01-unpack-stamp
patch_stamp := $(stampdir)/02-patch-stamp
control_stamp := $(stampdir)/03-control-stamp
Only in debian: rules.defs.orig
diff -ur debian.orig/rules2 debian/rules2
--- debian.orig/rules2 2003-01-25 00:17:14.000000000 +0000
+++ debian/rules2 2003-01-25 00:23:41.000000000 +0000
@@ -81,7 +81,9 @@
endif
ifeq ($(with_cxx),yes)
- CONFARGS += --enable-clocale=gnu
+ ifeq ($(force_gnu_locales),yes)
+ CONFARGS += --enable-clocale=gnu
+ endif
endif
ifeq ($(with_java),yes)
pgpIiEY9zkg6U.pgp
Description: PGP signature
