[csw-devel] SF.net SVN: gar:[17220] csw/mgar/pkg/boost/branches/boost-gcc

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Mon Feb 27 01:00:56 CET 2012


Revision: 17220
          http://gar.svn.sourceforge.net/gar/?rev=17220&view=rev
Author:   wahwah
Date:     2012-02-27 00:00:56 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
boost/branches/boost-gcc: work in progress

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

Added Paths:
-----------
    csw/mgar/pkg/boost/branches/boost-gcc/files/0001-Don-t-try-to-use-fchmodat.patch

Property Changed:
----------------
    csw/mgar/pkg/boost/branches/boost-gcc/Makefile

Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile
===================================================================
--- csw/mgar/pkg/boost/branches/boost-gcc/Makefile	2012-02-26 23:04:37 UTC (rev 17219)
+++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile	2012-02-27 00:00:56 UTC (rev 17220)
@@ -1,9 +1,9 @@
 # $Id$
 
 NAME = boost
-VERSION = 1.45.0
-GARTYPE = v1
+VERSION = 1.49.0
 CATEGORIES = lib
+GARTYPE = v2
 
 define BLURB
   Boost was begun by members of the C++ standards committee Library Working
@@ -22,12 +22,16 @@
 DISTNAME = $(NAME)_$(DISTVERSION)
 DISTFILES  = $(DISTNAME).tar.bz2
 
-prefix = /opt/csw/boost-gcc
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+# ISA_DEFAULT_sparc-5.10 = sparcv8plus
 
+PATCHFILES += 0001-Don-t-try-to-use-fchmodat.patch
+
+prefix = /opt/csw/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+)*)
 
 GARCOMPILER = GNU
 TOOLSET = gcc
@@ -35,13 +39,13 @@
 COMPILER_SUFFIX_CAT = _gcc
 
 PACKAGES += CSWboost$(COMPILER_SUFFIX_PKG)
-CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG) += boost
+CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG) += boost$(COMPILER_SUFFIX_CAT)
 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
+CATALOGNAME_CSWboost$(COMPILER_SUFFIX_PKG)devel = boost$(COMPILER_SUFFIX_CAT)_devel
 SPKG_DESC_CSWboost$(COMPILER_SUFFIX_PKG)devel = Boost libraries, development files
 PKGFILES_CSWboost$(COMPILER_SUFFIX_PKG)devel = $(PKGFILES_DEVEL)
 
@@ -50,19 +54,23 @@
 
 BUILD_DEP_PKGS += CSWstar
 
-CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS = bjam
+CONFIGURE_SCRIPTS = boost
+BUILD_SCRIPTS = boost
 INSTALL_SCRIPTS = bjam
 
 BUILD_ARGS += toolset=$(TOOLSET)
 BUILD_ARGS += --prefix=$(DESTDIR)$(prefix)
+BUILD_ARGS += --libdir=$(DESTDIR)$(libdir)
 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"
+# Display commands as you run them, I want to know what you are doing there
+BUILD_ARGS += -d+2
+BUILD_ARGS += include="/opt/csw/gcc/include"
+BUILD_ARGS += --debug-building
 
 TEST_SCRIPTS =
 
@@ -89,16 +97,17 @@
 	/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) )
+configure-boost:
+	( cd $(WORKSRC) && \
+	  ./bootstrap.sh $(TOOLSET))
+	# && \
+	#  mkdir -p $(DESTDIR)$(bindir) && \
+	#  cp bin.$(JAMDIR)/bjam $(DESTDIR)$(bindir) )
 	@$(MAKECOOKIE)
 
-build-bjam:
+build-boost:
 	cd $(WORKSRC) && \
-		$(DESTDIR)$(bindir)/bjam \
+		./b2 \
 		  -d+2 \
 			$(BJAM_PARALLELMFLAGS) \
 			$(BUILD_ARGS)
@@ -106,8 +115,7 @@
 
 install-bjam:
 	cd $(WORKSRC) && \
-		$(DESTDIR)$(bindir)/bjam \
-		  -d+2 \
+		./b2 \
 			$(BJAM_PARALLELMFLAGS) \
 			$(BUILD_ARGS) \
 			install


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

Modified: csw/mgar/pkg/boost/branches/boost-gcc/checksums
===================================================================
--- csw/mgar/pkg/boost/branches/boost-gcc/checksums	2012-02-26 23:04:37 UTC (rev 17219)
+++ csw/mgar/pkg/boost/branches/boost-gcc/checksums	2012-02-27 00:00:56 UTC (rev 17220)
@@ -1 +1 @@
-f02578f5218f217a9f20e9c30e119c6a  boost_1_44_0.tar.bz2
+0d202cb811f934282dea64856a175698  boost_1_49_0.tar.bz2

Added: csw/mgar/pkg/boost/branches/boost-gcc/files/0001-Don-t-try-to-use-fchmodat.patch
===================================================================
--- csw/mgar/pkg/boost/branches/boost-gcc/files/0001-Don-t-try-to-use-fchmodat.patch	                        (rev 0)
+++ csw/mgar/pkg/boost/branches/boost-gcc/files/0001-Don-t-try-to-use-fchmodat.patch	2012-02-27 00:00:56 UTC (rev 17220)
@@ -0,0 +1,25 @@
+From 41a096b2d285342872396ab98594a0cadba310e5 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 27 Feb 2012 00:49:24 +0100
+Subject: [PATCH] Don't try to use fchmodat
+
+---
+ libs/filesystem/v3/src/operations.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libs/filesystem/v3/src/operations.cpp b/libs/filesystem/v3/src/operations.cpp
+index 226f107..116029b 100644
+--- a/libs/filesystem/v3/src/operations.cpp
++++ b/libs/filesystem/v3/src/operations.cpp
+@@ -1387,7 +1387,7 @@ namespace detail
+ 
+     // Mac OS X Lion and some other platforms don't support fchmodat()  
+ #   if defined(AT_FDCWD) && defined(AT_SYMLINK_NOFOLLOW) \
+-      && (!defined(__SUNPRO_CC) || __SUNPRO_CC > 0x5100)
++      && (!defined(__SUNPRO_CC) || __SUNPRO_CC > 0x5100) && 0
+       if (::fchmodat(AT_FDCWD, p.c_str(), mode_cast(prms),
+            !(prms & symlink_perms) ? 0 : AT_SYMLINK_NOFOLLOW))
+ #   else  // fallback if fchmodat() not supported
+-- 
+1.7.9
+

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