ccc fixes

6 files changed, 104 insertions, 13 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index 0a76233c66dc..5461f14d6e95 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.39 2003/05/07 22:45:41 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.40 2003/05/24 18:29:59 taviso Exp $
+
+  24 May 2003; Tavis Ormandy <taviso@gentoo.org> libxml2-2.5.4.ebuild,
+  libxml2-2.5.7.ebuild, files/libxml2-2.5.4-dec-alpha-compiler.diff,
+  files/libxml2-2.5.7-dec-alpha-compiler.diff:
+  ccc fixes, author assumes ccc == tru64
 
   08 May 2003; Christian Birchinger <joker@gentoo.org> libxml2-2.5.6.ebuild:
   Added stable sparc keyword
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index eb809c7eceda..b543a5c8efd8 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,12 +1,14 @@
-MD5 f5203b85492a2a5ce03f2da9147c9539 ChangeLog 4870
-MD5 e1925e4f28e8545b4569ce90d9f3c2d1 libxml2-2.5.7.ebuild 1430
-MD5 6bdab410dba3b0014cd180dc88be5785 libxml2-2.4.30.ebuild 1475
+MD5 965b11ef27867137db1063db42e21da2 libxml2-2.5.7.ebuild 1685
 MD5 6df59c99c938420129eef2dcc98f8105 libxml2-2.5.2.ebuild 1419
-MD5 7b61f4d83f5d371e36cbdfac5ba1e839 libxml2-2.5.6.ebuild 1429
-MD5 dc05b7a430081f801e0fd95e20dc2203 libxml2-2.5.4.ebuild 1426
-MD5 421cf0ab43b03457dc6825a0bc6bc6ad files/Makefile-py.patch 778
-MD5 46b436e9d358547dbee7e9101d5eed45 files/digest-libxml2-2.5.7 67
+MD5 f43c38ef4a82749f8b58933d0eb1482e libxml2-2.5.4.ebuild 1684
+MD5 3c313484e8e5f57d677d123dce8c10f4 libxml2-2.5.6.ebuild 1426
+MD5 6bdab410dba3b0014cd180dc88be5785 libxml2-2.4.30.ebuild 1475
+MD5 90f569309cd79c780b1ebafc40bc0ef1 ChangeLog 5098
 MD5 b801216abd319718b49a660f0b272264 files/digest-libxml2-2.5.2 67
 MD5 49743757cf83cdff77f25886c42592e2 files/digest-libxml2-2.5.4 67
-MD5 49e8e12f736e50285cf5cb086dec88d3 files/parser.c.diff 455
 MD5 f6fb445d11c7e880836c8dda60649bcb files/digest-libxml2-2.5.6 67
+MD5 46b436e9d358547dbee7e9101d5eed45 files/digest-libxml2-2.5.7 67
+MD5 eb759e6bb67654c71d0d53cb8a1c6633 files/libxml2-2.5.4-dec-alpha-compiler.diff 1283
+MD5 eb759e6bb67654c71d0d53cb8a1c6633 files/libxml2-2.5.7-dec-alpha-compiler.diff 1283
+MD5 49e8e12f736e50285cf5cb086dec88d3 files/parser.c.diff 455
+MD5 421cf0ab43b03457dc6825a0bc6bc6ad files/Makefile-py.patch 778
diff --git a/dev-libs/libxml2/files/libxml2-2.5.4-dec-alpha-compiler.diff b/dev-libs/libxml2/files/libxml2-2.5.4-dec-alpha-compiler.diff
new file mode 100644
index 000000000000..59516fd16f7c
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.5.4-dec-alpha-compiler.diff
@@ -0,0 +1,35 @@
+--- libxml2-2.5.7.orig/triodef.h	2003-04-03 16:28:28.000000000 +0100
++++ libxml2-2.5.7/triodef.h	2003-05-24 18:53:53.000000000 +0100
+@@ -21,7 +21,7 @@
+ /*************************************************************************
+  * Platform and compiler support detection
+  */
+-#if defined(__GNUC__)
++#if defined(__GNUC__) || defined(__DECC) || defined(__DECCXX)
+ # define TRIO_COMPILER_GCC
+ #elif defined(__SUNPRO_C)
+ # define TRIO_COMPILER_SUNPRO
+@@ -32,8 +32,6 @@
+ # define TRIO_COMPILER_XLC
+ #elif defined(_AIX) && !defined(__GNUC__)
+ # define TRIO_COMPILER_XLC /* Workaround for old xlc */
+-#elif defined(__DECC) || defined(__DECCXX)
+-# define TRIO_COMPILER_DECC
+ #elif defined(__osf__) && defined(__LANGUAGE_C__)
+ # define TRIO_COMPILER_DECC /* Workaround for old DEC C compilers */
+ #elif defined(_MSC_VER)
+--- libxml2-2.5.7.orig/trionan.c	2003-04-03 16:28:28.000000000 +0100
++++ libxml2-2.5.7/trionan.c	2003-05-24 18:35:01.000000000 +0100
+@@ -47,10 +47,10 @@
+ #include <string.h>
+ #include <limits.h>
+ #include <float.h>
+-#if defined(TRIO_PLATFORM_UNIX)
++#if defined(TRIO_PLATFORM_UNIX) || defined(__DECC)
+ # include <signal.h>
+ #endif
+-#if defined(TRIO_COMPILER_DECC)
++#if defined(TRIO_COMPILER_DECC) && ! defined(__DECC)
+ # include <fp_class.h>
+ #endif
+ #include <assert.h>
diff --git a/dev-libs/libxml2/files/libxml2-2.5.7-dec-alpha-compiler.diff b/dev-libs/libxml2/files/libxml2-2.5.7-dec-alpha-compiler.diff
new file mode 100644
index 000000000000..59516fd16f7c
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.5.7-dec-alpha-compiler.diff
@@ -0,0 +1,35 @@
+--- libxml2-2.5.7.orig/triodef.h	2003-04-03 16:28:28.000000000 +0100
++++ libxml2-2.5.7/triodef.h	2003-05-24 18:53:53.000000000 +0100
+@@ -21,7 +21,7 @@
+ /*************************************************************************
+  * Platform and compiler support detection
+  */
+-#if defined(__GNUC__)
++#if defined(__GNUC__) || defined(__DECC) || defined(__DECCXX)
+ # define TRIO_COMPILER_GCC
+ #elif defined(__SUNPRO_C)
+ # define TRIO_COMPILER_SUNPRO
+@@ -32,8 +32,6 @@
+ # define TRIO_COMPILER_XLC
+ #elif defined(_AIX) && !defined(__GNUC__)
+ # define TRIO_COMPILER_XLC /* Workaround for old xlc */
+-#elif defined(__DECC) || defined(__DECCXX)
+-# define TRIO_COMPILER_DECC
+ #elif defined(__osf__) && defined(__LANGUAGE_C__)
+ # define TRIO_COMPILER_DECC /* Workaround for old DEC C compilers */
+ #elif defined(_MSC_VER)
+--- libxml2-2.5.7.orig/trionan.c	2003-04-03 16:28:28.000000000 +0100
++++ libxml2-2.5.7/trionan.c	2003-05-24 18:35:01.000000000 +0100
+@@ -47,10 +47,10 @@
+ #include <string.h>
+ #include <limits.h>
+ #include <float.h>
+-#if defined(TRIO_PLATFORM_UNIX)
++#if defined(TRIO_PLATFORM_UNIX) || defined(__DECC)
+ # include <signal.h>
+ #endif
+-#if defined(TRIO_COMPILER_DECC)
++#if defined(TRIO_COMPILER_DECC) && ! defined(__DECC)
+ # include <fp_class.h>
+ #endif
+ #include <assert.h>
diff --git a/dev-libs/libxml2/libxml2-2.5.4.ebuild b/dev-libs/libxml2/libxml2-2.5.4.ebuild
index 0e83769c71f8..39f9ce077df2 100644
--- a/dev-libs/libxml2/libxml2-2.5.4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.5.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.5.4.ebuild,v 1.4 2003/03/19 19:26:52 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.5.4.ebuild,v 1.5 2003/05/24 18:29:59 taviso Exp $
 
-inherit eutils libtool gnome.org
+inherit eutils libtool gnome.org flag-o-matic
 
 IUSE="python readline"
 
@@ -23,6 +23,13 @@ src_compile() {
 	elibtoolize
 
 	local myconf=""
+	if [ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ]; then
+		# i think the author assumes __DECC is defined only on Tru64.
+		# quick fix in this patch. -taviso.
+		append-flags -ieee
+		epatch ${FILESDIR}/libxml2-${PV}-dec-alpha-compiler.diff
+    fi
+
 
 	# This breaks gnome2 (libgnomeprint for instance fails to compile with
 	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
diff --git a/dev-libs/libxml2/libxml2-2.5.7.ebuild b/dev-libs/libxml2/libxml2-2.5.7.ebuild
index 0dc6ab7f22bc..ebe1ebd4e664 100644
--- a/dev-libs/libxml2/libxml2-2.5.7.ebuild
+++ b/dev-libs/libxml2/libxml2-2.5.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.5.7.ebuild,v 1.1 2003/04/26 20:41:10 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.5.7.ebuild,v 1.2 2003/05/24 18:29:59 taviso Exp $
 
-inherit eutils libtool gnome.org
+inherit eutils libtool gnome.org flag-o-matic
 
 IUSE="python readline"
 
@@ -23,6 +23,13 @@ src_compile() {
 	elibtoolize
 
 	local myconf=""
+	
+	if [ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ]; then
+		# i think the author assumes __DECC is defined only on Tru64.
+		# quick fix in this patch. -taviso.
+		append-flags -ieee
+		epatch ${FILESDIR}/libxml2-${PV}-dec-alpha-compiler.diff
+	fi
 
 	# This breaks gnome2 (libgnomeprint for instance fails to compile with
 	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).