[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#797324: marked as done (gcc-5: please support multiarch path to kfreebsd-kernel-headers)

Your message dated Mon, 14 Sep 2015 18:04:20 +0000
with message-id <E1ZbY72-0004U2-1I@franck.debian.org>
and subject line Bug#797324: fixed in kfreebsd-kernel-headers 10.1~7
has caused the Debian Bug report #797324,
regarding gcc-5: please support multiarch path to kfreebsd-kernel-headers
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
797324: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=797324
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: src:gcc-5
Version: 5.2.1-15
Severity: wishlist
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

Hi,

gcc-5 already supports having some linux kernel headers at
/usr/include/$(DEB_TARGET_MULTIARCH)/asm

We'd like to move *all* of kfreebsd-kernel-headers into
/usr/include/$(DEB_TARGET_MULTIARCH), to allow cross-building linux
arches from kfreebsd and vice-versa.  Moving our headers to a multiarch
path would deconflict identically named kernel headers.

Would the attached patch be acceptable?  I have tested this with native
builds on kfreebsd-i386 and kfreebsd-amd64 (with biarch).  The change
should not affect other arches than kfreebsd.  And it is backward-
compatible with headers being in /usr/include/sys, until we actually
make the change in sid.

Thanks!

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: kfreebsd-amd64 (x86_64)

Kernel: kFreeBSD 9.0-2-amd64-xenhvm-ipsec
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

--- gcc-5-5.2.1/debian/rules2.orig	2015-08-26 09:46:51.000000000 +0000
+++ gcc-5-5.2.1/debian/rules2	2015-08-27 20:08:21.845453886 +0000
@@ -1121,11 +1121,15 @@
 	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(builddir)/gcc/ada/rts \
 		../src/configure $(subst ___, ,$(CONFARGS))
 
+ifeq ($(DEB_TARGET_ARCH_OS),kfreebsd)
 	: # multilib builds without b-d on gcc-multilib (used in FLAGS_FOR_TARGET)
+	ln -sf /usr/include/$(DEB_TARGET_MULTIARCH) $(builddir)/sys-include
+else
 	if [ -d /usr/include/$(DEB_TARGET_MULTIARCH)/asm ]; then \
 	  mkdir -p $(builddir)/sys-include; \
 	  ln -sf /usr/include/$(DEB_TARGET_MULTIARCH)/asm $(builddir)/sys-include/asm; \
 	fi
+endif
 
 	touch $(configure_stamp)
 
@@ -1299,6 +1303,12 @@
 	  CC="$(BUILT_CC)" \
 	  CXX="$(BUILT_CXX)" \
 	     ../src/configure $(CONFARGS_JIT)
+
+ifeq ($(DEB_TARGET_ARCH_OS),kfreebsd)
+	: # multilib builds without b-d on gcc-multilib (used in FLAGS_FOR_TARGET)
+	ln -sf /usr/include/$(DEB_TARGET_MULTIARCH) $(builddir_jit)/sys-include
+endif
+
 	touch $(configure_jit_stamp)
 
 $(build_jit_stamp): $(configure_jit_stamp)

--- End Message ---
--- Begin Message --- 
Source: kfreebsd-kernel-headers
Source-Version: 10.1~7

We believe that the bug you reported is fixed in the latest version of
kfreebsd-kernel-headers, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 797324@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Steven Chamberlain <steven@pyro.eu.org> (supplier of updated kfreebsd-kernel-headers package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Tue, 25 Aug 2015 17:12:43 +0100
Source: kfreebsd-kernel-headers
Binary: kfreebsd-kernel-headers
Architecture: source
Version: 10.1~7
Distribution: experimental
Urgency: medium
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd@lists.debian.org>
Changed-By: Steven Chamberlain <steven@pyro.eu.org>
Description:
 kfreebsd-kernel-headers - kFreeBSD headers for development
Closes: 796903 797324
Changes:
 kfreebsd-kernel-headers (10.1~7) experimental; urgency=medium
 .
   * Limit libc0.1-dev dependency to !nocheck profile.  (Thanks, Helmut
     Grohne).  (Closes: #796903)
   * Note new dependency on dh-exec;  minimum versions of debhelper and
     dpkg-dev for Build-Profiles.
   * Install compatibility symlinks on kfreebsd-amd64 for -m32 multilib.
     (Closes: #797324)
   * Bump Standards-Version to 3.9.6;  no change needed.
Checksums-Sha1:
 0e8836d4e3c59490b1b44fb868bb453f2398b6a7 1621 kfreebsd-kernel-headers_10.1~7.dsc
 639945ba8fb2cb8b73c16fcb5d64e437219bdcfb 46284 kfreebsd-kernel-headers_10.1~7.tar.xz
Checksums-Sha256:
 31b9148e93e0c3f7dbfe7aa9a8c1cd251c53122b0dec302ad296541d3fd4388d 1621 kfreebsd-kernel-headers_10.1~7.dsc
 32037eed23adc648305d3b78cb987bde468877fd4760471bf64fba0f9fee79a0 46284 kfreebsd-kernel-headers_10.1~7.tar.xz
Files:
 41fbf2216bc6497c8e1bdf13ae07048b 1621 kernel standard kfreebsd-kernel-headers_10.1~7.dsc
 9c49fde24bc944d316dfe43695f2f788 46284 kernel standard kfreebsd-kernel-headers_10.1~7.tar.xz

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBCAAGBQJV9wZbAAoJELrpzbaMAu5T3ucIAKyN6Ye4UROcB7C1JSXppNMv
9LpNI7Gq5L6kJO7VQ4kw+HbDk6lbApEkpajcTfIByBF4SwQYbGTu02/3dHzNz1g3
8xFKlPCR0xsH0IRCgql9CFNRJ2ih5gPlE4FBIdMioYm/PcmRdEUwcVN0ofY4Zrrj
SMTHLU2SyISHG52r5t2Ba79m9tlDVRdX2eqzzhbQIITHCm+eTnCp5nN8orCU+2S0
wrdXi8AtTI2Q3HHNmQuzAvmieNQ22XXYSLANREqtk6PvG7BJVxIzF0DlC3h5oVC7
iR69IOmVnjh7wcDUmllrVprJRQ36Y4fZiItFoTFWr/neRvheoWVUoalPrZb98h8=
=FH4c
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: