From patchwork Tue Aug 23 10:48:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 3616 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 80DA323F41 for ; Tue, 23 Aug 2011 10:48:45 +0000 (UTC) Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 5F5BAA186E1 for ; Tue, 23 Aug 2011 10:48:45 +0000 (UTC) Received: by bkbzs2 with SMTP id zs2so6813511bkb.11 for ; Tue, 23 Aug 2011 03:48:45 -0700 (PDT) Received: by 10.204.133.215 with SMTP id g23mr1570643bkt.70.1314096524908; Tue, 23 Aug 2011 03:48:44 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.204.41.75 with SMTP id n11cs206327bke; Tue, 23 Aug 2011 03:48:44 -0700 (PDT) Received: by 10.224.27.20 with SMTP id g20mr2220321qac.178.1314096523633; Tue, 23 Aug 2011 03:48:43 -0700 (PDT) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id fl6si50953qab.49.2011.08.23.03.48.41 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 03:48:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of nchip@afflict.kos.to designates 92.243.29.197 as permitted sender) client-ip=92.243.29.197; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of nchip@afflict.kos.to designates 92.243.29.197 as permitted sender) smtp.mail=nchip@afflict.kos.to Received: by afflict.kos.to (Postfix, from userid 1000) id 5C44B2669D; Tue, 23 Aug 2011 10:48:40 +0000 (UTC) Date: Tue, 23 Aug 2011 13:48:40 +0300 From: Riku Voipio To: submit@bugs.debian.org Subject: please add multi-arch support for mpfr4 Message-ID: <20110823104840.GA15357@afflict.kos.to> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Package: mpfr4 Version: 3.0.1-5 Severity: normal User: debian-dpkg@lists.debian.org Usertags: multiarch Tags: patch Hi, The attached patch converts mpfr4 to multiarch paths and adds the relevant Multi-Arch: fields to debian/control. Since mpfr4 is bottom dependency installed by default when installing toolchain, we need a early conversion of mpfr4 to be able to take advantage of multiarch. Riku diff -urN orig/mpfr4-3.0.1//debian/control mpfr4-3.0.1//debian/control --- orig/mpfr4-3.0.1//debian/control 2011-07-18 15:50:27.000000000 +0300 +++ mpfr4-3.0.1//debian/control 2011-08-23 10:35:14.691262001 +0300 @@ -1,7 +1,7 @@ Source: mpfr4 Section: math Priority: optional -Build-Depends: debhelper (>= 7), libgmp-dev, lib32gmp-dev [amd64 kfreebsd-amd64 ppc64], gcc-multilib [amd64 kfreebsd-amd64 ppc64], g++-multilib [amd64 kfreebsd-amd64 ppc64] +Build-Depends: debhelper (>= 8.1.3), libgmp-dev, lib32gmp-dev [amd64 kfreebsd-amd64 ppc64], gcc-multilib [amd64 kfreebsd-amd64 ppc64], g++-multilib [amd64 kfreebsd-amd64 ppc64] Build-Depends-Indep: texinfo, texlive-latex-base Maintainer: Laurent Fousse Uploaders: Steve M. Robbins , Philipp Matthias Hahn @@ -14,6 +14,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Conflicts: libgmp3 (<< 4.1.4-3) Description: multiple precision floating-point computation MPFR provides a library for multiple-precision floating-point computation @@ -40,6 +42,7 @@ Section: libdevel Architecture: any Depends: libgmp-dev, libmpfr4 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Suggests: libmpfr-doc Conflicts: libgmp3-dev (<< 4.1.4-3) Replaces: libgmp3-dev (<< 4.1.4-3) diff -urN orig/mpfr4-3.0.1//debian/libmpfr4.install mpfr4-3.0.1//debian/libmpfr4.install --- orig/mpfr4-3.0.1//debian/libmpfr4.install 2010-06-10 16:06:42.000000000 +0300 +++ mpfr4-3.0.1//debian/libmpfr4.install 2011-08-23 10:35:44.081262001 +0300 @@ -1 +1 @@ -usr/lib/libmpfr.so.* usr/lib/ +usr/lib/*/libmpfr.so.* diff -urN orig/mpfr4-3.0.1//debian/libmpfr-dev.install mpfr4-3.0.1//debian/libmpfr-dev.install --- orig/mpfr4-3.0.1//debian/libmpfr-dev.install 2011-07-18 15:50:27.000000000 +0300 +++ mpfr4-3.0.1//debian/libmpfr-dev.install 2011-08-23 10:36:03.231262001 +0300 @@ -1,3 +1,3 @@ -usr/lib/libmpfr.so usr/lib/ -usr/lib/libmpfr.a usr/lib/ +usr/lib/*/libmpfr.so +usr/lib/*/libmpfr.a usr/include/*.h usr/include/ diff -urN orig/mpfr4-3.0.1//debian/rules mpfr4-3.0.1//debian/rules --- orig/mpfr4-3.0.1//debian/rules 2011-07-18 15:50:27.000000000 +0300 +++ mpfr4-3.0.1//debian/rules 2011-08-23 10:41:19.331262002 +0300 @@ -26,6 +26,7 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE) @@ -66,7 +67,7 @@ chmod +x configure cd build && \ ../configure $(confflags) --prefix=/usr \ - --enable-shared + --enable-shared --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) touch configure-stamp configure32: configure32-stamp