Navigation

Project: wok

Clone project: hg clone http://hg.slitaz.org/wok

  • Download tarball:
  • bz2
  • gz

Search

wok changeset 15264:21df9c566947

apr: remove wrong error triggers
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Sep 24 21:55:30 2013 +0000 (6 months ago ago)
parents d21c0c760517
children dead8955c3ca
files apr-dev/receipt apr/receipt xine-plugin/receipt
line diff
     1.1 --- a/apr-dev/receipt	Tue Sep 24 17:35:45 2013 +0000
     1.2 +++ b/apr-dev/receipt	Tue Sep 24 21:55:30 2013 +0000
     1.3 @@ -5,19 +5,21 @@
     1.4  CATEGORY="development"
     1.5  SHORT_DESC="Apache Portable Runtime Library dev files"
     1.6  MAINTAINER="lehswe@gmail.com"
     1.7 -DEPENDS="apr bash"
     1.8 +LICENSE="Apache"
     1.9  WANTED="apr"
    1.10  WEB_SITE="http://apr.apache.org"
    1.11  
    1.12 +DEPENDS="apr bash"
    1.13 +
    1.14  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.15  genpkg_rules()
    1.16  {
    1.17  	mkdir -p $fs/usr/lib $fs/usr/share
    1.18  	
    1.19 -	cp -a $_pkg/usr/bin $fs/usr
    1.20 -	cp -a $_pkg/usr/include $fs/usr
    1.21 -	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    1.22 -	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    1.23 -	cp -a $_pkg/usr/share/apr-1 $fs/usr/share
    1.24 +	cp -a $install/usr/bin $fs/usr
    1.25 +	cp -a $install/usr/include $fs/usr
    1.26 +	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.27 +	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.28 +	cp -a $install/usr/share/apr-1 $fs/usr/share
    1.29  }
    1.30  
     2.1 --- a/apr/receipt	Tue Sep 24 17:35:45 2013 +0000
     2.2 +++ b/apr/receipt	Tue Sep 24 21:55:30 2013 +0000
     2.3 @@ -5,14 +5,16 @@
     2.4  CATEGORY="misc"
     2.5  SHORT_DESC="Apache Portable Runtime Library"
     2.6  MAINTAINER="lehswe@gmail.com"
     2.7 -DEPENDS="util-linux-uuid"
     2.8 -BUILD_DEPENDS="util-linux-uuid-dev"
     2.9 +LICENSE="Apache"
    2.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.11  WEB_SITE="http://apr.apache.org"
    2.12  WGET_URL="http://mir2.ovh.net/ftp.apache.org/dist/$PACKAGE/$TARBALL
    2.13   http://apache.crihan.fr/dist/$PACKAGE/$TARBALL"
    2.14  CROSS="error: cannot check for file existence when cross compiling"
    2.15  
    2.16 +DEPENDS="util-linux-uuid"
    2.17 +BUILD_DEPENDS="util-linux-uuid-dev"
    2.18 +
    2.19  # Rules to configure and make the package.
    2.20  compile_rules()
    2.21  {
    2.22 @@ -23,7 +25,7 @@
    2.23  		--enable-nonportable-atomics \
    2.24  		--with-devrandom \
    2.25  		--build=$HOST_SYSTEM \
    2.26 -		--host=$HOST_SYSTEM &&
    2.27 +		--host=$HOST_SYSTEM 2>&1 | grep -v '/libtool:' &&
    2.28  	make && make install
    2.29  }
    2.30  
    2.31 @@ -31,7 +33,7 @@
    2.32  genpkg_rules()
    2.33  {
    2.34  	mkdir -p $fs/usr/lib
    2.35 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    2.36 -	cp -a $_pkg/usr/lib/*.exp $fs/usr/lib
    2.37 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    2.38 +	cp -a $install/usr/lib/*.exp $fs/usr/lib
    2.39  }
    2.40  
     3.1 --- a/xine-plugin/receipt	Tue Sep 24 17:35:45 2013 +0000
     3.2 +++ b/xine-plugin/receipt	Tue Sep 24 21:55:30 2013 +0000
     3.3 @@ -17,6 +17,7 @@
     3.4  compile_rules()
     3.5  {
     3.6  	cd $src
     3.7 +	mkdir -p $DESTDIR/root/.mozilla/plugins
     3.8  	./configure --prefix=/usr \
     3.9  	--mandir=/usr/share/man $CONFIGURE_ARGS &&
    3.10  	make &&