[csw-devel] SF.net SVN: gar:[15003] csw/mgar/pkg/gawk/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15003
          http://gar.svn.sourceforge.net/gar/?rev=15003&view=rev
Author:   dmichelsen
Date:     2011-07-07 21:02:50 +0000 (Thu, 07 Jul 2011)

Log Message:
-----------
gawk: More compile fixing

Modified Paths:
--------------
    csw/mgar/pkg/gawk/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch

Modified: csw/mgar/pkg/gawk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gawk/trunk/Makefile	2011-07-07 15:22:15 UTC (rev 15002)
+++ csw/mgar/pkg/gawk/trunk/Makefile	2011-07-07 21:02:50 UTC (rev 15003)
@@ -17,16 +17,15 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(DISTNAME).tar.xz
 
-PATCHFILES += 0001-Be-not-that-strict-on-standard.patch
-
 RUNTIME_DEP_PKGS_CSWgawk += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWgawk += CSWlibsigsegv2
 RUNTIME_DEP_PKGS_CSWgawk += CSWlibreadline6
 
 # Otherwise libsigsegv is not detected properly on Solaris 9 i386 as reported in
 #   http://lists.gnu.org/archive/html/bug-gnulib/2011-07/msg00008.html
-# Also needs the above patch.
-EXTRA_CFLAGS = -features=extensions
+# Additionally, there is probably a bug in /usr/include/ia32/sys/reg.h which requires
+# the replacement of uint64_t by upad64_t.
+EXTRA_CFLAGS = -Xc -D_XPG4_2 -Duint64_t=upad64_t
 
 # These are install instructions for other platforms (os/2... 'nuff said.)
 CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/share|root/opt/csw/share/info/gawk.info
@@ -35,7 +34,6 @@
 CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/info/gawk.info
 
 # This is an example path (YMMV in the docs)
-CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gawk.1
 CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/pgawk.1
 
 include gar/category.mk

Deleted: csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch
===================================================================
--- csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch	2011-07-07 15:22:15 UTC (rev 15002)
+++ csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch	2011-07-07 21:02:50 UTC (rev 15003)
@@ -1,25 +0,0 @@
-From 024f67d496160ea6fe8b60b67f4832fed04fd199 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 7 Jul 2011 17:14:06 +0200
-Subject: [PATCH] Be not that strict on standard
-
----
- awk.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/awk.h b/awk.h
-index 25abf41..5034a46 100644
---- a/awk.h
-+++ b/awk.h
-@@ -60,7 +60,7 @@
- #endif /* LOCALEDIR */
- #endif
- 
--#if !defined(__STDC__) || __STDC__ < 1
-+#if (!defined(__STDC__) || __STDC__ < 1) && !defined(__EXTENSIONS__)
- #error "gawk no longer supports non-C89 environments (no __STDC__ or __STDC__ < 1)"
- #endif
- 
--- 
-1.7.6
-


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