Bug#381018: gcc-default: Updates for hurd-i386
Package: gcc-defaults
Version: 1.40
Severity: important
Tags: patch
Hi,
attached are some needed updates to make gcc-defaults build and work on
hurd-i386, patch by Cyril Brulebois:
* debian/control (Build-Depends): Conditionalize gcj-4.1 to
* !hurd-i386.
* debian/rules:
+ Use hurd-i386, not gnu-i386 when matching DEB_HOST_ARCH.
+ Add gcj and gij to no_packages for hurd-i386.
cheers,
Michael
gcc-defaults (1.40+hurd.1) unstable; urgency=low
* NMU to gnuab.
* debian/control (Build-Depends): Conditionalize gcj-4.1 to !hurd-i386.
* debian/rules:
+ Use hurd-i386, not gnu-i386 when matching DEB_HOST_ARCH.
+ Add gcj and gij to no_packages for hurd-i386.
-- Michael Banck <mbanck@debian.org> Tue, 1 Aug 2006 15:57:56 +0200
diff -Naur gcc-defaults-1.40/debian/control gcc-defaults-1.40+hurd.1/debian/control
--- gcc-defaults-1.40/debian/control 2006-07-06 03:20:14.000000000 +0200
+++ gcc-defaults-1.40+hurd.1/debian/control 2006-08-01 15:55:12.000000000 +0200
@@ -4,7 +4,7 @@
Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
Uploaders: Matthias Klose <doko@debian.org>, Ryan Murray <rmurray@debian.org>
Standards-Version: 3.6.2
-Build-Depends: m4, debhelper (>= 4.2), dpkg-dev (>= 1.13.9), gcc-3.4-base (>= 3.4.6), gcj-4.1-base (>= 4.1.1), gcc-4.1-base (>= 4.1.1)
+Build-Depends: m4, debhelper (>= 4.2), dpkg-dev (>= 1.13.9), gcc-3.4-base (>= 3.4.6), gcj-4.1-base (>= 4.1.1) [!hurd-i386], gcc-4.1-base (>= 4.1.1)
Package: cpp
Architecture: any
diff -Naur gcc-defaults-1.40/debian/rules gcc-defaults-1.40+hurd.1/debian/rules
--- gcc-defaults-1.40/debian/rules 2006-07-16 00:04:18.000000000 +0200
+++ gcc-defaults-1.40+hurd.1/debian/rules 2006-08-01 15:57:35.000000000 +0200
@@ -128,9 +128,9 @@
ifeq ($(DEB_HOST_ARCH),i386)
endif
-ifeq ($(DEB_HOST_ARCH),i386-gnu)
+ifeq ($(DEB_HOST_ARCH),hurd-i386)
OS_NAME := Hurd
- no_packages += gnat
+ no_packages += gnat gcj gij
endif
ifeq ($(DEB_HOST_ARCH),ia64)
Reply to: