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

[dmichelsen at users.sourceforge.net]

Revision: 15002
          http://gar.svn.sourceforge.net/gar/?rev=15002&view=rev
Author:   dmichelsen
Date:     2011-07-07 15:22:15 +0000 (Thu, 07 Jul 2011)

Log Message:
-----------
gawk: Remove libsigsegv oddity

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

Added 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 11:33:28 UTC (rev 15001)
+++ csw/mgar/pkg/gawk/trunk/Makefile	2011-07-07 15:22:15 UTC (rev 15002)
@@ -17,12 +17,16 @@
 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
 
-# Coompilation requires setting of __STDC__ to at least 1
-EXTRA_CFLAGS = -Xc
+# 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
 
 # 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
@@ -34,10 +38,6 @@
 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
 
-# This is a detection problem, reported upstream.
-CHECKPKG_OVERRIDES_CSWgawk-i386 += surplus-dependency|CSWlibsigsegv2
-CHECKPKG_OVERRIDES_CSWgawk += $(CHECKPKG_OVERRIDES_CSWgawk-$(GARCH))
-
 include gar/category.mk
 
 post-install-modulated:

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch	2011-07-07 15:22:15 UTC (rev 15002)
@@ -0,0 +1,25 @@
+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.