Ubuntu
gmp package

Merge lp:~peter-pearse/ubuntu/natty/gmp/prop001 into lp:ubuntu/natty/gmp

  1. Natty (11.04)
  2. prop001
  3. Merge into natty
Proposed by Peter Pearse
Status: Merged
Merged at revision: 27
Proposed branch: lp:~peter-pearse/ubuntu/natty/gmp/prop001
Merge into: lp:ubuntu/natty/gmp
Diff against target: 37 lines (+9/-3)
2 files modified
debian/changelog (+6/-0)
debian/rules (+3/-3)
To merge this branch: bzr merge lp:~peter-pearse/ubuntu/natty/gmp/prop001
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+51734@code.launchpad.net

Description of the change

Strip spaces from the GNU_TYPES otherwise later debhelper utilities get confused.
Pass --target for cross builds.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

Rather than calling $(strip), I think we might just remove the unnecessary whitespace in debian/rules.

Also, we can simply do without this $(subst) at all, it's completely unnecessary on Debian or Ubuntu for the past 4 years or so. Fixed up and merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-02-25 07:07:18 +0000
3+++ debian/changelog 2011-03-01 11:51:59 +0000
4@@ -1,3 +1,9 @@
5+gmp (2:4.3.2+dfsg-1ubuntu2) natty; urgency=low
6+
7+ * For cross builds, strip GNU_TYPES & pass --target
8+
9+ -- Peter Pearse <peter.pearse@linaro.org> Tue, 01 Mar 2011 11:47:29 +0000
10+
11 gmp (2:4.3.2+dfsg-1ubuntu1) lucid; urgency=low
12
13 * Support for thumb2 instructions in arm assembler (LP: #51372)
14
15=== modified file 'debian/rules'
16--- debian/rules 2010-02-25 07:07:18 +0000
17+++ debian/rules 2011-03-01 11:51:59 +0000
18@@ -16,8 +16,8 @@
19 endif
20
21 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
22-export DEB_HOST_GNU_TYPE := $(subst i386,i486, $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE))
23-export DEB_BUILD_GNU_TYPE := $(subst i386,i486, $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE))
24+export DEB_HOST_GNU_TYPE := $(strip $(subst i386,i486, $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)))
25+export DEB_BUILD_GNU_TYPE := $(strip $(subst i386,i486, $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)))
26
27 MAKE_CHECK = : disabled make check
28 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
29@@ -52,7 +52,7 @@
30 confflags_build += --build $(DEB_BUILD_GNU_TYPE)
31 else
32 AR = $(DEB_HOST_GNU_TYPE)-ar
33- confflags_build += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
34+ confflags_build += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) --target $(DEB_HOST_GNU_TYPE)
35 endif
36
37 ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 ppc64 kfreebsd-amd64))

Subscribers

People subscribed via source and target branches

to all changes: