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

[skayser at users.sourceforge.net]

Revision: 2768
          http://gar.svn.sourceforge.net/gar/?rev=2768&view=rev
Author:   skayser
Date:     2009-01-09 00:56:50 +0000 (Fri, 09 Jan 2009)

Log Message:
-----------
mbuffer: Adjusted build description for amd64 build

Modified Paths:
--------------
    csw/mgar/pkg/mbuffer/trunk/Makefile
    csw/mgar/pkg/mbuffer/trunk/checksums
    csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec

Modified: csw/mgar/pkg/mbuffer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/Makefile	2009-01-08 21:53:21 UTC (rev 2767)
+++ csw/mgar/pkg/mbuffer/trunk/Makefile	2009-01-09 00:56:50 UTC (rev 2768)
@@ -27,15 +27,32 @@
 # value of MASTER_SITES
 # UPSTREAM_MASTER_SITES = 
 
+# To build amd64 you have to do the following
+# 1)  build8x: gmake build-isa-i386
+# 2) build10x: gmake merge
+# 3)  build8x: gmake package
+BUILD64 = 1
+ISAEXEC_BINS = $(bindir)/mbuffer
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
+# While i am still fighting with the packaging stuff, skip the tests
+# TEST_TARGET = check
+TEST_TARGET =
 
 include gar/category.mk
 
-DOCS = ChangeLog README AUTHORS
-DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME)
+# Solaris 10 on build10x has libm.so which points to libm.so.2. libm.so.2 
+# is however not available on Solaris 8. So we have to explicitly use 
+# libm.so.1 during linking and get rid of the -lm reference
+post-configure-isa-amd64: M1=$(WORKSRC)/Makefile
+post-configure-isa-amd64: M2=$(WORKSRC)/Makefile.tmp
+post-configure-isa-amd64:
+	@echo "Patching Makefile to use /lib/64/libm.so.1 instead of -lm"
+	@sed 's#-lm#/lib/64/libm.so.1#' $(M1) > $(M2) && mv $(M2) $(M1)
 
-post-install:
+post-install-modulated: DOCS = ChangeLog README AUTHORS
+post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME)
+post-install-modulated:
 	@ginstall -d $(DOCDEST)
 	@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)

Modified: csw/mgar/pkg/mbuffer/trunk/checksums
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/checksums	2009-01-08 21:53:21 UTC (rev 2767)
+++ csw/mgar/pkg/mbuffer/trunk/checksums	2009-01-09 00:56:50 UTC (rev 2768)
@@ -1,2 +1,2 @@
 640dab1531246f4e93ba5f0ccccff65b  download/mbuffer-20081207.tgz
-6607910097dc7478838eed424c4ef45e  download/CSWpackage.gspec
+ee84b171939ddb3f60a49b5989626000  download/CSWpackage.gspec

Modified: csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec	2009-01-08 21:53:21 UTC (rev 2767)
+++ csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec	2009-01-09 00:56:50 UTC (rev 2768)
@@ -1,4 +1,4 @@
 %var            bitname mbuffer
 %var            pkgname CSWmbuffer
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
+%copyright      url file://%{WORKSRC_FIRSTMOD}/LICENSE


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