[csw-devel] SF.net SVN: gar:[8787] csw/mgar/pkg/xz/trunk

[dmichelsen at users.sourceforge.net]

Revision: 8787
          http://gar.svn.sourceforge.net/gar/?rev=8787&view=rev
Author:   dmichelsen
Date:     2010-02-24 14:21:56 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
xz: Disable broken assembler optimizations on amd64

Modified Paths:
--------------
    csw/mgar/pkg/xz/trunk/Makefile
    csw/mgar/pkg/xz/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch

Modified: csw/mgar/pkg/xz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xz/trunk/Makefile	2010-02-24 13:47:16 UTC (rev 8786)
+++ csw/mgar/pkg/xz/trunk/Makefile	2010-02-24 14:21:56 UTC (rev 8787)
@@ -12,6 +12,7 @@
 
 MASTER_SITES = http://tukaani.org/xz/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = 0001-Do-not-force-inclusion-of-stdint.h.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -31,7 +32,12 @@
 
 BUILD64 = 1
 NOISAEXEC = 1
+
+# Assembler integration broken in amd64
+CONFIGURE_ARGS_isa-amd64 = --disable-assembler
+
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_isa-$(ISA))
 
 # Workaround for reported bug:
 #   <http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/3500014>

Modified: csw/mgar/pkg/xz/trunk/checksums
===================================================================
--- csw/mgar/pkg/xz/trunk/checksums	2010-02-24 13:47:16 UTC (rev 8786)
+++ csw/mgar/pkg/xz/trunk/checksums	2010-02-24 14:21:56 UTC (rev 8787)
@@ -1 +1,2 @@
+013b623b0f4f46adf992e44123cec1bc  0001-Do-not-force-inclusion-of-stdint.h.patch
 f2073579b6da2fe35d453adee1aaf1b2  xz-4.999.9beta.tar.gz

Added: csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch
===================================================================
--- csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch	                        (rev 0)
+++ csw/mgar/pkg/xz/trunk/files/0001-Do-not-force-inclusion-of-stdint.h.patch	2010-02-24 14:21:56 UTC (rev 8787)
@@ -0,0 +1,25 @@
+From 5424924f8c92878e914f5ec5c9bfd00915cf439a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 24 Feb 2010 14:58:17 +0100
+Subject: [PATCH] Do not force inclusion of stdint.h
+
+---
+ src/common/sysdefs.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/common/sysdefs.h b/src/common/sysdefs.h
+index fbc9176..f413863 100644
+--- a/src/common/sysdefs.h
++++ b/src/common/sysdefs.h
+@@ -34,7 +34,7 @@
+ // C99 says that inttypes.h always includes stdint.h, but some systems
+ // don't do that, and require including stdint.h separately.
+ #ifdef HAVE_STDINT_H
+-#	include <stdint.h>
++/* #	include <stdint.h> */
+ #endif
+ 
+ // Some pre-C99 systems have SIZE_MAX in limits.h instead of stdint.h. The
+-- 
+1.6.6
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.