r43839 - in /packages/gmp/trunk/debian: changelog orig-source.patch patches/s390x.patch patches/series rules
smr at users.alioth.debian.org
smr at users.alioth.debian.org
Tue Aug 30 01:52:16 UTC 2011
Author: smr
Date: Tue Aug 30 01:52:15 2011
New Revision: 43839
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43839
Log:
Fix to enable build on s390x.
Added:
packages/gmp/trunk/debian/orig-source.patch
packages/gmp/trunk/debian/patches/s390x.patch
Modified:
packages/gmp/trunk/debian/changelog
packages/gmp/trunk/debian/patches/series
packages/gmp/trunk/debian/rules
Modified: packages/gmp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/changelog?rev=43839&op=diff
==============================================================================
--- packages/gmp/trunk/debian/changelog (original)
+++ packages/gmp/trunk/debian/changelog Tue Aug 30 01:52:15 2011
@@ -2,9 +2,14 @@
* New upstream version. Closes: #627012.
- * rules: Empty dependency_libs. Closes: #633312,
-
- -- Steve M. Robbins <smr at debian.org> Mon, 29 Aug 2011 20:02:49 -0500
+ * rules: Empty dependency_libs. Closes: #633312.
+
+ * orig-source.patch: New.
+ * patches/s390x.patch: New.
+ * rules: Patches to enable building on s390x (thanks, Andreas Krebbel).
+ Closes: #635461.
+
+ -- Steve M. Robbins <smr at debian.org> Mon, 29 Aug 2011 20:51:09 -0500
gmp (2:5.0.1+dfsg-7) unstable; urgency=low
Added: packages/gmp/trunk/debian/orig-source.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/orig-source.patch?rev=43839&op=file
==============================================================================
--- packages/gmp/trunk/debian/orig-source.patch (added)
+++ packages/gmp/trunk/debian/orig-source.patch Tue Aug 30 01:52:15 2011
@@ -1,0 +1,26 @@
+Configure fix for s390x, thanks to
+Andreas Krebbel and Philipp Kern.
+
+This patch is applied in get-orig-source
+rule, prior to building the .orig.tar.gz file.
+
+
+
+--- gmp-5.0.1+dfsg.orig/configure.in
++++ gmp-5.0.1+dfsg/configure.in
+@@ -1095,8 +1095,13 @@
+ ;;
+
+
+- # IBM s/370 and similar
+- [s3[6-9]0*-*-*])
++ # IBM S/390 64 bit
++ s390x-*-*)
++ gcc_cflags="-g -O2 $fomit_frame_pointer"
++ path="s390x"
++ ;;
++ # IBM S/390 32 bit
++ s390-*-*)
+ gcc_cflags="$gcc_cflags $fomit_frame_pointer"
+ path="s390"
+ extra_functions="udiv_w_sdiv"
Added: packages/gmp/trunk/debian/patches/s390x.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/patches/s390x.patch?rev=43839&op=file
==============================================================================
--- packages/gmp/trunk/debian/patches/s390x.patch (added)
+++ packages/gmp/trunk/debian/patches/s390x.patch Tue Aug 30 01:52:15 2011
@@ -1,0 +1,59 @@
+Description: Enable build on s390x
+ Note that this is only part of the fix. We also patch configure.in
+ prior to running autoreconf and generating the .orig.tar.gz tarball.
+ See debian/rules and orig-source.patch.
+Author: Philipp Kern <pkern at debian.org>
+Bug: 635461 Forwarded: no
+
+
+--- gmp-5.0.1+dfsg.orig/mpn/s390x/gmp-mparam.h
++++ gmp-5.0.1+dfsg/mpn/s390x/gmp-mparam.h
+@@ -0,0 +1,28 @@
++/* IBM S/390 64 bit gmp-mparam.h -- Compiler/machine parameter header file.
++
++Copyright (C) 2009 Free Software Foundation, Inc.
++
++This file is part of the GNU MP Library.
++
++The GNU MP Library is free software; you can redistribute it and/or modify
++it under the terms of the GNU Library General Public License as published by
++the Free Software Foundation; either version 2 of the License, or (at your
++option) any later version.
++
++The GNU MP Library is distributed in the hope that it will be useful, but
++WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
++License for more details.
++
++You should have received a copy of the GNU Library General Public License
++along with the GNU MP Library; see the file COPYING.LIB. If not, write to
++the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
++MA 02111-1307, USA. */
++
++#define BITS_PER_MP_LIMB 64
++#define BYTES_PER_MP_LIMB 8
++
++#define BITS_PER_LONGINT 64
++#define BITS_PER_INT 32
++#define BITS_PER_SHORTINT 16
++#define BITS_PER_CHAR 8
+only in patch2:
+unchanged:
+--- gmp-5.0.1+dfsg.orig/mpn/s390/gmp-mparam.h
++++ gmp-5.0.1+dfsg/mpn/s390/gmp-mparam.h
+@@ -17,9 +17,13 @@
+ You should have received a copy of the GNU Lesser General Public License
+ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
+
++#define BITS_PER_MP_LIMB 32
++#define BYTES_PER_MP_LIMB 4
+
+-/* GMP_LIMB_BITS etc generated by configure */
+-
++#define BITS_PER_LONGINT 32
++#define BITS_PER_INT 32
++#define BITS_PER_SHORTINT 16
++#define BITS_PER_CHAR 8
+
+ /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */
+
Modified: packages/gmp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/patches/series?rev=43839&op=diff
==============================================================================
--- packages/gmp/trunk/debian/patches/series (original)
+++ packages/gmp/trunk/debian/patches/series Tue Aug 30 01:52:15 2011
@@ -1,1 +1,1 @@
-# No patches at present
+s390x.patch
Modified: packages/gmp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/rules?rev=43839&op=diff
==============================================================================
--- packages/gmp/trunk/debian/rules (original)
+++ packages/gmp/trunk/debian/rules Tue Aug 30 01:52:15 2011
@@ -94,6 +94,7 @@
mkdir gmp-$(ORIG_SRC_VERSION)+dfsg/doc
touch gmp-$(ORIG_SRC_VERSION)+dfsg/doc/Makefile.am
touch gmp-$(ORIG_SRC_VERSION)+dfsg/doc/Makefile.in
+ cd gmp-$(ORIG_SRC_VERSION)+dfsg/ && patch -p1 < ../debian/orig-source.patch
cd gmp-$(ORIG_SRC_VERSION)+dfsg/ && autoreconf --force --install
tar czf gmp_$(ORIG_SRC_VERSION)+dfsg.orig.tar.gz gmp-$(ORIG_SRC_VERSION)+dfsg
tar czf gmp-doc_$(ORIG_SRC_VERSION).orig.tar.gz gmp-doc-$(ORIG_SRC_VERSION)
@@ -130,19 +131,19 @@
touch $@
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: configure
dh_testdir
$(MAKE) $(JOBSFLAG) -C build
$(MAKE_CHECK) -C build
touch $@
-build32-stamp: configure32-stamp
+build32-stamp: configure32
dh_testdir
$(MAKE) $(JOBSFLAG) -C build32
$(MAKE_CHECK) -C build32
touch $@
-build64-stamp: configure64-stamp
+build64-stamp: configure64
dh_testdir
$(MAKE) $(JOBSFLAG) -C build64
$(MAKE_CHECK) -C build64
More information about the debian-science-commits
mailing list