From patchwork Mon Aug 22 13:20:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 3603 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 7839723F41 for ; Mon, 22 Aug 2011 13:20:57 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 32601A1834A for ; Mon, 22 Aug 2011 13:20:57 +0000 (UTC) Received: by yxi11 with SMTP id 11so5042181yxi.11 for ; Mon, 22 Aug 2011 06:20:56 -0700 (PDT) Received: by 10.150.170.13 with SMTP id s13mr2338580ybe.48.1314019256676; Mon, 22 Aug 2011 06:20:56 -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.150.157.17 with SMTP id f17cs196500ybe; Mon, 22 Aug 2011 06:20:56 -0700 (PDT) Received: by 10.224.217.6 with SMTP id hk6mr1349386qab.117.1314019256132; Mon, 22 Aug 2011 06:20:56 -0700 (PDT) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id hh9si10652150qab.98.2011.08.22.06.20.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Aug 2011 06:20:56 -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 B197026693; Mon, 22 Aug 2011 13:20:54 +0000 (UTC) Date: Mon, 22 Aug 2011 16:20:54 +0300 From: Riku Voipio To: submit@bugs.debian.org Subject: please add multi-arch support for readline5 Message-ID: <20110822132054.GB10979@afflict.kos.to> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Package: readline5 Version: 5.2-9 Severity: wishlist User: debian-dpkg@lists.debian.org Usertags: multiarch Tags: patch Hi, The attached patch converts libreadline5 to multiarch paths and adds the relevant Multi-Arch: fields to debian/control. Riku diff -urN old/readline5-5.2//debian/control readline5-5.2//debian/control --- old/readline5-5.2//debian/control 2011-08-22 13:02:37.000000000 +0300 +++ readline5-5.2//debian/control 2011-08-22 14:31:52.482285001 +0300 @@ -3,11 +3,13 @@ Priority: extra Maintainer: Matthias Klose Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 5), dpatch, lsb-release, libncurses5-dev (>= 5.6), lib32ncurses5-dev [amd64 ppc64], lib64ncurses5-dev [i386 powerpc sparc s390], mawk | awk, texinfo, autotools-dev, gcc-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 s390 sparc] +Build-Depends: debhelper (>= 8.1.3), dpatch, lsb-release, libncurses5-dev (>= 5.6), lib32ncurses5-dev [amd64 ppc64], lib64ncurses5-dev [i386 powerpc sparc s390], mawk | awk, texinfo, autotools-dev, gcc-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 s390 sparc] Package: libreadline5 Architecture: any Depends: readline-common, ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Section: libs Description: GNU readline and history libraries, run-time libraries The GNU readline library aids in the consistency of user interface @@ -34,6 +36,7 @@ Depends: libreadline5 (= ${binary:Version}), libncurses5-dev, ${shlibs:Depends}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info Conflicts: libreadline-dev, libreadline5-dev Replaces: libreadline5-dev +Multi-Arch: same Section: libdevel Description: GNU readline and history libraries, development files The GNU readline library aids in the consistency of user interface diff -urN old/readline5-5.2//debian/rules readline5-5.2//debian/rules --- old/readline5-5.2//debian/rules 2011-08-22 13:02:37.000000000 +0300 +++ readline5-5.2//debian/rules 2011-08-22 15:28:23.532285002 +0300 @@ -11,6 +11,7 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) distribution := $(shell lsb_release -is) @@ -108,7 +109,8 @@ cd $(builddir) && \ CC=$(CC) $(srcdir)/configure \ --with-curses --prefix=/usr\ - --host=$(DEB_HOST_GNU_TYPE) + --host=$(DEB_HOST_GNU_TYPE) \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) ifneq ($(build32),) rm -rf $(builddir32) @@ -217,9 +219,9 @@ : # move $(p_rl) dh_installdirs -p$(p_rl) \ etc \ - lib \ + lib/$(DEB_HOST_MULTIARCH) \ usr/share/doc - cp -a $(d)/usr/lib/lib{history,readline}.so.* $(d_rl)/lib/ + cp -a $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.so.* $(d_rl)/lib/$(DEB_HOST_MULTIARCH) # cp -a $(d)/usr/lib/lib{history,readline}.so.$(libversion) $(d_rl)/lib/ # ln -s libhistory.so.$(libversion) \ # $(d_rl)/lib/libhistory.so.$(soversion) @@ -246,7 +248,7 @@ dh_installdirs -p$(p_rlg) \ usr/lib/debug \ usr/share/doc - mv $(d)/usr/lib/lib{history,readline}.so.$(libversion) \ + mv $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.so.$(libversion) \ $(d_rlg)/usr/lib/debug/. ln -s libhistory.so.$(libversion) \ $(d_rlg)/usr/lib/debug/libhistory.so.$(soversion) @@ -258,9 +260,9 @@ usr/lib \ usr/share/doc \ usr/share/info - ln -s /lib/libhistory.so.$(soversion) $(d_rld)/usr/lib/libhistory.so - ln -s /lib/libreadline.so.$(soversion) $(d_rld)/usr/lib/libreadline.so - mv $(d)/usr/lib/lib{history,readline}.a $(d_rld)/usr/lib/. + ln -s /lib/$(DEB_HOST_MULTIARCH)/libhistory.so.$(soversion) $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/libhistory.so + ln -s /lib/$(DEB_HOST_MULTIARCH)/libreadline.so.$(soversion) $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/libreadline.so + mv $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.a $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/. mv $(d)/usr/include $(d_rld)/usr/. mv $(d)/usr/share/info/{readline.info,history.info} \ $(d_rld)/usr/share/info/.