[Glibc-bsd-commits] r5637 - in trunk/ctfutils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-15 09:31:06 +0000 (Wed, 15 Oct 2014)
New Revision: 5637

Added:
   trunk/ctfutils/debian/patches/mips64.diff
Modified:
   trunk/ctfutils/debian/changelog
   trunk/ctfutils/debian/patches/series
Log:
Integrate 9.2-5.1 NMU by YunQiang Su

Modified: trunk/ctfutils/debian/changelog
===================================================================
--- trunk/ctfutils/debian/changelog	2014-10-13 12:51:40 UTC (rev 5636)
+++ trunk/ctfutils/debian/changelog	2014-10-15 09:31:06 UTC (rev 5637)
@@ -1,3 +1,12 @@
+ctfutils (9.2-5.1) unstable; urgency=low
+  
+  * Non-maintainer upload.
+  [Sphinx Jiang]
+   * Fix mips64(el) build: __mips64 and __LP64__ instead of __mips64_n64
+     (Closes: #752059).
+
+ -- YunQiang Su <syq at debian.org>  Fri, 10 Oct 2014 13:24:07 +0800
+
 ctfutils (9.2-5) unstable; urgency=low
 
   * Add -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE to CFLAGS. Thanks

Added: trunk/ctfutils/debian/patches/mips64.diff
===================================================================
--- trunk/ctfutils/debian/patches/mips64.diff	                        (rev 0)
+++ trunk/ctfutils/debian/patches/mips64.diff	2014-10-15 09:31:06 UTC (rev 5637)
@@ -0,0 +1,13 @@
+Index: ctfutils-9.2/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
+===================================================================
+--- ctfutils-9.2.orig/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h	2014-10-10 05:32:02.870358340 +0000
++++ ctfutils-9.2/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h	2014-10-10 05:32:19.402358768 +0000
+@@ -403,7 +403,7 @@
+ #define	_INT_ALIGNMENT			4
+ #define	_FLOAT_ALIGNMENT		4
+ #define	_FLOAT_COMPLEX_ALIGNMENT	4
+-#if defined(__mips_n64)
++#if defined(__mips64) && defined(__LP64__)
+ #define	_LONG_ALIGNMENT			8
+ #define	_LONG_LONG_ALIGNMENT		8
+ #define	_DOUBLE_ALIGNMENT		8

Modified: trunk/ctfutils/debian/patches/series
===================================================================
--- trunk/ctfutils/debian/patches/series	2014-10-13 12:51:40 UTC (rev 5636)
+++ trunk/ctfutils/debian/patches/series	2014-10-15 09:31:06 UTC (rev 5637)
@@ -8,3 +8,4 @@
 
 # Patches that are likely to be Debian-specific
 makefile.diff
+mips64.diff