[csw-devel] SF.net SVN: gar:[9654] csw/mgar/pkg/libast/trunk

[dmichelsen at users.sourceforge.net]

Revision: 9654
          http://gar.svn.sourceforge.net/gar/?rev=9654&view=rev
Author:   dmichelsen
Date:     2010-04-16 15:14:11 +0000 (Fri, 16 Apr 2010)

Log Message:
-----------
libast: Add more patches and CSW X11 binding

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

Added Paths:
-----------
    csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive-more.patch
    csw/mgar/pkg/libast/trunk/files/0002-Fix-check-for-C99.patch

Modified: csw/mgar/pkg/libast/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libast/trunk/Makefile	2010-04-16 13:52:48 UTC (rev 9653)
+++ csw/mgar/pkg/libast/trunk/Makefile	2010-04-16 15:14:11 UTC (rev 9654)
@@ -9,10 +9,16 @@
 MASTER_SITES = http://www.eterm.org/download/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES = 0001-Fix-unknown-Sun-Studio-directive.patch
+PATCHFILES += 0001-Fix-unknown-Sun-Studio-directive-more.patch
+PATCHFILES += 0002-Fix-check-for-C99.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+EXTRA_INC = $(prefix)/X11/include
+EXTRA_LIB = $(prefix)/X11/lib
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+
 STRIP_LIBTOOL = 1
 
 BUILD64 = 1

Modified: csw/mgar/pkg/libast/trunk/checksums
===================================================================
--- csw/mgar/pkg/libast/trunk/checksums	2010-04-16 13:52:48 UTC (rev 9653)
+++ csw/mgar/pkg/libast/trunk/checksums	2010-04-16 15:14:11 UTC (rev 9654)
@@ -1,2 +1,4 @@
+b73d6d2c26911ff3085b6dac28db3f5e  0001-Fix-unknown-Sun-Studio-directive-more.patch
 2460a809fdffec738719fa1d59b63705  0001-Fix-unknown-Sun-Studio-directive.patch
+4cbabcd7b09030530cd3311f713ee810  0002-Fix-check-for-C99.patch
 a9ec3b2da317f35869316e6d9571d296  libast-0.7.tar.gz

Added: csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive-more.patch
===================================================================
--- csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive-more.patch	                        (rev 0)
+++ csw/mgar/pkg/libast/trunk/files/0001-Fix-unknown-Sun-Studio-directive-more.patch	2010-04-16 15:14:11 UTC (rev 9654)
@@ -0,0 +1,33 @@
+From 71446a56d8771125fb546942728493fe4f2b3c01 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 16 Apr 2010 16:49:46 +0200
+Subject: [PATCH 1/2] Fix unknown Sun Studio directive more
+
+---
+ test/perf.c |    3 ++-
+ test/test.c |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/test/perf.c b/test/perf.c
+index f2a4174..bcb5588 100644
+--- a/test/perf.c
++++ b/test/perf.c
+@@ -21,13 +21,14 @@
+  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  */
+ 
++#include <libast.h>
++
+ static const char cvs_ident[] = "$Id: perf.c,v 1.13 2004/10/26 18:01:54 mej Exp $";
+ 
+ #if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
+ # include <config.h>
+ #endif
+ 
+-#include <libast.h>
+ #include "perf.h"
+ 
+ unsigned long tnum = 0;
+-- 
+1.7.0
+

Added: csw/mgar/pkg/libast/trunk/files/0002-Fix-check-for-C99.patch
===================================================================
--- csw/mgar/pkg/libast/trunk/files/0002-Fix-check-for-C99.patch	                        (rev 0)
+++ csw/mgar/pkg/libast/trunk/files/0002-Fix-check-for-C99.patch	2010-04-16 15:14:11 UTC (rev 9654)
@@ -0,0 +1,57 @@
+From 09a577da98246aa634b9b87ff21bb13b68d7fd82 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 16 Apr 2010 16:54:27 +0200
+Subject: [PATCH 2/2] Fix check for C99
+
+---
+ configure    |    4 ++--
+ configure.in |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 7e35ca3..b649ab9 100755
+--- a/configure
++++ b/configure
+@@ -24270,7 +24270,7 @@ if test "${with_pedantry+set}" = set; then
+   withval="$with_pedantry"
+ 
+         if test "$withval" != "no"; then
+-            CFLAGS="$CFLAGS -Wall -Werror -std=c99"
++            CFLAGS="$CFLAGS -xc99"
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define STRICT_ISO_C99 1
+@@ -24297,7 +24297,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+                int main () {
+-                   int a = 0, b = 0;
++                   signed char a = 0, b = 0;
+                    (long) a = (long) b;
+                    return 0;
+                }
+diff --git a/configure.in b/configure.in
+index cc50226..e9cc017 100644
+--- a/configure.in
++++ b/configure.in
+@@ -71,7 +71,7 @@ AC_ARG_WITH(pedantry,
+     [  --with-pedantry         add -Werror -std=c99 -pedantic to CFLAGS],
+     [
+         if test "$withval" != "no"; then
+-            CFLAGS="$CFLAGS -Wall -Werror -std=c99"
++            CFLAGS="$CFLAGS -xc99"
+             AC_DEFINE(STRICT_ISO_C99, 1, [Defined if strict ISO C99 (9899:1999) is requested or required.])
+         fi
+     ]
+@@ -80,7 +80,7 @@ AC_ARG_WITH(pedantry,
+ AC_MSG_CHECKING(if STRICT_ISO_C99 required)
+ AC_TRY_RUN([
+                int main () {
+-                   int a = 0, b = 0;
++                   signed char a = 0, b = 0;
+                    (long) a = (long) b;
+                    return 0;
+                }
+-- 
+1.7.0
+


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