[csw-devel] SF.net SVN: gar:[11047] csw/mgar/pkg/findutils/trunk

[gmarler at users.sourceforge.net]

Revision: 11047
          http://gar.svn.sourceforge.net/gar/?rev=11047&view=rev
Author:   gmarler
Date:     2010-09-24 03:59:56 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
Remove extra ISAs
Skip tests for the time being
add pre-configure-modulated to import gnulib
add post-install-modulated target to create /opt/csw/gnu links

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

Modified: csw/mgar/pkg/findutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/findutils/trunk/Makefile	2010-09-24 01:19:39 UTC (rev 11046)
+++ csw/mgar/pkg/findutils/trunk/Makefile	2010-09-24 03:59:56 UTC (rev 11047)
@@ -1,5 +1,3 @@
-# Todo
-# * Non-maintainer upload, needs to be checked by Chris
 GARNAME = findutils
 GARVERSION = 4.4.2
 CATEGORIES = utils
@@ -37,9 +35,6 @@
 # because that's what -fast does if it's last in the list.
 OPT_FLAGS_SOS = -fast -xnolibmopt
 
-EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis
-EXTRA_BUILD_ISAS_i386  = pentium_pro
-
 CHECKPKG_OVERRIDES_CSWfindutils += surplus-dependency|CSWiconv
 
 # Test target requires GNU diff
@@ -61,8 +56,9 @@
 # FAIL: parent.old-O2, /home/gmarler/svnwork/findutils/trunk/work/solaris9-sparc/build-isa-sparcv8/findutils-4.4.2/find/testsuite/../oldfind: .: Permission denied
 # FAIL: parent.old-O3, /home/gmarler/svnwork/findutils/trunk/work/solaris9-sparc/build-isa-sparcv8/findutils-4.4.2/find/testsuite/../oldfind: .: Permission denied
 
-# Skipping until the above are rectified - if they ever are
-SKIPTEST = 1
+# Skip tests until the following is resolved, or we can backport the fixes as patches
+#   https://savannah.gnu.org/bugs/?30883
+SKIPTEST ?= 1
 
 include gar/category.mk
 
@@ -75,7 +71,20 @@
 # configure:37777: result: /opt/csw/lib/libintl.so -R/opt/csw/lib
 #
 
+
+pre-configure-modulated:
+	cd $(WORKSRC) && bash ./import-gnulib.sh
+	@$(MAKECOOKIE)
+
 post-configure-modulated:
 	@perl -pi -e 's|-R/opt/csw/lib||' $(WORKSRC)/*/Makefile
 	@$(MAKECOOKIE)
 
+#
+# Provide /opt/csw/gnu links via this target
+#
+post-install-modulated:
+	ginstall -d $(DESTDIR)$(prefix)/gnu
+	$(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/findutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/findutils/trunk/checksums	2010-09-24 01:19:39 UTC (rev 11046)
+++ csw/mgar/pkg/findutils/trunk/checksums	2010-09-24 03:59:56 UTC (rev 11047)
@@ -1,2 +1,2 @@
-06573955b3b3ad2ab85031083bd5eb02  download/CSWfindutils.postinstall
-351cc4adb07d54877fa15f75fb77d39f  download/findutils-4.4.2.tar.gz
+06573955b3b3ad2ab85031083bd5eb02  CSWfindutils.postinstall
+351cc4adb07d54877fa15f75fb77d39f  findutils-4.4.2.tar.gz


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