[csw-devel] SF.net SVN: gar:[7885] csw/mgar/pkg/mbuffer/trunk

skayser at users.sourceforge.net skayser at users.sourceforge.net
Wed Jan 6 01:19:47 CET 2010 

Revision: 7885
          http://gar.svn.sourceforge.net/gar/?rev=7885&view=rev
Author:   skayser
Date:     2010-01-06 00:19:47 +0000 (Wed, 06 Jan 2010)

Log Message:
-----------
mbuffer: bumped to 227 (looks good eventually), fixed test suite, switched to isaexec

Modified Paths:
--------------
    csw/mgar/pkg/mbuffer/trunk/Makefile
    csw/mgar/pkg/mbuffer/trunk/checksums
    csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW

Added Paths:
-----------
    csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch

Modified: csw/mgar/pkg/mbuffer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/Makefile	2010-01-05 22:29:07 UTC (rev 7884)
+++ csw/mgar/pkg/mbuffer/trunk/Makefile	2010-01-06 00:19:47 UTC (rev 7885)
@@ -1,8 +1,5 @@
-# STATUS/TODO
-# - provide feedback about -xarch=generic64 to upstream
-# - verify that tests pass
 GARNAME = mbuffer
-GARVERSION = 20091122
+GARVERSION = 20091227
 CATEGORIES = utils
 
 DESCRIPTION = A tool for buffering data streams
@@ -22,25 +19,26 @@
 
 LICENSE = LICENSE
 
+# The tests use background process and wait, but don't issue the wait
+# in the same shell as the background processes were launched in. Fix this.
+# Already submitted to upstream, maybe integrated in future versions.
+PATCHFILES = 0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch
+
 # Required during packaging (for the "test" target)
-PREREQUISITE_PKGS = CSWmktemp CSWgcc4core
+PREREQUISITE_PKGS  = CSWmktemp
+PREREQUISITE_PKGS += CSWgcc4core
 
-REQUIRED_PKGS = CSWosslrt CSWlibmhash
+REQUIRED_PKGS = CSWlibmhash
 
-# To build the mixed package for x86 you have to do the following
-# 1)  build8x: gmake merge
-# 2) build10x: gmake merge
-# 3)  build8x: gmake package
+# 64-bit build enables buffers >= 2GB (see README).
 BUILD64 = 1
 
-# 64-bit isn't thorougly tested by upstream, default to 32-bit, but still
-# deliver 64-bit in case someone might want to play around with 2GB+ buffers
-# ISAEXEC_BINS = $(bindir)/mbuffer
-NO_ISAEXEC = 1
-
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_SCRIPTS = custom
+# While we have IPv6 loopback interfaces on the buildfarm now, build10x
+# is missing an localhost IPv6 address entry for /etc/hosts. test3 requires 
+# one, thus we omit it for the time being.
+TEST_TARGET = -o test3 check
 
 # Required for updated libmhash (mbuffer builds against it) which allows for
 # flexible const/non-const definitions.  There should be a more intelligent 
@@ -50,36 +48,10 @@
 
 include gar/category.mk
 
-# The test scripts do file IO and this is so sloooooow when being run 
-# in a NFS mounted $HOME. The local disk on build8x is no better, so
-# just do the testing from /tmp instead.
-#
-# TODO: 
-# * Clean up $TMPDIR even when the nested make fails.
-# * Somehow assert that the isa-amd64 test is run on build10x
-#
-test-custom: TMPDIR := $(shell mktemp -d -p /tmp)
-test-custom:
-	echo "Running target test-custom, TMPDIR = $(TMPDIR)"
-	cp $(WORKSRC)/mbuffer $(WORKSRC)/Makefile $(TMPDIR)/
-
-	# Target test3 is skipped because it contains IPV6 tests which
-	# are not supported by the build farm boxes (yet).
-	$(MAKE) -C $(TMPDIR) -o test3 check || rm -rf $(TMPDIR) && exit 1
-	test -d $(TMPDIR) && rm -rf $(TMPDIR)
-	@$(MAKECOOKIE)
-
-# mbuffer-20091122 always tries to use -xarch=generic64,
-# even for non-64bit builds
-post-configure-modulated:
-	[ "$(GARCH)" -eq "i386" -o "$(GARCH)" -eq "sparcv8" ] && \
-		gsed -ie 's/-xarch=generic64//' $(WORKSRC)/Makefile
-	@$(MAKECOOKIE)
-
 post-install-modulated: DOCS = ChangeLog README AUTHORS
 post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME)
 post-install-modulated:
 	ginstall -d $(DOCDEST)
-	$(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);)
+	cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST)
 	cp $(FILEDIR)/changelog.CSW $(DOCDEST)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/mbuffer/trunk/checksums
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/checksums	2010-01-05 22:29:07 UTC (rev 7884)
+++ csw/mgar/pkg/mbuffer/trunk/checksums	2010-01-06 00:19:47 UTC (rev 7885)
@@ -1 +1,2 @@
-3f05bd393ac749ed820636e5aaed7848  mbuffer-20091122.tgz
+59fc19279af037462bd96279f5580c58  0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch
+191663396b4b1752d7104803631b9e54  mbuffer-20091227.tgz

Added: csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch	                        (rev 0)
+++ csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch	2010-01-06 00:19:47 UTC (rev 7885)
@@ -0,0 +1,50 @@
+From 280c3806583428f2d20718839129ea0758e8cdbc Mon Sep 17 00:00:00 2001
+From: Sebastian Kayser <skayser at opencsw.org>
+Date: Tue, 5 Jan 2010 23:19:33 +0100
+Subject: [PATCH] Makefile: put background jobs in same shell as the wait call
+
+---
+ Makefile.in |   20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b381ade..bf9953f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -73,11 +73,11 @@ test1: test.md5
+ 	touch $@
+ 
+ test2: test.md5
+-	./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 &
+-	sleep 1
+-	-rm -f $@.tar
+-	./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H
+-	wait
++	./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & \
++		sleep 1; \
++		rm -f $@.tar; \
++		./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H; \
++		wait
+ 	sync
+ 	diff $@.md5 test.md5
+ 	rm $@.md5
+@@ -88,11 +88,11 @@ test2: test.md5
+ 	touch $@
+ 
+ test3: test.md5
+-	./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 &
+-	sleep 1
+-	-rm -f $@.tar
+-	./mbuffer -i test.tar -o /dev/null -6 -O localhost:8000 -o $@.tar -H
+-	wait
++	./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \
++		sleep 1; \
++		rm -f $@.tar; \
++		./mbuffer -i test.tar -o /dev/null -6 -O localhost:8000 -o $@.tar -H; \
++		wait
+ 	sync
+ 	diff $@.md5 test.md5
+ 	rm $@.md5
+-- 
+1.6.5.1
+

Modified: csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW	2010-01-05 22:29:07 UTC (rev 7884)
+++ csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW	2010-01-06 00:19:47 UTC (rev 7885)
@@ -1,3 +1,12 @@
+mbuffer (20091227,REV=2010.01.06)
+
+  * Updated to new upstream release 20091227 (Closes #3912, #3980).
+  * Links against libmhash instead of openssl_rt for hash creation.
+  * /opt/csw/bin/mbuffer is now a link to isaexec which automatically
+    calls the appropriate mbuffer platform binary (32-bit or 64-bit).
+
+ -- Sebastian Kayser <skayser at opencsw.org>  Wed,  6 Jan 2010 00:50:20 +0100
+
 mbuffer (20090215,REV=2009.05.10)
 
   * Recompiled with updated GAR build system (Closes: #3561).


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