[csw-devel] SF.net SVN: gar:[19905] csw/mgar/pkg/google-gflags/trunk

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Tue Dec 18 02:19:37 CET 2012


Revision: 19905
          http://gar.svn.sourceforge.net/gar/?rev=19905&view=rev
Author:   wahwah
Date:     2012-12-18 01:19:37 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
google-gflags/trunk: update to 2.0 - it doesn't build, I'm suspecting gcc vs assembler issues

Modified Paths:
--------------
    csw/mgar/pkg/google-gflags/trunk/Makefile
    csw/mgar/pkg/google-gflags/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/google-gflags/trunk/files/0000-Disable-a-test-that-doesn-t-work-on-Solaris.patch
    csw/mgar/pkg/google-gflags/trunk/files/0001-Disable-the-same-test-again-inf-this-time.patch
    csw/mgar/pkg/google-gflags/trunk/files/0002-One-more-test.patch

Modified: csw/mgar/pkg/google-gflags/trunk/Makefile
===================================================================
--- csw/mgar/pkg/google-gflags/trunk/Makefile	2012-12-17 23:57:55 UTC (rev 19904)
+++ csw/mgar/pkg/google-gflags/trunk/Makefile	2012-12-18 01:19:37 UTC (rev 19905)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = gflags
-VERSION = 1.3
+VERSION = 2.0
 GARTYPE = v2
 DESCRIPTION = a library that implements commandline flags processing
 define BLURB
@@ -14,11 +14,17 @@
 endef
 SPKG_SOURCEURL = http://code.google.com/p/google-gflags/
 MASTER_SITES = $(GOOGLE_MIRROR)
-GOOGLE_PROJECT = google-gflags
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 CONFIGURE_ARGS = $(DIRPATHS)
+
 BUILD64 = 1
+
+GARCOMPILER = GNU
+PATCHFILES += 0000-Disable-a-test-that-doesn-t-work-on-Solaris.patch
+PATCHFILES += 0001-Disable-the-same-test-again-inf-this-time.patch
+PATCHFILES += 0002-One-more-test.patch
+
 MERGE_DIRS_isa-sparcv9 = $(libdir)
 MERGE_DIRS_isa-amd64   = $(libdir)
+
 include gar/category.mk

Modified: csw/mgar/pkg/google-gflags/trunk/checksums
===================================================================
--- csw/mgar/pkg/google-gflags/trunk/checksums	2012-12-17 23:57:55 UTC (rev 19904)
+++ csw/mgar/pkg/google-gflags/trunk/checksums	2012-12-18 01:19:37 UTC (rev 19905)
@@ -1 +1 @@
-6da3d3b9cd82c222b521ae686b6cfa8b  gflags-1.3.tar.gz
+e02268c1e90876c809ec0ffa095da864  gflags-2.0.tar.gz

Added: csw/mgar/pkg/google-gflags/trunk/files/0000-Disable-a-test-that-doesn-t-work-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/google-gflags/trunk/files/0000-Disable-a-test-that-doesn-t-work-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/google-gflags/trunk/files/0000-Disable-a-test-that-doesn-t-work-on-Solaris.patch	2012-12-18 01:19:37 UTC (rev 19905)
@@ -0,0 +1,24 @@
+From e786aa2d94cda7f9a544af52a5ac3e7afe10eda1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej at opencsw.org>
+Date: Mon, 17 Dec 2012 23:36:09 +0000
+Subject: [PATCH] Disable a test that doesn't work on Solaris
+
+---
+ src/gflags_unittest.cc      |   2 +-
+
+diff --git a/src/gflags_unittest.cc b/src/gflags_unittest.cc
+index 08abc1b..7487f51 100644
+--- a/src/gflags_unittest.cc
++++ b/src/gflags_unittest.cc
+@@ -549,7 +549,7 @@ TEST(SetFlagValueTest, OrdinaryValues) {
+ //    http://www.mail-archive.com/bug-gnulib@gnu.org/msg09573.html
+ // This url says FreeBSD also has a problem, but I didn't see that.
+ TEST(SetFlagValueTest, ExceptionalValues) {
+-#if defined(isinf) && !defined(__MINGW32__)
++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__)
+   EXPECT_EQ("test_double set to inf\n",
+             SetCommandLineOption("test_double", "inf"));
+   EXPECT_INF(FLAGS_test_double);
+-- 
+1.8.0
+

Added: csw/mgar/pkg/google-gflags/trunk/files/0001-Disable-the-same-test-again-inf-this-time.patch
===================================================================
--- csw/mgar/pkg/google-gflags/trunk/files/0001-Disable-the-same-test-again-inf-this-time.patch	                        (rev 0)
+++ csw/mgar/pkg/google-gflags/trunk/files/0001-Disable-the-same-test-again-inf-this-time.patch	2012-12-18 01:19:37 UTC (rev 19905)
@@ -0,0 +1,55 @@
+From 16d6c142a23f40580f2f6c467190db2d24276879 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej at opencsw.org>
+Date: Mon, 17 Dec 2012 23:49:21 +0000
+Subject: [PATCH] Disable the same test again (-inf this time)
+
+---
+ libtool                     | 122 ++++++++++++++++++++++----------------------
+ src/gflags/gflags_declare.h |   2 +-
+ src/gflags_unittest-main.cc |   2 +-
+ src/gflags_unittest.cc      |   2 +-
+ src/gflags_unittest_main.cc |   2 +-
+ 5 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/src/gflags_unittest-main.cc b/src/gflags_unittest-main.cc
+index 08abc1b..7487f51 100644
+--- a/src/gflags_unittest-main.cc
++++ b/src/gflags_unittest-main.cc
+@@ -549,7 +549,7 @@ TEST(SetFlagValueTest, OrdinaryValues) {
+ //    http://www.mail-archive.com/bug-gnulib@gnu.org/msg09573.html
+ // This url says FreeBSD also has a problem, but I didn't see that.
+ TEST(SetFlagValueTest, ExceptionalValues) {
+-#if defined(isinf) && !defined(__MINGW32__)
++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__)
+   EXPECT_EQ("test_double set to inf\n",
+             SetCommandLineOption("test_double", "inf"));
+   EXPECT_INF(FLAGS_test_double);
+diff --git a/src/gflags_unittest.cc b/src/gflags_unittest.cc
+index 7487f51..d58b6e9 100644
+--- a/src/gflags_unittest.cc
++++ b/src/gflags_unittest.cc
+@@ -566,7 +566,7 @@ TEST(SetFlagValueTest, ExceptionalValues) {
+             SetCommandLineOption("test_double", " "));
+   EXPECT_EQ("",
+             SetCommandLineOption("test_double", ""));
+-#if defined(isinf) && !defined(__MINGW32__)
++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__)
+   EXPECT_EQ("test_double set to -inf\n",
+             SetCommandLineOption("test_double", "-inf"));
+   EXPECT_INF(FLAGS_test_double);
+diff --git a/src/gflags_unittest_main.cc b/src/gflags_unittest_main.cc
+index 08abc1b..7487f51 100644
+--- a/src/gflags_unittest_main.cc
++++ b/src/gflags_unittest_main.cc
+@@ -549,7 +549,7 @@ TEST(SetFlagValueTest, OrdinaryValues) {
+ //    http://www.mail-archive.com/bug-gnulib@gnu.org/msg09573.html
+ // This url says FreeBSD also has a problem, but I didn't see that.
+ TEST(SetFlagValueTest, ExceptionalValues) {
+-#if defined(isinf) && !defined(__MINGW32__)
++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__)
+   EXPECT_EQ("test_double set to inf\n",
+             SetCommandLineOption("test_double", "inf"));
+   EXPECT_INF(FLAGS_test_double);
+-- 
+1.8.0
+

Added: csw/mgar/pkg/google-gflags/trunk/files/0002-One-more-test.patch
===================================================================
--- csw/mgar/pkg/google-gflags/trunk/files/0002-One-more-test.patch	                        (rev 0)
+++ csw/mgar/pkg/google-gflags/trunk/files/0002-One-more-test.patch	2012-12-18 01:19:37 UTC (rev 19905)
@@ -0,0 +1,39 @@
+From 89f07763dba7152645632b5d0b7c9036d96b81ea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej at opencsw.org>
+Date: Mon, 17 Dec 2012 23:58:03 +0000
+Subject: [PATCH] One more test.
+
+---
+ src/gflags_unittest-main.cc | 2 +-
+ src/gflags_unittest.cc      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gflags_unittest-main.cc b/src/gflags_unittest-main.cc
+index 7487f51..d58b6e9 100644
+--- a/src/gflags_unittest-main.cc
++++ b/src/gflags_unittest-main.cc
+@@ -566,7 +566,7 @@ TEST(SetFlagValueTest, ExceptionalValues) {
+             SetCommandLineOption("test_double", " "));
+   EXPECT_EQ("",
+             SetCommandLineOption("test_double", ""));
+-#if defined(isinf) && !defined(__MINGW32__)
++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__)
+   EXPECT_EQ("test_double set to -inf\n",
+             SetCommandLineOption("test_double", "-inf"));
+   EXPECT_INF(FLAGS_test_double);
+diff --git a/src/gflags_unittest.cc b/src/gflags_unittest.cc
+index d58b6e9..daf435b 100644
+--- a/src/gflags_unittest.cc
++++ b/src/gflags_unittest.cc
+@@ -573,7 +573,7 @@ TEST(SetFlagValueTest, ExceptionalValues) {
+   EXPECT_GT(0, FLAGS_test_double);
+ #endif
+ 
+-#if defined(isnan) && !defined(__MINGW32__)
++#if defined(isinf) && !defined(__MINGW32__) && !defined(__sun__)
+   EXPECT_EQ("test_double set to nan\n",
+             SetCommandLineOption("test_double", "NaN"));
+   EXPECT_NAN(FLAGS_test_double);
+-- 
+1.8.0
+

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



More information about the devel mailing list