wok-4.x rev 8305
Fix: libboost should now compile fine with tazwok-experimental
line diff
1.1 --- a/libboost-date-time-dev/receipt Tue Feb 01 02:53:04 2011 +0100 1.2 +++ b/libboost-date-time-dev/receipt Tue Feb 01 02:55:20 2011 +0100 1.3 @@ -17,8 +17,6 @@ 1.4 genpkg_rules() 1.5 { 1.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 1.7 - 1.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 1.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 1.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 1.11 }
2.1 --- a/libboost-date-time/receipt Tue Feb 01 02:53:04 2011 +0100 2.2 +++ b/libboost-date-time/receipt Tue Feb 01 02:55:20 2011 +0100 2.3 @@ -16,7 +16,5 @@ 2.4 genpkg_rules() 2.5 { 2.6 mkdir -p $fs/usr/lib 2.7 - 2.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 2.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 2.10 }
3.1 --- a/libboost-dev/receipt Tue Feb 01 02:53:04 2011 +0100 3.2 +++ b/libboost-dev/receipt Tue Feb 01 02:55:20 2011 +0100 3.3 @@ -41,33 +41,25 @@ 3.4 TOOLPREFIX=i486-pc-linux-gnu- 3.5 fi 3.6 3.7 - if [ -d $WGET_SOURCE ] ; then 3.8 - mv -f $WGET_SOURCE $src 3.9 - else 3.10 - rm -r -f $src/_pkg 3.11 - fi 3.12 - 3.13 cd $src 3.14 ./bootstrap.sh \ 3.15 - --prefix=$src/_pkg/usr \ 3.16 - --exec-prefix=$src/_pkg/usr \ 3.17 - --libdir=$src/_pkg/usr/lib \ 3.18 - --includedir=$src/_pkg/usr/include \ 3.19 + --prefix=$DESTDIR/usr \ 3.20 + --exec-prefix=$DESTDIR/usr \ 3.21 + --libdir=$DESTDIR/usr/lib \ 3.22 + --includedir=$DESTDIR/usr/include \ 3.23 --without-icu && 3.24 EXPAT_INCLUDE=/usr/include \ 3.25 EXPAT_LIBPATH=/usr/lib \ 3.26 ./bjam \ 3.27 - --prefix=$src/_pkg/usr \ 3.28 - --exec-prefix=$src/_pkg/usr \ 3.29 - --libdir=$src/_pkg/usr/lib \ 3.30 - --includedir=$src/_pkg/usr/include \ 3.31 + --prefix=$DESTDIR/usr \ 3.32 + --exec-prefix=$DESTDIR/usr \ 3.33 + --libdir=$DESTDIR/usr/lib \ 3.34 + --includedir=$DESTDIR/usr/include \ 3.35 --build-type=minimal \ 3.36 install 3.37 - mv $src/_pkg/usr/include/boost-1_45/boost $src/_pkg/usr/include && 3.38 - rm -r -f $src/_pkg/usr/include/boost-1_45 3.39 3.40 # create the missing links to the shared libs 3.41 - cd $src/_pkg/usr/lib 3.42 + cd $DESTDIR/usr/lib 3.43 for i in `ls *-mt.so`; do 3.44 boost_tmp=`echo $i | sed s/-gcc.*-mt//g` 3.45 boost_tmp_mt=`echo $i | sed s/-gcc.*-mt/-mt/g` 3.46 @@ -88,9 +80,8 @@ 3.47 mkdir -p $fs/usr 3.48 cp -a $_pkg/usr/lib $fs/usr 3.49 cp -a $_pkg/usr/include $fs/usr 3.50 - 3.51 for i in $RELOCATE_LIBS; do 3.52 - rm -f $fs/usr/lib/*$i* 3.53 - rm -r -f $fs/usr/include/boost/*$i* 3.54 + rm -f $fs/usr/lib/*$i* 3.55 + rm -r -f $fs/usr/include/boost/*$i* 3.56 done 3.57 }
4.1 --- a/libboost-doc/receipt Tue Feb 01 02:53:04 2011 +0100 4.2 +++ b/libboost-doc/receipt Tue Feb 01 02:55:20 2011 +0100 4.3 @@ -15,7 +15,5 @@ 4.4 genpkg_rules() 4.5 { 4.6 mkdir -p $fs/usr/share/doc/$SOURCE 4.7 - 4.8 - src=$WOK/$WANTED/$SOURCE-$VERSION 4.9 cp -a $src/doc/html/* $fs/usr/share/doc/$SOURCE 4.10 }
5.1 --- a/libboost-filesystem-dev/receipt Tue Feb 01 02:53:04 2011 +0100 5.2 +++ b/libboost-filesystem-dev/receipt Tue Feb 01 02:55:20 2011 +0100 5.3 @@ -17,8 +17,6 @@ 5.4 genpkg_rules() 5.5 { 5.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 5.7 - 5.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 5.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 5.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 5.11 }
6.1 --- a/libboost-filesystem/receipt Tue Feb 01 02:53:04 2011 +0100 6.2 +++ b/libboost-filesystem/receipt Tue Feb 01 02:55:20 2011 +0100 6.3 @@ -17,7 +17,5 @@ 6.4 genpkg_rules() 6.5 { 6.6 mkdir -p $fs/usr/lib 6.7 - 6.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 6.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 6.10 }
7.1 --- a/libboost-graph-dev/receipt Tue Feb 01 02:53:04 2011 +0100 7.2 +++ b/libboost-graph-dev/receipt Tue Feb 01 02:55:20 2011 +0100 7.3 @@ -17,8 +17,6 @@ 7.4 genpkg_rules() 7.5 { 7.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 7.7 - 7.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 7.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 7.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 7.11 }
8.1 --- a/libboost-graph/receipt Tue Feb 01 02:53:04 2011 +0100 8.2 +++ b/libboost-graph/receipt Tue Feb 01 02:55:20 2011 +0100 8.3 @@ -17,7 +17,5 @@ 8.4 genpkg_rules() 8.5 { 8.6 mkdir -p $fs/usr/lib 8.7 - 8.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 8.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 8.10 }
9.1 --- a/libboost-iostreams-dev/receipt Tue Feb 01 02:53:04 2011 +0100 9.2 +++ b/libboost-iostreams-dev/receipt Tue Feb 01 02:55:20 2011 +0100 9.3 @@ -17,8 +17,6 @@ 9.4 genpkg_rules() 9.5 { 9.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 9.7 - 9.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 9.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 9.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 9.11 }
10.1 --- a/libboost-iostreams/receipt Tue Feb 01 02:53:04 2011 +0100 10.2 +++ b/libboost-iostreams/receipt Tue Feb 01 02:55:20 2011 +0100 10.3 @@ -17,7 +17,5 @@ 10.4 genpkg_rules() 10.5 { 10.6 mkdir -p $fs/usr/lib 10.7 - 10.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 10.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 10.10 }
11.1 --- a/libboost-math-dev/receipt Tue Feb 01 02:53:04 2011 +0100 11.2 +++ b/libboost-math-dev/receipt Tue Feb 01 02:55:20 2011 +0100 11.3 @@ -17,8 +17,6 @@ 11.4 genpkg_rules() 11.5 { 11.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 11.7 - 11.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 11.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 11.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 11.11 }
12.1 --- a/libboost-math/receipt Tue Feb 01 02:53:04 2011 +0100 12.2 +++ b/libboost-math/receipt Tue Feb 01 02:55:20 2011 +0100 12.3 @@ -16,8 +16,6 @@ 12.4 genpkg_rules() 12.5 { 12.6 mkdir -p $fs/usr/lib 12.7 - 12.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 12.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 12.10 12.11 # math_tr1 is packaged as tr1 (based on the include dir name)
13.1 --- a/libboost-program-options-dev/receipt Tue Feb 01 02:53:04 2011 +0100 13.2 +++ b/libboost-program-options-dev/receipt Tue Feb 01 02:55:20 2011 +0100 13.3 @@ -17,8 +17,6 @@ 13.4 genpkg_rules() 13.5 { 13.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 13.7 - 13.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 13.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 13.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 13.11 }
14.1 --- a/libboost-program-options/receipt Tue Feb 01 02:53:04 2011 +0100 14.2 +++ b/libboost-program-options/receipt Tue Feb 01 02:55:20 2011 +0100 14.3 @@ -16,7 +16,5 @@ 14.4 genpkg_rules() 14.5 { 14.6 mkdir -p $fs/usr/lib 14.7 - 14.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 14.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 14.10 }
15.1 --- a/libboost-python-dev/receipt Tue Feb 01 02:53:04 2011 +0100 15.2 +++ b/libboost-python-dev/receipt Tue Feb 01 02:55:20 2011 +0100 15.3 @@ -17,8 +17,6 @@ 15.4 genpkg_rules() 15.5 { 15.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 15.7 - 15.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 15.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 15.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 15.11 }
16.1 --- a/libboost-python/receipt Tue Feb 01 02:53:04 2011 +0100 16.2 +++ b/libboost-python/receipt Tue Feb 01 02:55:20 2011 +0100 16.3 @@ -16,7 +16,5 @@ 16.4 genpkg_rules() 16.5 { 16.6 mkdir -p $fs/usr/lib 16.7 - 16.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 16.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 16.10 }
17.1 --- a/libboost-regex-dev/receipt Tue Feb 01 02:53:04 2011 +0100 17.2 +++ b/libboost-regex-dev/receipt Tue Feb 01 02:55:20 2011 +0100 17.3 @@ -17,8 +17,6 @@ 17.4 genpkg_rules() 17.5 { 17.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 17.7 - 17.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 17.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 17.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 17.11 }
18.1 --- a/libboost-regex/receipt Tue Feb 01 02:53:04 2011 +0100 18.2 +++ b/libboost-regex/receipt Tue Feb 01 02:55:20 2011 +0100 18.3 @@ -17,7 +17,5 @@ 18.4 genpkg_rules() 18.5 { 18.6 mkdir -p $fs/usr/lib 18.7 - 18.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 18.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 18.10 }
19.1 --- a/libboost-serialization-dev/receipt Tue Feb 01 02:53:04 2011 +0100 19.2 +++ b/libboost-serialization-dev/receipt Tue Feb 01 02:55:20 2011 +0100 19.3 @@ -17,8 +17,6 @@ 19.4 genpkg_rules() 19.5 { 19.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 19.7 - 19.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 19.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 19.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 19.11 }
20.1 --- a/libboost-serialization/receipt Tue Feb 01 02:53:04 2011 +0100 20.2 +++ b/libboost-serialization/receipt Tue Feb 01 02:55:20 2011 +0100 20.3 @@ -16,7 +16,5 @@ 20.4 genpkg_rules() 20.5 { 20.6 mkdir -p $fs/usr/lib 20.7 - 20.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 20.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 20.10 }
21.1 --- a/libboost-signals-dev/receipt Tue Feb 01 02:53:04 2011 +0100 21.2 +++ b/libboost-signals-dev/receipt Tue Feb 01 02:55:20 2011 +0100 21.3 @@ -17,8 +17,6 @@ 21.4 genpkg_rules() 21.5 { 21.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 21.7 - 21.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 21.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 21.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 21.11 }
22.1 --- a/libboost-signals/receipt Tue Feb 01 02:53:04 2011 +0100 22.2 +++ b/libboost-signals/receipt Tue Feb 01 02:55:20 2011 +0100 22.3 @@ -16,7 +16,5 @@ 22.4 genpkg_rules() 22.5 { 22.6 mkdir -p $fs/usr/lib 22.7 - 22.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 22.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 22.10 }
23.1 --- a/libboost-system-dev/receipt Tue Feb 01 02:53:04 2011 +0100 23.2 +++ b/libboost-system-dev/receipt Tue Feb 01 02:55:20 2011 +0100 23.3 @@ -17,8 +17,6 @@ 23.4 genpkg_rules() 23.5 { 23.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 23.7 - 23.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 23.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 23.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 23.11 }
24.1 --- a/libboost-system/receipt Tue Feb 01 02:53:04 2011 +0100 24.2 +++ b/libboost-system/receipt Tue Feb 01 02:55:20 2011 +0100 24.3 @@ -16,7 +16,5 @@ 24.4 genpkg_rules() 24.5 { 24.6 mkdir -p $fs/usr/lib 24.7 - 24.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 24.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 24.10 }
25.1 --- a/libboost-test-dev/receipt Tue Feb 01 02:53:04 2011 +0100 25.2 +++ b/libboost-test-dev/receipt Tue Feb 01 02:55:20 2011 +0100 25.3 @@ -17,8 +17,6 @@ 25.4 genpkg_rules() 25.5 { 25.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 25.7 - 25.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 25.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 25.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 25.11 }
26.1 --- a/libboost-test/receipt Tue Feb 01 02:53:04 2011 +0100 26.2 +++ b/libboost-test/receipt Tue Feb 01 02:55:20 2011 +0100 26.3 @@ -16,7 +16,5 @@ 26.4 genpkg_rules() 26.5 { 26.6 mkdir -p $fs/usr/lib 26.7 - 26.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 26.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 26.10 }
27.1 --- a/libboost-thread-dev/receipt Tue Feb 01 02:53:04 2011 +0100 27.2 +++ b/libboost-thread-dev/receipt Tue Feb 01 02:55:20 2011 +0100 27.3 @@ -17,8 +17,6 @@ 27.4 genpkg_rules() 27.5 { 27.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 27.7 - 27.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 27.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 27.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 27.11 }
28.1 --- a/libboost-thread/receipt Tue Feb 01 02:53:04 2011 +0100 28.2 +++ b/libboost-thread/receipt Tue Feb 01 02:55:20 2011 +0100 28.3 @@ -16,7 +16,5 @@ 28.4 genpkg_rules() 28.5 { 28.6 mkdir -p $fs/usr/lib 28.7 - 28.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 28.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 28.10 }
29.1 --- a/libboost-tr1-dev/receipt Tue Feb 01 02:53:04 2011 +0100 29.2 +++ b/libboost-tr1-dev/receipt Tue Feb 01 02:55:20 2011 +0100 29.3 @@ -17,8 +17,6 @@ 29.4 genpkg_rules() 29.5 { 29.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 29.7 - 29.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 29.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 29.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 29.11 }
30.1 --- a/libboost-tr1/receipt Tue Feb 01 02:53:04 2011 +0100 30.2 +++ b/libboost-tr1/receipt Tue Feb 01 02:55:20 2011 +0100 30.3 @@ -16,7 +16,5 @@ 30.4 genpkg_rules() 30.5 { 30.6 mkdir -p $fs/usr/lib 30.7 - 30.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 30.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 30.10 }
31.1 --- a/libboost-wave-dev/receipt Tue Feb 01 02:53:04 2011 +0100 31.2 +++ b/libboost-wave-dev/receipt Tue Feb 01 02:55:20 2011 +0100 31.3 @@ -16,8 +16,6 @@ 31.4 genpkg_rules() 31.5 { 31.6 mkdir -p $fs/usr/lib $fs/usr/include/$SOURCE 31.7 - 31.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 31.9 cp -a $_pkg/usr/include/$SOURCE/*$LIB_NAME* $fs/usr/include/boost 31.10 cp -a $_pkg/usr/lib/*$LIB_NAME*.*a $fs/usr/lib 31.11 }
32.1 --- a/libboost-wave/receipt Tue Feb 01 02:53:04 2011 +0100 32.2 +++ b/libboost-wave/receipt Tue Feb 01 02:55:20 2011 +0100 32.3 @@ -17,7 +17,5 @@ 32.4 genpkg_rules() 32.5 { 32.6 mkdir -p $fs/usr/lib 32.7 - 32.8 - _pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg 32.9 cp -a $_pkg/usr/lib/*$LIB_NAME*.so* $fs/usr/lib 32.10 }