Package: libffi Version: 3.0.5-2 Severity: serious Tags: patch Both mips64 (biarch64) and mipsn32 (biarchn32) builds are configure with --host=mips64-linux-gnu so headers from debian/libffi-dev/usr/include/$(biarch_gnu_type) are trying to be moved two times, in debian/lib64ffi-dev/usr/include and debian/libn32ffi-dev/usr/include/ which fails. There is also a small typo (s/32n/n32/), this patch fixes the problems.
From 1468a32948c2a04d016b7f4cd0f9c9b9998a7fc9 Mon Sep 17 00:00:00 2001
From: Arthur Loiret <arthur@mips.aurel32.net>
Date: Sat, 17 May 2008 13:37:19 +0000
Subject: [PATCH] Fix build failure on mips{,el}/triarch due to new multiarch directories.
---
debian/changelog | 7 +++++++
debian/rules | 7 ++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 174fdac..c578def 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libffi (3.0.5-3) unstable; urgency=low
+
+ [ Arthur Loiret ]
+ * Fix build failure on mips{,el}/triarch due to new multiarch directories.
+
+ -- Matthias Klose <doko@debian.org> Sat, 17 May 2008 13:35:12 +0000
+
libffi (3.0.5-2) unstable; urgency=low
* Install header files in multiarch directories. Closes: #480208.
diff --git a/debian/rules b/debian/rules
index 3f78b6c..3ea18da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -203,10 +203,15 @@ ifneq (,$(filter biarch64, $(multiarch)))
debian/lib64ffi-dev/usr/include/
endif
ifneq (,$(filter biarchn32, $(multiarch)))
- mkdir -p debian/lib32nffi-dev/usr/include/$(biarch_gnu_type)
+ mkdir -p debian/libn32ffi-dev/usr/include/$(biarch_gnu_type)
+ifneq (,$(filter biarch64, $(multiarch)))
+ cp -r debian/lib64ffi-dev/usr/include/$(biarch_gnu_type) \
+ debian/libn32ffi-dev/usr/include/
+else
mv debian/libffi-dev/usr/include/$(biarch_gnu_type) \
debian/libn32ffi-dev/usr/include/
endif
+endif
ifneq (,$(filter biarch32, $(multiarch)))
ifeq ($(DEB_HOST_ARCH),amd64)
--
1.5.5.1
Attachment:
signature.asc
Description: Digital signature