Package: gcc-3.0
Version: 3.0.ds9
Severity: serious
Tags: patch
X-Debbugs-Cc: debian-ia64@lists.debian.org

Here's a patch for the ia64 packaging bits. 

I get a lot of regression test errors, but they seem to be comparable to
what we get on hppa and mips.

Enjoy :)
randolph

diff -uNr gcc-3.0-3.0.ds9/debian/rules.conf 
ia64-gcc-3.0-3.0.ds9/debian/rules.conf
--- gcc-3.0-3.0.ds9/debian/rules.conf   Sun Jul 22 18:48:32 2001
+++ ia64-gcc-3.0-3.0.ds9/debian/rules.conf      Sun Jul 22 16:27:59 2001
@@ -57,10 +57,14 @@
 ifeq ($(DEB_HOST_GNU_CPU),alpha)
   ctrl_flags += -DLIBC_DEV="libc6.1-dev (>= 2.2.2-2)"
 else
-  ifeq ($(DEB_HOST_GNU_TYPE),hurd-i386)
-    ctrl_flags += -DLIBC_DEV=libc0.2-dev
+  ifeq ($(DEB_HOST_GNU_CPU),ia64)
+    ctrl_flags += -DLIBC_DEV="libc6.1-dev (>= 2.2.2-2)"
   else
-    ctrl_flags += -DLIBC_DEV="libc6-dev (>= 2.2.3-1)"
+    ifeq ($(DEB_HOST_GNU_TYPE),hurd-i386)
+      ctrl_flags += -DLIBC_DEV=libc0.2-dev
+    else
+      ctrl_flags += -DLIBC_DEV="libc6-dev (>= 2.2.3-1)"
+    endif
   endif
 endif
 
diff -uNr gcc-3.0-3.0.ds9/debian/rules.d/binary-gcc.mk 
ia64-gcc-3.0-3.0.ds9/debian/rules.d/binary-gcc.mk
--- gcc-3.0-3.0.ds9/debian/rules.d/binary-gcc.mk        Sun Jul 22 18:48:33 2001
+++ ia64-gcc-3.0-3.0.ds9/debian/rules.d/binary-gcc.mk   Sun Jul 22 16:04:17 2001
@@ -30,6 +30,10 @@
        $(shell test -e $(d)/$(gcc_lib_dir)/SYSCALLS.c.X \
                && echo $(gcc_lib_dir)/SYSCALLS.c.X)
 
+ifeq ($(DEB_TARGET_ARCH),ia64)
+    files_gcc += $(gcc_lib_dir)/include/ia64intrin.h
+endif
+
 usr_doc_files = debian/README.Bugs \
        $(shell test -f $(srcdir)/FAQ && echo $(srcdir)/FAQ)
 ifeq ($(with_check),yes)
diff -uNr gcc-3.0-3.0.ds9/debian/rules.defs 
ia64-gcc-3.0-3.0.ds9/debian/rules.defs
--- gcc-3.0-3.0.ds9/debian/rules.defs   Sun Jul 22 18:48:32 2001
+++ ia64-gcc-3.0-3.0.ds9/debian/rules.defs      Sun Jul 22 16:04:17 2001
@@ -94,7 +94,7 @@
 # java converted for V3 C++ ABI for some archs
 with_java := yes
 ifneq ($(DEB_HOST_ARCH),i386)
-  ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),arm hurd-i386 hppa 
m68k mips mipsel powerpc))
+  ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),arm hurd-i386 hppa 
ia64 m68k mips mipsel powerpc))
     with_java := disabled for architecure $(DEB_HOST_ARCH)
   endif
 endif
@@ -173,9 +173,9 @@
 endif
 
diff -uNr gcc-3.0-3.0.ds9/debian/rules.patch 
ia64-gcc-3.0-3.0.ds9/debian/rules.patch
--- gcc-3.0-3.0.ds9/debian/rules.patch  Sun Jul 22 18:48:32 2001
+++ ia64-gcc-3.0-3.0.ds9/debian/rules.patch     Sun Jul 22 16:04:17 2001
@@ -54,9 +54,6 @@
 ifeq ($(DEB_HOST_ARCH),hurd-i386)
   debian_patches += build-hurd
 endif
-ifeq ($(DEB_HOST_ARCH),ia64)
-  debian_patches += sonames
-endif
 ifeq ($(DEB_HOST_ARCH),powerpc)
   debian_patches += gcc-ppc-disable-shared-libgcc
 endif

-- 
Debian Developer <[EMAIL PROTECTED]>
http://www.TauSq.org/


Reply via email to