wok diff apr/receipt @ rev 18201

Up tazpanel (509)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Jul 13 12:03:55 2015 +0200 (2015-07-13)
parents fd9f7e8e6647
children 3017ac7f9219
line diff
     1.1 --- a/apr/receipt	Sun Apr 29 08:18:54 2012 +0200
     1.2 +++ b/apr/receipt	Mon Jul 13 12:03:55 2015 +0200
     1.3 @@ -5,14 +5,16 @@
     1.4  CATEGORY="misc"
     1.5  SHORT_DESC="Apache Portable Runtime Library"
     1.6  MAINTAINER="lehswe@gmail.com"
     1.7 -DEPENDS="util-linux-uuid"
     1.8 -BUILD_DEPENDS="util-linux-uuid-dev"
     1.9 +LICENSE="Apache"
    1.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.11  WEB_SITE="http://apr.apache.org"
    1.12  WGET_URL="http://mir2.ovh.net/ftp.apache.org/dist/$PACKAGE/$TARBALL
    1.13   http://apache.crihan.fr/dist/$PACKAGE/$TARBALL"
    1.14  CROSS="error: cannot check for file existence when cross compiling"
    1.15  
    1.16 +DEPENDS="util-linux-uuid"
    1.17 +BUILD_DEPENDS="util-linux-uuid-dev"
    1.18 +
    1.19  # Rules to configure and make the package.
    1.20  compile_rules()
    1.21  {
    1.22 @@ -23,7 +25,7 @@
    1.23  		--enable-nonportable-atomics \
    1.24  		--with-devrandom \
    1.25  		--build=$HOST_SYSTEM \
    1.26 -		--host=$HOST_SYSTEM &&
    1.27 +		--host=$HOST_SYSTEM 2>&1 | grep -v '/libtool:' &&
    1.28  	make && make install
    1.29  }
    1.30  
    1.31 @@ -31,7 +33,7 @@
    1.32  genpkg_rules()
    1.33  {
    1.34  	mkdir -p $fs/usr/lib
    1.35 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    1.36 -	cp -a $_pkg/usr/lib/*.exp $fs/usr/lib
    1.37 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.38 +	cp -a $install/usr/lib/*.exp $fs/usr/lib
    1.39  }
    1.40