Package: lsb-core
Version: 3.2-23
Severity: important
debian/rules of lsb mixes DEB_HOST_ARCH_CPU and DEB_HOST_ARCH. In Debian
we have different availables for the same CPU (eg i386, hurd-i386,
kfreebsd-i386), so DEB_HOST_ARCH should be used instead.
The patch below fixes the problem:
diff -Nru lsb-3.2/debian/rules lsb-3.2/debian/rules
--- lsb-3.2/debian/rules 2009-03-19 22:50:58.000000000 +0100
+++ lsb-3.2/debian/rules 2009-07-30 13:23:54.000000000 +0200
@@ -9,15 +9,7 @@
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU
2>/dev/null)
-
-# Take account of old dpkg-architecture output.
-ifeq ($(DEB_HOST_ARCH_CPU),)
- DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
- ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
- DEB_HOST_ARCH_CPU := amd64
- endif
-endif
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
@@ -27,7 +19,7 @@
endif
# Map Debian architectures to LSB architectures
-lsbarch=${DEB_HOST_ARCH_CPU}
+lsbarch=${DEB_HOST_ARCH}
ifeq (${lsbarch}, i386)
lsbarch=ia32
endif
@@ -39,6 +31,12 @@
ifeq (${lsbarch}, hurd-i386)
LIBC=libc0.3 (>> 2.3.5)
endif
+ifeq (${lsbarch}, kfreebsd-amd64)
+LIBC=libc0.1 (>> 2.3.5)
+endif
+ifeq (${lsbarch}, kfreebsd-i386)
+LIBC=libc0.1 (>> 2.3.5)
+endif
ifeq (${lsbarch}, ia64)
LIBC=libc6.1 (>> 2.3.5)
endif
@@ -145,7 +143,7 @@
@echo >> debian/lsb-multimedia.substvars
"provides=lsb-multimedia-${lsbarch}"
@echo >> debian/lsb-languages.substvars
"provides=lsb-languages-${lsbarch}"
@echo >> debian/lsb-printing.substvars
"provides=lsb-printing-${lsbarch}"
- @[ ${DEB_HOST_ARCH_CPU} = 'amd64' ] && echo >>
debian/lsb-core.substvars "depends=libc6-i386, lib32z1" || true
+ @[ ${DEB_HOST_ARCH} = 'amd64' ] && echo >> debian/lsb-core.substvars
"depends=libc6-i386, lib32z1" || true
dh_link -a
dh_strip -a
dh_compress -a
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: kfreebsd-amd64 (x86_64)
Kernel: kFreeBSD 7.2-1-amd64
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
