# HG changeset patch # User Antoine Bodin # Date 1296525320 -3600 # Node ID 99ced85ef4cb1705b418ed3e18d0139ba59cb61b # Parent f3364f01f7976974e804b072849b6d2e94904776 Fix: libboost should now compile fine with tazwok-experimental diff -r f3364f01f797 -r 99ced85ef4cb libboost-date-time-dev/receipt --- a/libboost-date-time-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-date-time-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-date-time/receipt --- a/libboost-date-time/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-date-time/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -16,7 +16,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-dev/receipt --- a/libboost-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -41,33 +41,25 @@ TOOLPREFIX=i486-pc-linux-gnu- fi - if [ -d $WGET_SOURCE ] ; then - mv -f $WGET_SOURCE $src - else - rm -r -f $src/_pkg - fi - cd $src ./bootstrap.sh \ - --prefix=$src/_pkg/usr \ - --exec-prefix=$src/_pkg/usr \ - --libdir=$src/_pkg/usr/lib \ - --includedir=$src/_pkg/usr/include \ + --prefix=$DESTDIR/usr \ + --exec-prefix=$DESTDIR/usr \ + --libdir=$DESTDIR/usr/lib \ + --includedir=$DESTDIR/usr/include \ --without-icu && EXPAT_INCLUDE=/usr/include \ EXPAT_LIBPATH=/usr/lib \ ./bjam \ - --prefix=$src/_pkg/usr \ - --exec-prefix=$src/_pkg/usr \ - --libdir=$src/_pkg/usr/lib \ - --includedir=$src/_pkg/usr/include \ + --prefix=$DESTDIR/usr \ + --exec-prefix=$DESTDIR/usr \ + --libdir=$DESTDIR/usr/lib \ + --includedir=$DESTDIR/usr/include \ --build-type=minimal \ install - mv $src/_pkg/usr/include/boost-1_45/boost $src/_pkg/usr/include && - rm -r -f $src/_pkg/usr/include/boost-1_45 # create the missing links to the shared libs - cd $src/_pkg/usr/lib + cd $DESTDIR/usr/lib for i in `ls *-mt.so`; do boost_tmp=`echo $i | sed s/-gcc.*-mt//g` boost_tmp_mt=`echo $i | sed s/-gcc.*-mt/-mt/g` @@ -88,9 +80,8 @@ mkdir -p $fs/usr cp -a $_pkg/usr/lib $fs/usr cp -a $_pkg/usr/include $fs/usr - for i in $RELOCATE_LIBS; do - rm -f $fs/usr/lib/*$i* - rm -r -f $fs/usr/include/boost/*$i* + rm -f $fs/usr/lib/*$i* + rm -r -f $fs/usr/include/boost/*$i* done } diff -r f3364f01f797 -r 99ced85ef4cb libboost-doc/receipt --- a/libboost-doc/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-doc/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -15,7 +15,5 @@ genpkg_rules() { mkdir -p $fs/usr/share/doc/$SOURCE - - src=$WOK/$WANTED/$SOURCE-$VERSION cp -a $src/doc/html/* $fs/usr/share/doc/$SOURCE } diff -r f3364f01f797 -r 99ced85ef4cb libboost-filesystem-dev/receipt --- a/libboost-filesystem-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-filesystem-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-filesystem/receipt --- a/libboost-filesystem/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-filesystem/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,7 +17,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-graph-dev/receipt --- a/libboost-graph-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-graph-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-graph/receipt --- a/libboost-graph/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-graph/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,7 +17,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-iostreams-dev/receipt --- a/libboost-iostreams-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-iostreams-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-iostreams/receipt --- a/libboost-iostreams/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-iostreams/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,7 +17,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-math-dev/receipt --- a/libboost-math-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-math-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-math/receipt --- a/libboost-math/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-math/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -16,8 +16,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib # math_tr1 is packaged as tr1 (based on the include dir name) diff -r f3364f01f797 -r 99ced85ef4cb libboost-program-options-dev/receipt --- a/libboost-program-options-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-program-options-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-program-options/receipt --- a/libboost-program-options/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-program-options/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -16,7 +16,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-python-dev/receipt --- a/libboost-python-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-python-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-python/receipt --- a/libboost-python/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-python/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -16,7 +16,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-regex-dev/receipt --- a/libboost-regex-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-regex-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-regex/receipt --- a/libboost-regex/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-regex/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,7 +17,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-serialization-dev/receipt --- a/libboost-serialization-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-serialization-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-serialization/receipt --- a/libboost-serialization/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-serialization/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -16,7 +16,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-signals-dev/receipt --- a/libboost-signals-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-signals-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-signals/receipt --- a/libboost-signals/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-signals/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -16,7 +16,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-system-dev/receipt --- a/libboost-system-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-system-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-system/receipt --- a/libboost-system/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-system/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -16,7 +16,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-test-dev/receipt --- a/libboost-test-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-test-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-test/receipt --- a/libboost-test/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-test/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -16,7 +16,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-thread-dev/receipt --- a/libboost-thread-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-thread-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-thread/receipt --- a/libboost-thread/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-thread/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -16,7 +16,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-tr1-dev/receipt --- a/libboost-tr1-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-tr1-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,8 +17,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-tr1/receipt --- a/libboost-tr1/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-tr1/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -16,7 +16,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-wave-dev/receipt --- a/libboost-wave-dev/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-wave-dev/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -16,8 +16,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib } diff -r f3364f01f797 -r 99ced85ef4cb libboost-wave/receipt --- a/libboost-wave/receipt Tue Feb 01 02:53:04 2011 +0100 +++ b/libboost-wave/receipt Tue Feb 01 02:55:20 2011 +0100 @@ -17,7 +17,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib }