summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel@free.fr>2011-02-19 18:34:58 +0100
committersibel <lesibel@free.fr>2011-02-19 18:34:58 +0100
commita8d01146649e0d2541646347367e7574db86dc81 (patch)
tree80bba1d1fc66bc58f28d158ef08abf63ab0c953a
parent13649d120231a74b6bc8a0cc51ba9e3254cea7d6 (diff)
downloadnutyx-extra-a8d01146649e0d2541646347367e7574db86dc81.tar.gz
nutyx-extra-a8d01146649e0d2541646347367e7574db86dc81.tar.bz2
nutyx-extra-a8d01146649e0d2541646347367e7574db86dc81.tar.xz
nutyx-extra-a8d01146649e0d2541646347367e7574db86dc81.zip
boost, ajout patch pour gcc4.6
-rw-r--r--base/boost/.footprint.i686 (renamed from extra/boost/.footprint.i686)0
-rw-r--r--base/boost/.footprint.x86_64 (renamed from extra/boost/.footprint.x86_64)0
-rw-r--r--base/boost/.md5sum.i6862
-rw-r--r--base/boost/.md5sum.x86_642
-rw-r--r--base/boost/Pkgfile (renamed from extra/boost/Pkgfile)17
-rw-r--r--base/boost/layout-tagged.patch (renamed from extra/boost/layout-tagged.patch)0
-rw-r--r--base/boost/translate_exception.patch (renamed from extra/boost/translate_exception.patch)0
-rw-r--r--extra/boost/.md5sum.i6861
-rw-r--r--extra/boost/.md5sum.x86_641
9 files changed, 15 insertions, 8 deletions
diff --git a/extra/boost/.footprint.i686 b/base/boost/.footprint.i686
index 4bf544a5f..4bf544a5f 100644
--- a/extra/boost/.footprint.i686
+++ b/base/boost/.footprint.i686
diff --git a/extra/boost/.footprint.x86_64 b/base/boost/.footprint.x86_64
index 4bf544a5f..4bf544a5f 100644
--- a/extra/boost/.footprint.x86_64
+++ b/base/boost/.footprint.x86_64
diff --git a/base/boost/.md5sum.i686 b/base/boost/.md5sum.i686
new file mode 100644
index 000000000..14657913e
--- /dev/null
+++ b/base/boost/.md5sum.i686
@@ -0,0 +1,2 @@
+61b41c38ca032cf45e20f00a46836946 boost-1.46.0-signals-erase-2.patch
+d405c606354789d0426bc07bea617e58 boost_1_45_0.tar.bz2
diff --git a/base/boost/.md5sum.x86_64 b/base/boost/.md5sum.x86_64
new file mode 100644
index 000000000..14657913e
--- /dev/null
+++ b/base/boost/.md5sum.x86_64
@@ -0,0 +1,2 @@
+61b41c38ca032cf45e20f00a46836946 boost-1.46.0-signals-erase-2.patch
+d405c606354789d0426bc07bea617e58 boost_1_45_0.tar.bz2
diff --git a/extra/boost/Pkgfile b/base/boost/Pkgfile
index 27744be25..3f8bd7613 100644
--- a/extra/boost/Pkgfile
+++ b/base/boost/Pkgfile
@@ -7,14 +7,15 @@
name=boost
version=1.45.0
-release=2
+release=3
_boostver=1_45_0
-source=(http://downloads.sourceforge.net/$name/boost_$_boostver.tar.bz2 )
+source=(http://downloads.sourceforge.net/$name/boost_$_boostver.tar.bz2
+ http://nutyx.meticul.eu/files/patch/boost/boost-1.46.0-signals-erase-2.patch)
build() {
cd boost_$_boostver
-
+ patch -Np1 -i ../boost-1.46.0-signals-erase-2.patch
# build bjam
cd $SRC/boost_${_boostver}/tools/
echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
@@ -22,8 +23,13 @@ build() {
cd $SRC/boost_${_boostver}/tools/build/v2/engine/src
./build.sh cc
- _bindir="bin.linuxx86"
- [ "`uname -m`" = "x86_64" ] && _bindir="bin.linuxx86_64"
+ case `uname -m` in
+ x86_64)
+ _bindir="bin.linuxx86_64" ;;
+ i?86)
+ _bindir="bin.linuxx86" ;;
+
+ esac
install -m755 -d $PKG/usr/bin
install -m755 ${_bindir}/bjam $PKG/usr/bin/bjam
@@ -64,4 +70,3 @@ build() {
cp -r $PKG/include/ $PKG/usr/
rm -rf $PKG/include/
}
-
diff --git a/extra/boost/layout-tagged.patch b/base/boost/layout-tagged.patch
index 05e60ec91..05e60ec91 100644
--- a/extra/boost/layout-tagged.patch
+++ b/base/boost/layout-tagged.patch
diff --git a/extra/boost/translate_exception.patch b/base/boost/translate_exception.patch
index 68669c137..68669c137 100644
--- a/extra/boost/translate_exception.patch
+++ b/base/boost/translate_exception.patch
diff --git a/extra/boost/.md5sum.i686 b/extra/boost/.md5sum.i686
deleted file mode 100644
index 482c1a4fc..000000000
--- a/extra/boost/.md5sum.i686
+++ /dev/null
@@ -1 +0,0 @@
-d405c606354789d0426bc07bea617e58 boost_1_45_0.tar.bz2
diff --git a/extra/boost/.md5sum.x86_64 b/extra/boost/.md5sum.x86_64
deleted file mode 100644
index 482c1a4fc..000000000
--- a/extra/boost/.md5sum.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-d405c606354789d0426bc07bea617e58 boost_1_45_0.tar.bz2