Bug#101711: Packaging fixes for hurd-i386
Package: gcc-3.0
Version: 3.0-1
Please accept the following two patches:
These patches:
o Correct all instances of i386-hurd to be hurd-i386
o Disables Java for hurd-i386
o Disables pthreads for hurd-i386
o Remove an old hack for _G_config.h on hurd-i386
(Patch 1 in the debian directory):
diff -c debian/rules.conf ../../gcc-3.0/gcc-3.0-3.0.ds8/debian/rules.conf
*** debian/rules.conf Wed Jun 20 09:51:23 2001
--- ../../gcc-3.0/gcc-3.0-3.0.ds8/debian/rules.conf Mon Jun 18 23:50:18 2001
***************
*** 57,63 ****
ifeq ($(DEB_HOST_GNU_CPU),alpha)
ctrl_flags += -DLIBC_DEV="libc6.1-dev (>= 2.2.2-2)
else
! ifeq ($(DEB_HOST_GNU_TYPE),i386-hurd)
ctrl_flags += -DLIBC_DEV=libc0.2-dev
else
ctrl_flags += -DLIBC_DEV="libc6-dev (>= 2.2.3-1)"
--- 57,63 ----
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
else
ctrl_flags += -DLIBC_DEV="libc6-dev (>= 2.2.3-1)"
diff -c debian/rules.defs ../../gcc-3.0/gcc-3.0-3.0.ds8/debian/rules.defs
*** debian/rules.defs Wed Jun 20 09:51:23 2001
--- ../../gcc-3.0/gcc-3.0-3.0.ds8/debian/rules.defs Tue Jun 19 13:19:23 2001
***************
*** 93,99 ****
# Java --------------------
# java converted for V3 C++ ABI for some archs
with_java := yes
! ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),hppa m68k powerpc))
with_java := diabled for architecure $(DEB_HOST_ARCH)
endif
ifneq ($(GCC_TARGET),)
--- 93,99 ----
# Java --------------------
# java converted for V3 C++ ABI for some archs
with_java := yes
! ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),hppa m68k powerpc hurd-i386))
with_java := diabled for architecure $(DEB_HOST_ARCH)
endif
ifneq ($(GCC_TARGET),)
***************
*** 159,165 ****
with_objc_gc := yes
# disable ObjC garbage collection library (needs libgc5)
ifneq ($(DEB_HOST_ARCH),i386)
! ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),avr i386-hurd m68k))
with_objc_gc := disabled for architecture $(DEB_HOST_ARCH)
endif
endif
--- 159,165 ----
with_objc_gc := yes
# disable ObjC garbage collection library (needs libgc5)
ifneq ($(DEB_HOST_ARCH),i386)
! ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),avr hurd-i386 m68k))
with_objc_gc := disabled for architecture $(DEB_HOST_ARCH)
endif
endif
diff -c debian/rules2 ../../gcc-3.0/gcc-3.0-3.0.ds8/debian/rules2
*** debian/rules2 Wed Jun 20 09:51:24 2001
--- ../../gcc-3.0/gcc-3.0-3.0.ds8/debian/rules2 Tue Jun 19 13:27:20 2001
***************
*** 60,66 ****
# --enable-c-mbchar \
#
! ifneq ($(GCC_TARGET),avr)
CONFARGS += --enable-threads=posix
endif
--- 60,66 ----
# --enable-c-mbchar \
#
! ifneq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH), avr hurd-i386))
CONFARGS += --enable-threads=posix
endif
***************
*** 422,432 ****
install
: # Adjust installation such that we can begin moving things around:
- ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
- : # the Hurd GLibC still uses the antique stdio, and NOT libio
- mv $(d)/$(PF)/$(DEB_HOST_GNU_TYPE)/include/_G_config.h \
- $(d)/$(PF)/include
- endif
ifeq ($(versioned_packages),yes)
: # rename files (versioned binaries)
--- 422,427 ----
(Patch 2 in the debian/rules.d directory):
diff -c debian/rules.d/binary-libstdcxx.old debian/rules.d/binary-libstdcxx.mk
*** debian/rules.d/binary-libstdcxx.old Wed Jun 20 15:33:25 2001
--- debian/rules.d/binary-libstdcxx.mk Wed Jun 20 15:33:39 2001
***************
*** 33,42 ****
# Not yet...
# $(PF)/lib/lib{supc,stdc}++.la
- ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
- files_dev += $(PF)/include/_G_config.h
- endif
-
dirs_dbg = \
$(docdir) \
$(PF)/lib/libstdc++_debug
--- 33,38 ----
Reply to: