wok-next diff gcc+gcj/receipt @ rev 18830
linux64-module-headers: avoid depmod during install
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Jan 18 15:29:48 2016 +0100 (2016-01-18) |
parents | 9e01bc6321ea |
children | 5b16e60b3d24 |
line diff
1.1 --- a/gcc+gcj/receipt Sun Dec 20 15:13:45 2015 +0100 1.2 +++ b/gcc+gcj/receipt Mon Jan 18 15:29:48 2016 +0100 1.3 @@ -26,7 +26,6 @@ 1.4 # Rules to configure and make the package. 1.5 compile_rules() 1.6 { 1.7 - cd $src 1.8 sed -i 's/@mkdir_p@/mkdir -p/' libjava/classpath/lib/copy-vmresources.sh.in 1.9 # Set HOST_SYSTEM if not defined in tazwok.conf as it should be 1.10 if [ -z "$HOST_SYSTEM" ] ; then 1.11 @@ -52,10 +51,10 @@ 1.12 # Use libiberty.a from binutils. 1.13 sed -i 's/install_to_$(INSTALL_DEST) //' \ 1.14 $src/libiberty/Makefile.in || return 1 1.15 - mkdir -p ../build && cd ../build 1.16 + mkdir -p ../build && cd ../build 1.17 1.18 - PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 1.19 - ../${src##*/}/configure --prefix=/usr --libexecdir=/usr/lib \ 1.20 + PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 1.21 + ../${src##*/}/configure --prefix=/usr --libexecdir=/usr/lib \ 1.22 --infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \ 1.23 --enable-languages=c,c++,objc,java --enable-shared \ 1.24 --with-system-zlib \ 1.25 @@ -69,10 +68,10 @@ 1.26 --enable-gtk-cairo \ 1.27 --enable-lto \ 1.28 $CONFIGURE_ARGS $GCC_TARGET && 1.29 - make bootstrap && 1.30 - # Make install in the source tree to help creating derived pkgs 1.31 - # and keep $_pkg variable set for genpkg. 1.32 - make install 1.33 + make bootstrap && 1.34 + # Make install in the source tree to help creating derived pkgs 1.35 + # and keep $_pkg variable set for genpkg. 1.36 + make install 1.37 } 1.38 1.39 # Rules to gen a SliTaz package suitable for Tazpkg. 1.40 @@ -80,23 +79,22 @@ 1.41 { 1.42 mkdir -p $fs/usr/share 1.43 cp -a $install/usr/share/java $fs/usr/share 1.44 - cp -a $install/usr/bin $fs/usr 1.45 - # Copy all libs. Remove libgcc_s.so and libstdc++.so 1.46 - # they goes in gcc-lib-base-$VERSION package. 1.47 - cp -a $install/usr/lib $fs/usr 1.48 - rm $fs/usr/lib/libgcc_s.so* 1.49 - rm $fs/usr/lib/libstdc++.so* 1.50 - rm $fs/usr/lib/libgomp.so* 1.51 - #rm $fs/usr/lib/gcj-$VERSION-11/*.la 1.52 - rm $fs/usr/lib/*.la 1.53 - # Include files. 1.54 - cp -a $install/usr/include $fs/usr 1.55 + cp -a $install/usr/bin $fs/usr 1.56 + # Copy all libs. Remove libgcc_s.so and libstdc++.so 1.57 + # they goes in gcc-lib-base-$VERSION package. 1.58 + cp -a $install/usr/lib $fs/usr 1.59 + rm $fs/usr/lib/libgcc_s.so* 1.60 + rm $fs/usr/lib/libstdc++.so* 1.61 + rm $fs/usr/lib/libgomp.so* 1.62 + #rm $fs/usr/lib/gcj-$VERSION-11/*.la 1.63 + rm $fs/usr/lib/*.la 1.64 + # Include files. 1.65 + cp -a $install/usr/include $fs/usr 1.66 } 1.67 1.68 # Post install commands for Tazpkg. 1.69 post_install() 1.70 { 1.71 - echo "Processing post-install commands..." 1.72 if [ ! -f "$1/lib/cpp" ] ; then 1.73 ln -s ../usr/bin/cpp "$1/lib" 1.74 fi