[csw-devel] SF.net SVN: gar:[7632] csw/mgar/pkg/coreutils/trunk

[bdwalton at users.sourceforge.net]

Revision: 7632
          http://gar.svn.sourceforge.net/gar/?rev=7632&view=rev
Author:   bdwalton
Date:     2009-12-16 01:41:04 +0000 (Wed, 16 Dec 2009)

Log Message:
-----------
coreutils: remove patch that is no longer required; correct post-install for gsu

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

Removed Paths:
-------------
    csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch

Modified: csw/mgar/pkg/coreutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/coreutils/trunk/Makefile	2009-12-15 17:05:57 UTC (rev 7631)
+++ csw/mgar/pkg/coreutils/trunk/Makefile	2009-12-16 01:41:04 UTC (rev 7632)
@@ -24,7 +24,6 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES = 0001-Fix-solaris-acl-support-breakage.patch
-PATCHFILES += 0002-Add-lintl-to-xalloc-die-LDADD-flags.patch
 
 PREREQUISITE_PKGS =  CSWautomake CSWautoconf CSWbison CSWggettext CSWgit
 PREREQUISITE_PKGS += CSWgperf CSWgzip CSWperl CSWrsync CSWgtar CSWbash
@@ -49,7 +48,7 @@
 post-install-modulated:
 	@echo Cleaning up install directory...
 	rm -rf $(DESTDIR)/$(libdir)
-	@echo Manually install gsu (so no root rights required)
+	@echo Manually install gsu \(so no root rights required\)
 	cp $(WORKSRC)/src/su $(DESTDIR)$(bindir)/gsu
 
 post-merge:

Deleted: csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch
===================================================================
--- csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch	2009-12-15 17:05:57 UTC (rev 7631)
+++ csw/mgar/pkg/coreutils/trunk/files/0002-Add-lintl-to-xalloc-die-LDADD-flags.patch	2009-12-16 01:41:04 UTC (rev 7632)
@@ -1,29 +0,0 @@
-From 686676e0661bab3d768b5b988e277f5907142e62 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at artsci.utoronto.ca>
-Date: Wed, 25 Nov 2009 05:08:58 +0100
-Subject: [PATCH 2/2] Add -lintl to xalloc-die LDADD flags
-
-This will allow the file to be linked properly during the gnulib-tests
-phase.
-
-Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
----
- gnulib-tests/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in
-index 427cccd..641201e 100644
---- a/gnulib-tests/Makefile.in
-+++ b/gnulib-tests/Makefile.in
-@@ -1185,7 +1185,7 @@ test_wcwidth_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
- 	libtests.a $(am__DEPENDENCIES_1)
- test_xalloc_die_SOURCES = test-xalloc-die.c
- test_xalloc_die_OBJECTS = test-xalloc-die.$(OBJEXT)
--test_xalloc_die_LDADD = $(LDADD)
-+test_xalloc_die_LDADD = $(LDADD) $(LIBINTL)
- test_xalloc_die_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
- 	libtests.a $(am__DEPENDENCIES_1)
- test_xfprintf_posix_SOURCES = test-xfprintf-posix.c
--- 
-1.6.5.1
-


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