1
0
forked from ports/contrib

boost-jam: 3.1.16 -> 3.1.17

This commit is contained in:
Danny Rawlins 2008-11-30 02:00:13 +11:00
parent dc0d568efb
commit f9d9a21ce2
6 changed files with 1120 additions and 108 deletions

View File

@ -1,3 +1,3 @@
1fd96a38b1a33c365e8142eec53197e7 boost-jam-3.1.16.tgz
090a72bd5aeaef655189d872118e70f4 boost-jam-misc.patch
7be936c0083373d017694fa406eaf47a cflags.patch
67511b40359cd83cd3ae1cd8002934f7 boost-jam-3.1.17-cflags.patch
30e319a97f0e951c73cc8b7ddaec09fc boost-jam-3.1.17-misc.patch
f4afd896788f2327fd35c128ddc6e340 boost-jam-3.1.17.tgz

View File

@ -2,20 +2,21 @@
# URL: http://www.boost.org/
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
# Packager: Danny Rawlins, monster dot romster at gmail dot com
# Depends on:
# Depends on:
name=boost-jam
version=3.1.16
release=2
source=(http://dl.sourceforge.net/sourceforge/boost/boost-jam-$version.tgz
boost-jam-misc.patch
cflags.patch)
version=3.1.17
release=1
source=(http://dl.sourceforge.net/sourceforge/boost/$name-$version.tgz
$name-3.1.17-misc.patch
$name-3.1.17-cflags.patch)
build() {
cd boost-jam-$version
patch -p 1 -i $SRC/boost-jam-misc.patch
patch -p 1 -i $SRC/cflags.patch
export CFLAGS="$CFLAGS -fno-strict-aliasing"
cd $name-$version
patch -p 1 -i $SRC/$name-3.1.17-misc.patch
patch -p 1 -i $SRC/$name-3.1.17-cflags.patch
export CFLAGS+="-fno-strict-aliasing"
echo $CFLAGS
local bindir='bin.linuxx86'
./build.sh gcc
install -m 0755 -D $bindir/bjam $PKG/usr/bin/bjam

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,24 @@
diff -pruN boost-jam-3.1.17.orig/Jambase boost-jam-3.1.17/Jambase
--- boost-jam-3.1.17.orig/Jambase 2008-11-30 01:32:38.692291050 +1100
+++ boost-jam-3.1.17/Jambase 2008-11-30 01:36:31.488291745 +1100
@@ -50,7 +50,7 @@ BOOST_BUILD_PATH.user-value = $(BOOST_BU
# Policy.
if ! $(BOOST_BUILD_PATH) && $(UNIX)
{
- BOOST_BUILD_PATH = /usr/share/boost-build ;
+ BOOST_BUILD_PATH = /usr/share/boost/v2 ;
}
diff -pruN boost-jam-3.1.17.orig/jambase.c boost-jam-3.1.17/jambase.c
--- boost-jam-3.1.17.orig/jambase.c 2008-11-30 01:32:38.694291102 +1100
+++ boost-jam-3.1.17/jambase.c 2008-11-30 01:36:31.490291290 +1100
@@ -21,7 +21,7 @@ char *jambase[] = {
"BOOST_BUILD_PATH.user-value = $(BOOST_BUILD_PATH) ;\n",
"if ! $(BOOST_BUILD_PATH) && $(UNIX)\n",
"{\n",
-"BOOST_BUILD_PATH = /usr/share/boost-build ;\n",
+"BOOST_BUILD_PATH = /usr/share/boost/v2 ;\n",
"}\n",
"rule _poke ( module-name ? : variables + : value * )\n",
"{\n",

View File

@ -1,38 +0,0 @@
diff -Naur boost-jam-3.1.10.orig/Jambase boost-jam-3.1.10/Jambase
--- boost-jam-3.1.10.orig/Jambase 2005-07-11 13:22:26.000000000 +0200
+++ boost-jam-3.1.10/Jambase 2005-07-11 13:25:02.000000000 +0200
@@ -48,7 +48,7 @@
# required by Debian Policy.
if ! $(BOOST_BUILD_PATH) && $(UNIX)
{
- BOOST_BUILD_PATH = /usr/share/boost-build ;
+ BOOST_BUILD_PATH = /usr/share/boost/v2 ;
}
diff -Naur boost-jam-3.1.10.orig/jam.h boost-jam-3.1.10/jam.h
--- boost-jam-3.1.10.orig/jam.h 2005-07-11 13:22:26.000000000 +0200
+++ boost-jam-3.1.10/jam.h 2005-07-11 13:24:04.000000000 +0200
@@ -453,6 +453,10 @@
# define OSPLAT "OSPLAT=IA64"
# endif
+# if defined( __x86_64__ )
+# define OSPLAT "OSPLAT=x86_64"
+# endif
+
# ifdef __s390__
# define OSPLAT "OSPLAT=390"
# endif
diff -Naur boost-jam-3.1.10.orig/jambase.c boost-jam-3.1.10/jambase.c
--- boost-jam-3.1.10.orig/jambase.c 2005-07-11 13:22:26.000000000 +0200
+++ boost-jam-3.1.10/jambase.c 2005-07-11 13:24:27.000000000 +0200
@@ -21,7 +21,7 @@
"BOOST_BUILD_PATH.user-value = $(BOOST_BUILD_PATH) ;\n",
"if ! $(BOOST_BUILD_PATH) && $(UNIX)\n",
"{\n",
-"BOOST_BUILD_PATH = /usr/share/boost-build ;\n",
+"BOOST_BUILD_PATH = /usr/share/boost/v2 ;\n",
"}\n",
"rule boost-build ( dir ? )\n",
"{\n",

View File

@ -1,57 +0,0 @@
diff -Naur boost-jam-3.1.16/build.jam boost-jam-3.1.16-flags/build.jam
--- boost-jam-3.1.16/build.jam 2007-12-03 04:27:54.000000000 +0100
+++ boost-jam-3.1.16-flags/build.jam 2007-12-08 17:38:26.000000000 +0100
@@ -176,7 +176,7 @@
## GCC 2.x, 3.x, 4.x
toolset gcc gcc : "-o " : -D
: -pedantic -fno-strict-aliasing
- [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
+ [ opt --release : [ opt --symbols : -g : -s ] $(CFLAGS) ]
[ opt --debug : -g -O0 -fno-inline ]
-I$(--python-include) -I$(--extra-include) -Wno-long-long
: -L$(--python-lib[1]) -l$(--python-lib[2]) ;
diff -Naur boost-jam-3.1.16/build.sh boost-jam-3.1.16-flags/build.sh
--- boost-jam-3.1.16/build.sh 2007-12-03 04:27:54.000000000 +0100
+++ boost-jam-3.1.16-flags/build.sh 2007-12-08 17:36:50.000000000 +0100
@@ -12,7 +12,7 @@
echo_run ()
{
echo "$@"
- $@
+ eval "$@"
r=$?
if test $r -ne 0 ; then
exit $r
@@ -265,7 +265,7 @@
echo_run rm -rf bootstrap
echo_run mkdir bootstrap
if test ! -r jamgram.y -o ! -r jamgramtab.h ; then
- echo_run ${BOOST_JAM_CC} ${BOOST_JAM_OPT_YYACC} ${YYACC_SOURCES}
+ echo_run ${BOOST_JAM_CC} ${CFLAGS} ${BOOST_JAM_OPT_YYACC} ${YYACC_SOURCES}
if test -x "./bootstrap/yyacc0" ; then
echo_run ./bootstrap/yyacc0 jamgram.y jamgramtab.h jamgram.yy
fi
@@ -279,16 +279,20 @@
mv -f y.tab.h jamgram.h
fi
if test ! -r jambase.c ; then
- echo_run ${BOOST_JAM_CC} ${BOOST_JAM_OPT_MKJAMBASE} ${MKJAMBASE_SOURCES}
+ echo_run ${BOOST_JAM_CC} ${CFLAGS} ${BOOST_JAM_OPT_MKJAMBASE} ${MKJAMBASE_SOURCES}
if test -x "./bootstrap/mkjambase0" ; then
echo_run ./bootstrap/mkjambase0 jambase.c Jambase
fi
fi
- echo_run ${BOOST_JAM_CC} ${BOOST_JAM_OPT_JAM} ${BJAM_SOURCES}
+ echo_run ${BOOST_JAM_CC} ${CFLAGS} ${BOOST_JAM_OPT_JAM} ${BJAM_SOURCES}
fi
if test -x "./bootstrap/jam0" ; then
if test "${BJAM_UPDATE}" != "update" ; then
echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" clean
fi
- echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
+ if test -z "$BOOST_JAM_TOOLSET_ROOT"; then
+ echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "$@"
+ else
+ echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
+ fi
fi