[csw-devel] SF.net SVN: gar:[12990] csw/mgar/pkg/coreutils/tags

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Tue Jan 18 02:36:34 CET 2011


Revision: 12990
          http://gar.svn.sourceforge.net/gar/?rev=12990&view=rev
Author:   bdwalton
Date:     2011-01-18 01:36:34 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
coreutils: tagging the 8.8,2011.01.14 relase

Added Paths:
-----------
    csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/
    csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/Makefile
    csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/checksums
    csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch

Removed Paths:
-------------
    csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/Makefile
    csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/checksums

Deleted: csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/Makefile
===================================================================
--- csw/mgar/pkg/coreutils/trunk/Makefile	2011-01-02 00:48:02 UTC (rev 12143)
+++ csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/Makefile	2011-01-18 01:36:34 UTC (rev 12990)
@@ -1,76 +0,0 @@
-NAME = coreutils
-VERSION = 8.7
-CATEGORIES = utils
-
-# seq has issues related to the handling of long double's with -O2.
-# this issue manifested on sol8 and sol9 x86 only.  sparc was unaffected
-# and sol10 x86 was fine too.
-# OPT_FLAGS_GCC = -O1 -pipe
-
-# building with gcc gets us extra tools (eg: stdbuf)
-GARCOMPILER = GCC4
-
-SHELL = /opt/csw/bin/bash
-
-BUILD_DEP_PKGS =  CSWautomake CSWautoconf CSWbison CSWggettext CSWgit
-BUILD_DEP_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash
-
-RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt CSWlibgmp
-
-INCOMPATIBLE_PKGS = CSWshutils CSWtextutils
-
-DESCRIPTION = GNU core utilities
-define BLURB
-The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which are expected to exist on every operating system.
-
-Previously these utilities were offered as three individual sets of GNU utilities, Fileutils, Shellutils, and Textutils. Those three have been combined into a single set of utilities called Coreutils.
-endef
-
-MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-
-# We define upstream file regex so we can be notifed of new upstream
-# software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-sysconfdir = /etc/opt/csw
-localstatedir = /var/opt/csw
-CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --program-prefix=g
-CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw
-CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw
-# handle su manually to avoid needing fakeroot or some such.  this is now
-# explicitly required as we modify both --enable-*install-program  lists
-CONFIGURE_ARGS += --enable-no-install-program=chcon,su
-CONFIGURE_ARGS += --enable-install-program=hostname,arch
-
-# required for eaccess and not picked up automatically.
-EXTRA_LDFLAGS = -lgen
-
-PROTOTYPE_FILTER  = awk '$$$$3 == "/opt/csw/bin/gsu" { $$$$4 = "4555" }; { print }'
-
-ifneq ($(VERSION), 8.6)
-TEST_TARGET = check
-else
-TEST_SCRIPTS =
-endif
-
-include gar/category.mk
-
-PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
-
-post-install-modulated:
-	@echo Cleaning up install directory...
-	rm -rf $(DESTDIR)/$(libdir)
-	@echo Manually install gsu \(so no root rights required\)
-	cp $(WORKSRC)/src/su $(DESTDIR)$(bindir)/gsu
-
-post-merge:
-	@(cd $(PKGROOT)$(prefix); \
-		mkdir gnu; cd gnu; \
-		for f in ../bin/g*; do \
-			echo Linking $$f; \
-			base=$$(basename $$f); \
-			gln -s $$f ./$${base/g/}; \
-		done )
-	@$(MAKECOOKIE)

Copied: csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/Makefile (from rev 12536, csw/mgar/pkg/coreutils/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/Makefile	                        (rev 0)
+++ csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/Makefile	2011-01-18 01:36:34 UTC (rev 12990)
@@ -0,0 +1,81 @@
+NAME = coreutils
+VERSION = 8.8
+CATEGORIES = utils
+
+# seq has issues related to the handling of long double's with -O2.
+# this issue manifested on sol8 and sol9 x86 only.  sparc was unaffected
+# and sol10 x86 was fine too.
+# OPT_FLAGS_GCC = -O1 -pipe
+
+# building with gcc gets us extra tools (eg: stdbuf)
+GARCOMPILER = GCC4
+
+SHELL = /opt/csw/bin/bash
+
+BUILD_DEP_PKGS =  CSWautomake CSWautoconf CSWbison CSWggettext CSWgit
+BUILD_DEP_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash
+
+RUNTIME_DEP_PKGS = CSWiconv CSWggettextrt CSWlibgmp
+
+INCOMPATIBLE_PKGS = CSWshutils CSWtextutils
+
+DESCRIPTION = GNU core utilities
+define BLURB
+The GNU Core Utilities are the basic file, shell and text manipulation utilities of the GNU operating system. These are the core utilities which are expected to exist on every operating system.
+
+Previously these utilities were offered as three individual sets of GNU utilities, Fileutils, Shellutils, and Textutils. Those three have been combined into a single set of utilities called Coreutils.
+endef
+
+MASTER_SITES = $(GNU_MIRROR)
+DISTFILES = $(NAME)-$(VERSION).tar.gz
+PATCHFILES += 0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch
+
+# We define upstream file regex so we can be notifed of new upstream
+# software release
+UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+
+sysconfdir = /etc/opt/csw
+localstatedir = /var/opt/csw
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --program-prefix=g
+CONFIGURE_ARGS += --with-libintl-prefix=/opt/csw
+CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw
+# handle su manually to avoid needing fakeroot or some such.  this is now
+# explicitly required as we modify both --enable-*install-program  lists
+CONFIGURE_ARGS += --enable-no-install-program=chcon,su
+CONFIGURE_ARGS += --enable-install-program=hostname,arch
+
+# required for eaccess and not picked up automatically.
+EXTRA_LDFLAGS = -lgen
+
+PROTOTYPE_FILTER  = awk '$$$$3 == "/opt/csw/bin/gsu" { $$$$4 = "4555" }; { print }'
+
+ifneq ($(VERSION), 8.8)
+TEST_TARGET = check
+else
+TEST_SCRIPTS =
+endif
+
+include gar/category.mk
+
+PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
+
+post-install-modulated:
+	@echo Cleaning up install directory...
+	rm -rf $(DESTDIR)/$(libdir)
+	@echo Manually install gsu \(so no root rights required\)
+	cp $(WORKSRC)/src/su $(DESTDIR)$(bindir)/gsu
+
+post-merge:
+	@(cd $(PKGROOT)$(prefix); \
+		mkdir gnu; cd gnu; \
+		for f in ../bin/g*; do \
+			echo Linking $$f; \
+			base=$$(basename $$f); \
+			gln -s $$f ./$${base/g/}; \
+		done )
+	@(cd $(PKGROOT)$(datadir)/info; \
+		perl -pi -e 's#/usr/local/bin/printf#/opt/csw/bin/gprintf#g;' \
+			 -e 's#/usr/local/bin/listusers#/my/bin/showusers#;' \
+			coreutils.info)
+	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/checksums
===================================================================
--- csw/mgar/pkg/coreutils/trunk/checksums	2011-01-02 00:48:02 UTC (rev 12143)
+++ csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/checksums	2011-01-18 01:36:34 UTC (rev 12990)
@@ -1 +0,0 @@
-3c1ae9531159447083ae8f25ae554b81  coreutils-8.7.tar.gz

Copied: csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/checksums (from rev 12148, csw/mgar/pkg/coreutils/trunk/checksums)
===================================================================
--- csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/checksums	                        (rev 0)
+++ csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/checksums	2011-01-18 01:36:34 UTC (rev 12990)
@@ -0,0 +1 @@
+bad596d9654e299eedea0eaf93f178fa  coreutils-8.8.tar.gz

Copied: csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch (from rev 12161, csw/mgar/pkg/coreutils/trunk/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch)
===================================================================
--- csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch	                        (rev 0)
+++ csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch	2011-01-18 01:36:34 UTC (rev 12990)
@@ -0,0 +1,89 @@
+From 2d06b90935278549839ffcc4c040cca2fe141dde Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sun, 2 Jan 2011 19:33:50 +0100
+Subject: [PATCH] Import a patch to prevent breakage on vasprintf gnulib test
+
+Solaris has a known breakage of some *printf function handling.
+This patch makes the test a skip instead of a fail so that it's
+a noted failure, but not a deal breaker for the build.
+
+It was gleaned from the larger commit that was added to upstream
+gnulib here:
+http://www.mail-archive.com/bug-gnulib@gnu.org/msg20851.html
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ gnulib-tests/test-vasprintf-posix.c |   15 +++++++++++++++
+ m4/printf.m4                        |   12 ++++++++----
+ 2 files changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/gnulib-tests/test-vasprintf-posix.c b/gnulib-tests/test-vasprintf-posix.c
+index ec908e3..17be838 100644
+--- a/gnulib-tests/test-vasprintf-posix.c
++++ b/gnulib-tests/test-vasprintf-posix.c
+@@ -3550,6 +3550,21 @@ test_function (int (*my_asprintf) (char **, const char *, ...))
+   }
+ 
+   {
++    char *result;
++    int retval =
++      my_asprintf (&result, "%.511f %d", 1.0, 99);
++    size_t i;
++    ASSERT (result != NULL);
++    ASSERT (result[0] == '1');
++    ASSERT (result[1] == '.');
++    for (i = 0; i < 511; i++)
++      ASSERT (result[2 + i] == '0');
++    ASSERT (strcmp (result + 2 + 511, " 99") == 0);
++    ASSERT (retval == strlen (result));
++    free (result);
++  }
++
++  {
+     char input[5000];
+     char *result;
+     int retval;
+diff --git a/m4/printf.m4 b/m4/printf.m4
+index 8cffa6a..6c8a7a4 100644
+--- a/m4/printf.m4
++++ b/m4/printf.m4
+@@ -1,4 +1,4 @@
+-# printf.m4 serial 41
++# printf.m4 serial 42
+ dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+@@ -890,8 +890,9 @@ changequote([,])dnl
+ dnl Test whether the *printf family of functions supports large precisions.
+ dnl On mingw, precisions larger than 512 are treated like 512, in integer,
+ dnl floating-point or pointer output. On Solaris 10/x86, precisions larger
+-dnl than 510 in floating-point output crash the program. On BeOS, precisions
+-dnl larger than 1044 crash the program.
++dnl than 510 in floating-point output crash the program. On Solaris 10/SPARC,
++dnl precisions larger than 510 in floating-point output yield wrong results.
++dnl On BeOS, precisions larger than 1044 crash the program.
+ dnl Result is gl_cv_func_printf_precision.
+ 
+ AC_DEFUN([gl_PRINTF_PRECISION],
+@@ -917,6 +918,9 @@ int main ()
+     result |= 1;
+   if (sprintf (buf, "%.4000f %d", 1.0, 33, 44) < 4000 + 5)
+     result |= 2;
++  if (sprintf (buf, "%.511f %d", 1.0, 33, 44) < 511 + 5
++      || buf[0] != '1')
++    result |= 4;
+   return result;
+ }]])],
+         [gl_cv_func_printf_precision=yes],
+@@ -1459,7 +1463,7 @@ dnl   Cygwin 1.5.25 (2008)           .  .  .  #  #  .  .  #  .  .  .  .  .  #  .
+ dnl   Cygwin 1.5.19 (2006)           #  .  .  #  #  #  .  #  .  #  .  #  #  #  .  .  .  .  .  .
+ dnl   Solaris 11 2010-11             .  .  #  #  #  .  .  #  .  .  .  #  .  .  .  .  .  .  .  .
+ dnl   Solaris 10                     .  .  #  #  #  .  .  #  .  .  .  #  #  .  .  .  .  .  .  .
+-dnl   Solaris 2.6 ... 9              #  .  #  #  #  #  .  #  .  .  .  #  .  .  .  .  #  .  .  .
++dnl   Solaris 2.6 ... 9              #  .  #  #  #  #  .  #  .  .  .  #  #  .  .  .  #  .  .  .
+ dnl   Solaris 2.5.1                  #  .  #  #  #  #  .  #  .  .  .  #  .  .  #  #  #  #  #  #
+ dnl   AIX 5.2, 7.1                   .  .  #  #  #  .  .  .  .  .  .  #  .  .  .  .  .  .  .  .
+ dnl   AIX 4.3.2, 5.1                 #  .  #  #  #  #  .  .  .  .  .  #  .  .  .  .  #  .  .  .
+-- 
+1.7.3.2
+


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