[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#474049: marked as done (Please support MIPS triarch.)



Your message dated Fri, 04 Apr 2008 22:03:40 +0000
with message-id <E1Jhu0a-0005oD-JJ@ries.debian.org>
and subject line Bug#474049: fixed in libffi 3.0.5-1
has caused the Debian Bug report #474049,
regarding Please support MIPS triarch.
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
474049: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=474049
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: libffi
Version: 3.0.4-2
Severity: wishlist
Tags: patch


This patch adds biarchn32 support, and adds mips/mipsel to biarch64 and
biarchn32 archs. Also Updates gcc-multilib Build-Depends for mips/mipsel.

Thanks,

Arthur.
From acbaf5d46eebb9cf5c172294e783660301a4fc2b Mon Sep 17 00:00:00 2001
From: Arthur Loiret <arthur.loiret@u-psud.fr>
Date: Thu, 3 Apr 2008 01:19:13 +0200
Subject: [PATCH] Support MIPS triarch.

---
 debian/control |   27 +++++++++++++++++++++--
 debian/rules   |   62 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 39ea093..2b49cb0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libffi
 Priority: extra
 Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
 Uploaders: Matthias Klose <doko@debian.org>
-Build-Depends: debhelper (>= 5), gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc kfreebsd-amd64], dejagnu, lsb-release, texinfo
+Build-Depends: debhelper (>= 5), gcc-multilib [amd64 i386 mips mipsel powerpc ppc64 s390 sparc kfreebsd-amd64], dejagnu, lsb-release, texinfo
 Standards-Version: 3.7.3
 Section: libs
 
@@ -32,7 +32,7 @@ Description: Foreign Function Interface library (development files, 32bit)
 
 Package: lib64ffi-dev
 Section: libdevel
-Architecture: i386 powerpc sparc s390
+Architecture: i386 mips mipsel powerpc sparc s390
 Depends: libffi-dev (= ${binary:Version}), lib64ffi5 (= ${binary:Version})
 Description: Foreign Function Interface library (development files, 64bit)
  This package contains the headers and static library files necessary for
@@ -42,6 +42,18 @@ Description: Foreign Function Interface library (development files, 64bit)
  allows code written in one language to call code written in another
  language.
 
+Package: libn32ffi-dev
+Section: libdevel
+Architecture: mips mipsel
+Depends: libffi-dev (= ${binary:Version}), libn32ffi5 (= ${binary:Version})
+Description: Foreign Function Interface library (development files, n32)
+ This package contains the headers and static library files necessary for
+ building programs which use libffi.
+ .
+ A foreign function interface is the popular name for the interface that
+ allows code written in one language to call code written in another
+ language.
+
 Package: libffi5
 Section: libs
 Architecture: any
@@ -62,13 +74,22 @@ Description: Foreign Function Interface library runtime (32bit)
 
 Package: lib64ffi5
 Section: libs
-Architecture: i386 powerpc sparc s390
+Architecture: i386 mips mipsel powerpc sparc s390
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Foreign Function Interface library runtime (64bit)
  A foreign function interface is the popular name for the interface that
  allows code written in one language to call code written in another
  language.
 
+Package: libn32ffi5
+Section: libs
+Architecture: mips mipsel
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Foreign Function Interface library runtime (n32)
+ A foreign function interface is the popular name for the interface that
+ allows code written in one language to call code written in another
+ language.
+
 Package: libffi5-dbg
 Section: libdevel
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 0aa443e..a60abe6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,16 +15,24 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
   with_check = yes
 endif
 
-ifneq (,$(filter $(DEB_HOST_ARCH), i386 powerpc s390 sparc))
+ifneq (,$(filter $(DEB_HOST_ARCH), i386 mips mipsel powerpc s390 sparc))
   multiarch += biarch64
+  m64 = -m64
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH), amd64 kfreebsd-amd64 ppc64))
   multiarch += biarch32
+  m32 = -m32
+endif
+
+ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
+  multiarch += biarchn32
+  m64  = -mabi=64
+  mn32 = -mabi=n32
 endif
 
 biarch_map := i486=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x \
-                x86_64=i486 powerpc64=powerpc
+                x86_64=i486 powerpc64=powerpc mips=mips64 mipsel=mips64el
 biarch_cpu := $(patsubst $(DEB_HOST_GNU_CPU)=%,%, \
                          $(filter $(DEB_HOST_GNU_CPU)=%,$(biarch_map)))
 biarch_gnu_type := $(subst $(DEB_HOST_GNU_CPU),$(biarch_cpu),$(DEB_HOST_GNU_TYPE))
@@ -57,7 +65,7 @@ stamp-configure-biarch32:
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		CC="gcc -m32" CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs $(LDFLAGS)"
+		CC="gcc $(m32)" CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs $(LDFLAGS)"
 	touch $@
 
 stamp-configure-biarch64:
@@ -70,7 +78,20 @@ stamp-configure-biarch64:
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		CC="gcc -m64" CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs $(LDFLAGS)"
+		CC="gcc $(m64)" CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs $(LDFLAGS)"
+	touch $@
+
+stamp-configure-biarchn32:
+	dh_testdir
+	rm -rf buildn32
+	mkdir -p buildn32
+	cd buildn32 && ../configure \
+		--host=$(biarch_gnu_type) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		CC="gcc $(mn32)" CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs $(LDFLAGS)"
 	touch $@
 
 build: stamp-build \
@@ -92,6 +113,11 @@ stamp-build-biarch64: stamp-configure-biarch64
 	$(MAKE) -C build64
 	touch $@
 
+stamp-build-biarchn32: stamp-configure-biarchn32
+	dh_testdir
+	$(MAKE) -C buildn32
+	touch $@
+
 check: stamp-check $(foreach a, $(multiarch), stamp-check-$(a))
 stamp-check: stamp-build
 	dh_testdir
@@ -101,17 +127,25 @@ stamp-check: stamp-build
 stamp-check-biarch32: stamp-build-biarch32
 	dh_testdir
 	mkdir -p build32/bin
-	echo '/usr/bin/gcc -m32 "$$@"' > build32/bin/gcc
+	echo '/usr/bin/gcc $(m32) "$$@"' > build32/bin/gcc
 	chmod 755 build32/bin/gcc
-	-PATH=$(CURDIR)/build32/bin:$$PATH $(MAKE) -C build32 check CC="gcc -m32" 2>&1 | tee build32/check.log
+	-PATH=$(CURDIR)/build32/bin:$$PATH $(MAKE) -C build32 check CC="gcc $(m32)" 2>&1 | tee build32/check.log
 	touch $@
 
 stamp-check-biarch64: stamp-build-biarch64
 	dh_testdir
 	mkdir -p build64/bin
-	echo '/usr/bin/gcc -m64 "$$@"' > build64/bin/gcc
+	echo '/usr/bin/gcc $(m64) "$$@"' > build64/bin/gcc
 	chmod 755 build64/bin/gcc
-	-PATH=$(CURDIR)/build64/bin:$$PATH $(MAKE) -C build64 check 2>&1 | tee build64/check.log
+	-PATH=$(CURDIR)/build64/bin:$$PATH $(MAKE) -C build64 check CC="gcc $(m64)" 2>&1 | tee build64/check.log
+	touch $@
+
+stamp-check-biarchn32: stamp-build-biarchn32
+	dh_testdir
+	mkdir -p buildn32/bin
+	echo '/usr/bin/gcc $(mn32) "$$@"' > buildn32/bin/gcc
+	chmod 755 buildn32/bin/gcc
+	-PATH=$(CURDIR)/buildn32/bin:$$PATH $(MAKE) -C buildn32 check CC="gcc $(mn32)" 2>&1 | tee buildn32/check.log
 	touch $@
 
 clean:
@@ -141,6 +175,11 @@ ifneq (,$(filter biarch64, $(multiarch)))
 	cp -p build64/.libs/libffi_convenience.a \
 		debian/tmp/usr/lib64/libffi_pic.a
 endif
+ifneq (,$(filter biarchn32, $(multiarch)))
+	$(MAKE) -C buildn32 DESTDIR=$(CURDIR)/debian/tmp libdir=/usr/lib32 install
+	cp -p buildn32/.libs/libffi_convenience.a \
+		debian/tmp/usr/lib32/libffi_pic.a
+endif
 	dh_install -s --sourcedir=debian/tmp
 
 ifneq (,$(filter biarch32, $(multiarch)))
@@ -190,6 +229,13 @@ ifneq (,$(filter biarch64, $(multiarch)))
 	cat build64/check.log >> debian/libffi-dev/usr/share/doc/libffi$(major)/test_results.txt
   endif
 endif
+ifneq (,$(filter biarchn32, $(multiarch)))
+	rm -rf debian/libn32ffi-dev/usr/share/doc/libn32ffi-dev
+	ln -s libffi-dev debian/libn32ffi-dev/usr/share/doc/libn32ffi-dev
+  ifeq ($(with_check),yes)
+	cat buildn32/check.log >> debian/libffi-dev/usr/share/doc/libffi$(major)/test_results.txt
+  endif
+endif
 	dh_strip -s --dbg-package=libffi$(major)-dbg
 	dh_compress -s
 	dh_fixperms -s
-- 
1.5.4.2

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message ---
Source: libffi
Source-Version: 3.0.5-1

We believe that the bug you reported is fixed in the latest version of
libffi, which is due to be installed in the Debian FTP archive:

lib64ffi-dev_3.0.5-1_i386.deb
  to pool/main/libf/libffi/lib64ffi-dev_3.0.5-1_i386.deb
lib64ffi5_3.0.5-1_i386.deb
  to pool/main/libf/libffi/lib64ffi5_3.0.5-1_i386.deb
libffi-dev_3.0.5-1_i386.deb
  to pool/main/libf/libffi/libffi-dev_3.0.5-1_i386.deb
libffi5-dbg_3.0.5-1_i386.deb
  to pool/main/libf/libffi/libffi5-dbg_3.0.5-1_i386.deb
libffi5_3.0.5-1_i386.deb
  to pool/main/libf/libffi/libffi5_3.0.5-1_i386.deb
libffi_3.0.5-1.diff.gz
  to pool/main/libf/libffi/libffi_3.0.5-1.diff.gz
libffi_3.0.5-1.dsc
  to pool/main/libf/libffi/libffi_3.0.5-1.dsc
libffi_3.0.5.orig.tar.gz
  to pool/main/libf/libffi/libffi_3.0.5.orig.tar.gz



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 474049@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Matthias Klose <doko@debian.org> (supplier of updated libffi package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Fri, 04 Apr 2008 21:20:12 +0000
Source: libffi
Binary: libffi-dev lib32ffi-dev lib64ffi-dev libn32ffi-dev libffi5 lib32ffi5 lib64ffi5 libn32ffi5 libffi5-dbg
Architecture: source i386
Version: 3.0.5-1
Distribution: unstable
Urgency: low
Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
Changed-By: Matthias Klose <doko@debian.org>
Description: 
 lib64ffi-dev - Foreign Function Interface library (development files, 64bit)
 lib64ffi5  - Foreign Function Interface library runtime (64bit)
 libffi-dev - Foreign Function Interface library (development files)
 libffi5    - Foreign Function Interface library runtime
 libffi5-dbg - Foreign Function Interface library runtime (debug symbols)
Closes: 474049
Changes: 
 libffi (3.0.5-1) unstable; urgency=low
 .
   * New upstream version.
   * Suport mips triarch (Arthur Loiret). Closes: #474049.
Files: 
 ded73f09a0924f9ec10268fbe7bd7ff8 829 libs extra libffi_3.0.5-1.dsc
 29544f542140da929221805e332407b9 720907 libs extra libffi_3.0.5.orig.tar.gz
 705f8bfe3d107006eddf2274fdf0d0fe 5845 libs extra libffi_3.0.5-1.diff.gz
 60ba0396144403255e4263b48f3ce02b 92036 libdevel extra libffi-dev_3.0.5-1_i386.deb
 35e62ee9cddb092ee95fafc7662ad333 39834 libdevel extra lib64ffi-dev_3.0.5-1_i386.deb
 753abb54dd0df7b9f50fb3ab7c56b928 17734 libs extra libffi5_3.0.5-1_i386.deb
 e7f9da7c4a66ad3b3326e078dd530843 21544 libs extra lib64ffi5_3.0.5-1_i386.deb
 35ebd282dc40a6028c5ada0bc0f96405 40680 libdevel extra libffi5-dbg_3.0.5-1_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFH9qN8StlRaw+TLJwRAr4PAJ4i1sNnpxN+1tgVRhBq6/Dt7c3zLACeOZlG
97VDXFQE6iBT1sXM3L1HQP8=
=HyRW
-----END PGP SIGNATURE-----



--- End Message ---

Reply to: