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

${MACHINE_ARCH} includes Debian-specific OS prefix

Package: bmake
Version: 20131001-3
Tags: patch
User: debian-bsd@lists.debian.org
Usertags: kfreebsd


bmake is built with ${MACHINE_ARCH} set to match Debian architecture. This
is most usually ok, but unfortunately the call to dpkg-architecture uses
DEB_HOST_ARCH rather than DEB_HOST_ARCH_CPU. On Linux there's no difference,
but on other ports (e.g. kFreeBSD) the result takes Debian-specific form
("kfreebsd-" prefix), breaking common use of ${MACHINE_ARCH}.

This problem currently prevents migrating freebsd-libs to bmake (unless we
apply some workaround), as libkvm Makefile relies on ${MACHINE_ARCH} to
identify the architecture.

The fix is trivial: just replace DEB_HOST_ARCH with DEB_HOST_ARCH_CPU.

Robert Millan
--- debian/rules~	2013-12-31 17:24:55.000000000 +0100
+++ debian/rules	2014-01-18 01:23:48.390467684 +0100
@@ -2,7 +2,7 @@
 #export DH_VERBOSE=1
-ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 MAKE_VERSION=$(shell sed -n '/^MAKE_VERSION=/s,.*=[^0-9]*,,p' Makefile)
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS) \

Reply to: