Bug#816186: startpar: fix cross-build
Control: tags -1 + pending Control: tags 794138 + pending Control: tags 869350 + pending Hi, 2016-02-28 16:28 Helmut Grohne: Control: tags -1 + patch Hi Samuel, On Sun, Feb 28, 2016 at 03:04:23PM +0100, Samuel Thibault wrote: startpar can be fixed to cross-build fine, please see attached patch which defines CC as appropriate. Your patch has two little problems. * It relies on building under dpkg-buildpackage. Policy still allows building by invoking ./debian/rules directly and then DEB_HOST_GNU_TYPE may be unset. * Your patch unconditionally overwrites CC and thus breaks e.g. CC=clang dpkg-buildpackage. Note that since CC has a built-in default, CC ?= ... cannot be used. I am attaching an updated version that addresses both issues. Thanks both, I am NMUing the package with these changes. Cheers. -- Manuel A. Fernandez Montecelo
Bug#816186: startpar: fix cross-build
Control: tags -1 + patch Hi Samuel, On Sun, Feb 28, 2016 at 03:04:23PM +0100, Samuel Thibault wrote: > startpar can be fixed to cross-build fine, please see attached patch > which defines CC as appropriate. Your patch has two little problems. * It relies on building under dpkg-buildpackage. Policy still allows building by invoking ./debian/rules directly and then DEB_HOST_GNU_TYPE may be unset. * Your patch unconditionally overwrites CC and thus breaks e.g. CC=clang dpkg-buildpackage. Note that since CC has a built-in default, CC ?= ... cannot be used. I am attaching an updated version that addresses both issues. Helmut diff --minimal -Nru startpar-0.59/debian/rules startpar-0.59/debian/rules --- startpar-0.59/debian/rules +++ startpar-0.59/debian/rules @@ -7,14 +7,19 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) DEB_HOST_ARCH_OS?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + +ifeq ($(origin CC),default) +CC := $(DEB_HOST_GNU_TYPE)-gcc +endif %: dh $@ override_dh_auto_build: - $(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" $(CROSS) startpar check + $(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" CC=$(CC) startpar check ifeq ($(DEB_HOST_ARCH_OS),linux) - $(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" $(CROSS) startpar-upstart-inject + $(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" CC=$(CC) startpar-upstart-inject endif override_dh_auto_install-arch:
Bug#816186: startpar: fix cross-build
Package: startpar Version: 0.59-3 Severity: normal Hello, startpar can be fixed to cross-build fine, please see attached patch which defines CC as appropriate. Samuel -- System Information: Debian Release: stretch/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0 (SMP w/4 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages startpar depends on: ii libc6 2.21-9 startpar recommends no packages. Versions of packages startpar suggests: ii insserv 1.14.0-5.2 ii sysv-rc 2.88dsf-59.3 -- no debconf information -- Samuel je déteste import parce que lorsque tu fais du python et que tu oublies le #!/bin/env python et que tu mets le fichier exécutable import est exécuté -+- #ens-mim - pourquoi mon script python change le curseur de la souris ?! -+- --- debian/rules.original 2016-02-28 12:43:32.998855948 + +++ debian/rules2016-02-28 12:44:31.099552039 + @@ -8,13 +8,19 @@ DEB_HOST_ARCH_OS?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + CC=gcc +else + CC=$(DEB_HOST_GNU_TYPE)-gcc +endif + %: dh $@ override_dh_auto_build: - $(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" $(CROSS) startpar check + $(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" CC=$(CC) startpar check ifeq ($(DEB_HOST_ARCH_OS),linux) - $(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" $(CROSS) startpar-upstart-inject + $(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" CC=$(CC) startpar-upstart-inject endif override_dh_auto_install-arch: