[csw-devel] SF.net SVN: gar:[11939] csw/mgar/pkg/boost

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Wed Dec 15 01:13:54 CET 2010


Revision: 11939
          http://gar.svn.sourceforge.net/gar/?rev=11939&view=rev
Author:   wahwah
Date:     2010-12-15 00:13:53 +0000 (Wed, 15 Dec 2010)

Log Message:
-----------
boost: Work towards 1.45.0

There are compilation error, and I found a flag to make bjam stop on the first
error, so it'll be easier to locate failures.

Modified Paths:
--------------
    csw/mgar/pkg/boost/branches/boost-gcc/Makefile
    csw/mgar/pkg/boost/branches/boost-gcc/checksums
    csw/mgar/pkg/boost/trunk/Makefile
    csw/mgar/pkg/boost/trunk/checksums

Property Changed:
----------------
    csw/mgar/pkg/boost/trunk/Makefile

Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile
===================================================================
--- csw/mgar/pkg/boost/branches/boost-gcc/Makefile	2010-12-14 23:22:27 UTC (rev 11938)
+++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile	2010-12-15 00:13:53 UTC (rev 11939)
@@ -1,8 +1,9 @@
+# $Id$
+
 NAME = boost
-VERSION = 1.33.0
+VERSION = 1.45.0
 CATEGORIES = lib
 
-DESCRIPTION = A collection of C++ libraries
 define BLURB
   Boost was begun by members of the C++ standards committee Library Working
   Group to provide free peer-reviewed portable libraries to the C++ community.
@@ -17,39 +18,96 @@
 
 MASTER_SITES = $(SF_MIRROR)/$(NAME)/
 DISTVERSION = $(subst .,_,$(VERSION))
-DISTFILES  = $(NAME)_$(DISTVERSION).tar.bz2
-DISTFILES += CSWboost.gspec
+DISTNAME = $(NAME)_$(DISTVERSION)
+DISTFILES  = $(DISTNAME).tar.bz2
 
+prefix = /opt/csw/boost-gcc
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=7586
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
-WORKSRC = $(WORKDIR)/$(NAME)_$(DISTVERSION)
+GARCOMPILER = GNU
+TOOLSET = gcc
+COMPILER_SUFFIX_PKG = -gcc
+COMPILER_SUFFIX_CAT = _gcc
 
+PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG)
+CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG) += boost
+SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG) = Boost libraries
+# The boost build system is hard to harness.
+CHECKPKG_OVERRIDES_CSWboost$(COMPILER_SUFFIX_PKG) += bad-rpath-entry
+
+PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG)devel
+CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG)devel = boost_devel
+SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG)devel = Boost libraries, development files
+PKGFILES_CSWboost$(COMPILER_SUFFIX_PKG)devel = $(PKGFILES_DEVEL)
+
+
+LICENSE = LICENSE_1_0.txt
+
+BUILD_DEP_PKGS += CSWstar
+
 CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS =
+BUILD_SCRIPTS = bjam
 INSTALL_SCRIPTS = bjam
 
-BUILD_ARGS  = --prefix=$(DESTDIR)$(prefix)
-BUILD_ARGS += -sTOOLS=sunpro
-BUILD_ARGS += --with-python-root=$(prefix)
+BUILD_ARGS += toolset=$(TOOLSET)
+BUILD_ARGS += --prefix=$(DESTDIR)$(prefix)
+BUILD_ARGS += link=shared
+BUILD_ARGS += cflags="$(CFLAGS)"
+BUILD_ARGS += cxxflags="$(CXXFLAGS)"
+BUILD_ARGS += linkflags="$(LDFLAGS) $(LD_OPTIONS)"
+# Stop on the first error
+BUILD_ARGS += -q
+BUILD_ARGS += include="/opt/csw/boost-gcc/include"
 
 TEST_SCRIPTS =
 
+JAMDIR_sparc = solarissparc
+JAMDIR_i386 = solarisx86
+JAMDIR = $(JAMDIR_$(GARCH))
+
+# BUILD64 = 1
+
+# These can't be just passed from Make's PARALLELMFLAGS because of the -l flag.
+BJAM_PARALLELMFLAGS_current9s = -j 32
+BJAM_PARALLELMFLAGS_current9x = -j 5
+BJAM_PARALLELMFLAGS = $(BJAM_PARALLELMFLAGS_$(call modulation2host))
+
 include gar/category.mk
 
 PYTHON_ROOT = $(prefix)
-PYTHON_VERSION = 2.3
+PYTHON_VERSION = 2.6
 export PYTHON_ROOT PYTHON_VERSION
 
-pre-configure:
-	( cd $(WORKSRC)/tools/build/jam_src ; \
-	  ./build.sh sunpro ; \
-	  mkdir -p $(DESTDIR)$(bindir) ; \
-	  mv bin.solaris/bjam $(DESTDIR)$(bindir) )
+# Boost is not extractable with SUNW tar nor GNU tar :-(
+tar-bz-extract-%:
+	@echo " ==> Extracting $(DOWNLOADDIR)/$*"
+	/opt/csw/bin/star -bz -x -C $(EXTRACTDIR) -f $(DOWNLOADDIR)/$*
 	@$(MAKECOOKIE)
 
+pre-configure-modulated:
+	( cd $(WORKSRC)/tools/jam/src && \
+	  ./build.sh $(TOOLSET) && \
+	  mkdir -p $(DESTDIR)$(bindir) && \
+	  cp bin.$(JAMDIR)/bjam $(DESTDIR)$(bindir) )
+	@$(MAKECOOKIE)
+
+build-bjam:
+	cd $(WORKSRC) && \
+		$(DESTDIR)$(bindir)/bjam \
+		  -d+2 \
+			$(BJAM_PARALLELMFLAGS) \
+			$(BUILD_ARGS)
+	@$(MAKECOOKIE)
+
 install-bjam:
-	( cd $(WORKSRC) ; bjam $(BUILD_ARGS) install ) || exit 1
+	cd $(WORKSRC) && \
+		$(DESTDIR)$(bindir)/bjam \
+		  -d+2 \
+			$(BJAM_PARALLELMFLAGS) \
+			$(BUILD_ARGS) \
+			install
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/boost/branches/boost-gcc/checksums
===================================================================
--- csw/mgar/pkg/boost/branches/boost-gcc/checksums	2010-12-14 23:22:27 UTC (rev 11938)
+++ csw/mgar/pkg/boost/branches/boost-gcc/checksums	2010-12-15 00:13:53 UTC (rev 11939)
@@ -1,2 +1 @@
-43d87bbd827a8299f408df5efe5f0fd8  download/boost_1_33_0.tar.bz2
-a00cee53babcf663a51e117741f777d0  download/CSWboost.gspec
+f02578f5218f217a9f20e9c30e119c6a  boost_1_44_0.tar.bz2

Modified: csw/mgar/pkg/boost/trunk/Makefile
===================================================================
--- csw/mgar/pkg/boost/trunk/Makefile	2010-12-14 23:22:27 UTC (rev 11938)
+++ csw/mgar/pkg/boost/trunk/Makefile	2010-12-15 00:13:53 UTC (rev 11939)
@@ -1,8 +1,9 @@
+# $Id$
+
 NAME = boost
-VERSION = 1.44.0
+VERSION = 1.45.0
 CATEGORIES = lib
 
-DESCRIPTION = A collection of C++ libraries
 define BLURB
   Boost was begun by members of the C++ standards committee Library Working
   Group to provide free peer-reviewed portable libraries to the C++ community.
@@ -25,20 +26,45 @@
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
-PACKAGES = CSWboost
-CATALOGNAME_CSWboost = boost
+# GARCOMPILER = GNU
+TOOLSET = sunpro
+COMPILER_SUFFIX_PKG =
+COMPILER_SUFFIX_CAT =
 
+PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG)
+CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG) += boost
+SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG) = Boost libraries
+# The boost build system is hard to harness.
+CHECKPKG_OVERRIDES_CSWboost$(COMPILER_SUFFIX_PKG) += bad-rpath-entry
+
+PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG)devel
+CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG)devel = boost_devel
+SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG)devel = Boost libraries, development files
+PKGFILES_CSWboost$(COMPILER_SUFFIX_PKG)devel = $(PKGFILES_DEVEL)
+
+# Empty transitional package
+PACKAGES += CSWboostrt
+CATALOGNAME_CSWboostrt = boost_rt
+SPKG_DESC_CSWboostrt = Empty transitional package
+PKGFILES_CSWboostrt = no-files-here
+ARCHALL_CSWboostrt = 1
+
 LICENSE = LICENSE_1_0.txt
 
 BUILD_DEP_PKGS += CSWstar
 
 CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS =
+BUILD_SCRIPTS = bjam
 INSTALL_SCRIPTS = bjam
 
-BUILD_ARGS  = --prefix=$(DESTDIR)$(prefix)
-BUILD_ARGS += toolset=sun
-#BUILD_ARGS += --with-python-root=$(prefix)
+BUILD_ARGS += toolset=$(TOOLSET)
+BUILD_ARGS += --prefix=$(DESTDIR)$(prefix)
+BUILD_ARGS += link=shared
+BUILD_ARGS += cflags="$(CFLAGS)"
+BUILD_ARGS += cxxflags="$(CXXFLAGS)"
+BUILD_ARGS += linkflags="$(LDFLAGS) $(LD_OPTIONS)"
+# Stop on the first error
+BUILD_ARGS += -q
 
 TEST_SCRIPTS =
 
@@ -46,10 +72,17 @@
 JAMDIR_i386 = solarisx86
 JAMDIR = $(JAMDIR_$(GARCH))
 
+# BUILD64 = 1
+
+# These can't be just passed from Make's PARALLELMFLAGS because of the -l flag.
+BJAM_PARALLELMFLAGS_current9s = -j 32
+BJAM_PARALLELMFLAGS_current9x = -j 5
+BJAM_PARALLELMFLAGS = $(BJAM_PARALLELMFLAGS_$(call modulation2host))
+
 include gar/category.mk
 
 PYTHON_ROOT = $(prefix)
-PYTHON_VERSION = 2.3
+PYTHON_VERSION = 2.6
 export PYTHON_ROOT PYTHON_VERSION
 
 # Boost is not extractable with SUNW tar nor GNU tar :-(
@@ -59,12 +92,25 @@
 	@$(MAKECOOKIE)
 
 pre-configure-modulated:
-	( cd $(WORKSRC)/tools/jam/src ; \
-	  ./build.sh sunpro ; \
-	  mkdir -p $(DESTDIR)$(bindir) ; \
-	  mv bin.$(JAMDIR)/bjam $(DESTDIR)$(bindir) )
+	( cd $(WORKSRC)/tools/jam/src && \
+	  ./build.sh $(TOOLSET) && \
+	  mkdir -p $(DESTDIR)$(bindir) && \
+	  cp bin.$(JAMDIR)/bjam $(DESTDIR)$(bindir) )
 	@$(MAKECOOKIE)
 
+build-bjam:
+	cd $(WORKSRC) && \
+		$(DESTDIR)$(bindir)/bjam \
+		  -d+2 \
+			$(BJAM_PARALLELMFLAGS) \
+			$(BUILD_ARGS)
+	@$(MAKECOOKIE)
+
 install-bjam:
-	( cd $(WORKSRC) ; which bjam; bjam $(BUILD_ARGS) install ) || exit 1
+	cd $(WORKSRC) && \
+		$(DESTDIR)$(bindir)/bjam \
+		  -d+2 \
+			$(BJAM_PARALLELMFLAGS) \
+			$(BUILD_ARGS) \
+			install
 	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/boost/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/pkg/boost/trunk/checksums
===================================================================
--- csw/mgar/pkg/boost/trunk/checksums	2010-12-14 23:22:27 UTC (rev 11938)
+++ csw/mgar/pkg/boost/trunk/checksums	2010-12-15 00:13:53 UTC (rev 11939)
@@ -1 +1 @@
-f02578f5218f217a9f20e9c30e119c6a  boost_1_44_0.tar.bz2
+d405c606354789d0426bc07bea617e58  boost_1_45_0.tar.bz2


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