wok rev 16079

ARM: add more *usb* support and unixODBC
author Christophe Lincoln <pankso@slitaz.org>
date Sat Mar 15 05:33:56 2014 +0100 (2014-03-15)
parents 236ff5a1c6f0
children 5455fda86893
files libunixODBC/receipt libusb-compat-dev/receipt libusb-compat/receipt libusb-dev/receipt libusb/receipt nano/receipt php/receipt unixODBC-dev/receipt unixODBC/receipt usbids/receipt usbutils/receipt
line diff
     1.1 --- a/libunixODBC/receipt	Sat Mar 15 03:41:10 2014 +0100
     1.2 +++ b/libunixODBC/receipt	Sat Mar 15 05:33:56 2014 +0100
     1.3 @@ -8,6 +8,7 @@
     1.4  LICENSE="LGPL2.1"
     1.5  WEB_SITE="http://www.unixodbc.org/"
     1.6  WANTED="unixODBC"
     1.7 +HOST_ARCH="i486 arm"
     1.8  
     1.9  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.10  genpkg_rules()
     2.1 --- a/libusb-compat-dev/receipt	Sat Mar 15 03:41:10 2014 +0100
     2.2 +++ b/libusb-compat-dev/receipt	Sat Mar 15 05:33:56 2014 +0100
     2.3 @@ -8,8 +8,9 @@
     2.4  LICENSE="LGPL2.1"
     2.5  WANTED="libusb-compat"
     2.6  WEB_SITE="http://libusb.sourceforge.net/"
     2.7 +HOST_ARCH="i486 arm"
     2.8  
     2.9 -DEPENDS="pkg-config"
    2.10 +DEPENDS="libusb-compat"
    2.11  
    2.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.13  genpkg_rules()
     3.1 --- a/libusb-compat/receipt	Sat Mar 15 03:41:10 2014 +0100
     3.2 +++ b/libusb-compat/receipt	Sat Mar 15 05:33:56 2014 +0100
     3.3 @@ -9,6 +9,7 @@
     3.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     3.5  WEB_SITE="http://libusb.sourceforge.net/"
     3.6  WGET_URL="$SF_MIRROR/libusb/$TARBALL"
     3.7 +HOST_ARCH="i486 arm"
     3.8  
     3.9  DEPENDS="libusb"
    3.10  BUILD_DEPENDS="libusb-dev"
     4.1 --- a/libusb-dev/receipt	Sat Mar 15 03:41:10 2014 +0100
     4.2 +++ b/libusb-dev/receipt	Sat Mar 15 05:33:56 2014 +0100
     4.3 @@ -8,8 +8,9 @@
     4.4  LICENSE="LGPL2.1"
     4.5  WANTED="libusb"
     4.6  WEB_SITE="http://libusb.sourceforge.net/"
     4.7 +HOST_ARCH="i486 arm"
     4.8  
     4.9 -DEPENDS="libusb libusb-compat-dev pkg-config"
    4.10 +DEPENDS="libusb libusb-compat-dev"
    4.11  
    4.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.13  genpkg_rules()
     5.1 --- a/libusb/receipt	Sat Mar 15 03:41:10 2014 +0100
     5.2 +++ b/libusb/receipt	Sat Mar 15 05:33:56 2014 +0100
     5.3 @@ -9,16 +9,13 @@
     5.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     5.5  WEB_SITE="http://libusb.sourceforge.net/"
     5.6  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     5.7 +HOST_ARCH="i486 arm"
     5.8  
     5.9  # Rules to configure and make the package.
    5.10  compile_rules()
    5.11  {
    5.12 -	cd $src
    5.13 -	./configure \
    5.14 -		--prefix=/usr \
    5.15 -		$CONFIGURE_ARGS &&
    5.16 -	make &&
    5.17 -	make DESTDIR=$DESTDIR install
    5.18 +	./configure $CONFIGURE_ARGS &&
    5.19 +	make && make install
    5.20  }
    5.21  
    5.22  # Rules to gen a SliTaz package suitable for Tazpkg.
     6.1 --- a/nano/receipt	Sat Mar 15 03:41:10 2014 +0100
     6.2 +++ b/nano/receipt	Sat Mar 15 05:33:56 2014 +0100
     6.3 @@ -19,7 +19,13 @@
     6.4  SUGGESTED="gpm"
     6.5  BUILD_DEPENDS="ncursesw-dev"
     6.6  
     6.7 -export LDFLAGS="-L/usr/cross/arm/lib -L/usr/cross/arm/usr/lib"
     6.8 +# Handle cross compilation
     6.9 +case "$ARCH" in
    6.10 +	arm)
    6.11 +		export LDFLAGS="-L/usr/cross/arm/lib -L/usr/cross/arm/usr/lib" 
    6.12 +		BUILD_DEPENDS="ncurses-dev";;
    6.13 +	i?86) ARCH_ARGS="--enable-utf8" ;;
    6.14 +esac
    6.15  
    6.16  # Rules to configure and make the package.
    6.17  compile_rules()
    6.18 @@ -27,10 +33,8 @@
    6.19  	./configure \
    6.20  		--sysconfdir=/etc \
    6.21  		--localstatedir=/var \
    6.22 -		--enable-utf8 \
    6.23 -		$CONFIGURE_ARGS &&
    6.24 -	make &&
    6.25 -	make install
    6.26 +		$CONFIGURE_ARGS $ARCH_ARGS &&
    6.27 +	make && make install
    6.28  }
    6.29  
    6.30  # Rules to gen a SliTaz package suitable for Tazpkg.
     7.1 --- a/php/receipt	Sat Mar 15 03:41:10 2014 +0100
     7.2 +++ b/php/receipt	Sat Mar 15 05:33:56 2014 +0100
     7.3 @@ -10,6 +10,7 @@
     7.4  WEB_SITE="http://www.php.net/"
     7.5  WGET_URL="http://www.php.net/distributions/$TARBALL"
     7.6  PROVIDE="php:lighttpd"
     7.7 +#HOST_ARCH="i486 arm"
     7.8  
     7.9  DEPENDS="php-common lighttpd zlib libxml2 sqlite libssl"
    7.10  BUILD_DEPENDS="sqlite-dev libxml2-dev zlib-dev libmysqlclient mysql-dev \
    7.11 @@ -18,56 +19,85 @@
    7.12  libldap apr-dev libmcrypt-dev curl-dev cyrus-sasl-dev perl pkg-config \
    7.13  jpeg-dev net-snmp-dev libvpx-dev apache coreutils-conditions sed re2c"
    7.14  
    7.15 +case "$ARCH" in
    7.16 +	i?86)
    7.17 +		ARCH_ARGS="\
    7.18 +			--prefix=/usr \
    7.19 +			--sysconfdir=/etc \
    7.20 +			--infodir=/usr/share/info \
    7.21 +			--mandir=/usr/share/man \
    7.22 +			--enable-mbstring \
    7.23 +			--enable-sockets \
    7.24 +			--enable-ftp \
    7.25 +			--enable-zip \
    7.26 +			--enable-calendar \
    7.27 +			--enable-exif \
    7.28 +			--config-cache \
    7.29 +			--enable-dba=shared \
    7.30 +			--with-config-file-path=/etc \
    7.31 +			--with-zlib \
    7.32 +			--with-gettext \
    7.33 +			--with-mcrypt=shared,/usr \
    7.34 +			--with-mysql=shared,/usr \
    7.35 +			--with-mysqli=shared \
    7.36 +			--with-mysql-sock=/var/mysql/mysql.sock \
    7.37 +			--with-pdo-sqlite=shared,/usr \
    7.38 +			--with-pgsql=shared,/usr \
    7.39 +			--with-snmp=shared,/usr \
    7.40 +			--enable-soap=shared,/usr \
    7.41 +			--with-ldap=shared \
    7.42 +			--with-imap=shared \
    7.43 +			--with-imap-ssl \
    7.44 +			--with-mhash \
    7.45 +			--with-gd=shared \
    7.46 +			--with-jpeg-dir=/usr \
    7.47 +			--with-png-dir=/usr \
    7.48 +			--with-vpx-dir=/usr \
    7.49 +			--with-openssl=shared \
    7.50 +			--with-unixODBC=shared,/usr \
    7.51 +			--with-pear=/usr/share/php \
    7.52 +			--with-pdo-mysql=shared \
    7.53 +			--with-pdo-pgsql=shared \
    7.54 +			--with-curl=shared \
    7.55 +			--enable-sqlite-utf8 \
    7.56 +			--with-sqlite3=shared,/usr \
    7.57 +			--with-sqlite=shared \
    7.58 +			--enable-maintainer-zts" ;;
    7.59 +	arm*)
    7.60 +		BUILD_DEPENDS="sqlite-dev libxml2-dev zlib-dev curl-dev"
    7.61 +		ARCH_ARGS="\
    7.62 +			--prefix=/usr \
    7.63 +			--sysconfdir=/etc \
    7.64 +			--infodir=/usr/share/info \
    7.65 +			--mandir=/usr/share/man \
    7.66 +			--config-cache \
    7.67 +			--enable-mbstring \
    7.68 +			--enable-sockets \
    7.69 +			--enable-ftp \
    7.70 +			--enable-zip \
    7.71 +			--enable-calendar \
    7.72 +			--enable-exif \
    7.73 +			--enable-dba=shared \
    7.74 +			--enable-sqlite-utf8 \
    7.75 +			--with-mhash \
    7.76 +			--with-sqlite=shared \
    7.77 +			--with-config-file-path=/etc \
    7.78 +			--with-zlib \
    7.79 +			--with-gettext \
    7.80 +			--with-curl=shared \
    7.81 +			--with-openssl=shared \
    7.82 +			--with-jpeg-dir=/usr \
    7.83 +			--with-png-dir=/usr \
    7.84 +			--with-apxs2=/usr/bin/apxs" ;;
    7.85 +esac
    7.86 +
    7.87  # Rules to configure and make the package.
    7.88  compile_rules()
    7.89  {
    7.90 -	cd $src
    7.91 -	COMMON_ARGS="\
    7.92 ---prefix=/usr \
    7.93 ---sysconfdir=/etc \
    7.94 ---infodir=/usr/share/info \
    7.95 ---mandir=/usr/share/man \
    7.96 ---enable-mbstring \
    7.97 ---enable-sockets \
    7.98 ---enable-ftp \
    7.99 ---enable-zip \
   7.100 ---enable-calendar \
   7.101 ---enable-exif \
   7.102 ---config-cache \
   7.103 ---enable-dba=shared \
   7.104 ---with-config-file-path=/etc \
   7.105 ---with-zlib \
   7.106 ---with-gettext \
   7.107 ---with-mcrypt=shared,/usr \
   7.108 ---with-mysql=shared,/usr \
   7.109 ---with-mysqli=shared \
   7.110 ---with-mysql-sock=/var/mysql/mysql.sock \
   7.111 ---with-pdo-sqlite=shared,/usr \
   7.112 ---with-pgsql=shared,/usr \
   7.113 ---with-snmp=shared,/usr \
   7.114 ---enable-soap=shared,/usr \
   7.115 ---with-ldap=shared \
   7.116 ---with-imap=shared --with-imap-ssl \
   7.117 ---with-mhash \
   7.118 ---with-gd=shared \
   7.119 ---with-jpeg-dir=/usr \
   7.120 ---with-png-dir=/usr \
   7.121 ---with-vpx-dir=/usr \
   7.122 ---with-openssl=shared \
   7.123 ---with-unixODBC=shared,/usr \
   7.124 ---with-pear=/usr/share/php \
   7.125 ---with-pdo-mysql=shared \
   7.126 ---with-pdo-pgsql=shared \
   7.127 ---with-curl=shared \
   7.128 ---enable-sqlite-utf8 \
   7.129 ---with-sqlite3=shared,/usr \
   7.130 ---with-sqlite=shared \
   7.131 ---enable-maintainer-zts \
   7.132 -"
   7.133  	sed -i 's/pam_start/pam_nostart/' configure
   7.134  	./configure $COMMON_ARGS $CONFIGURE_ARGS && \
   7.135  	make $MAKEFLAGS && make -j1 INSTALL_ROOT=$DESTDIR install
   7.136 -	./configure $COMMON_ARGS $CONFIGURE_ARGS --with-apxs2=/usr/bin/apxs && \
   7.137 +	./configure $ARCH_ARGS $CONFIGURE_ARGS --with-apxs2=/usr/bin/apxs && \
   7.138  	make $MAKEFLAGS && {
   7.139  		mkdir -p $DESTDIR/etc/apache
   7.140  		cp /etc/apache/httpd.conf $DESTDIR/etc/apache/httpd.conf
     8.1 --- a/unixODBC-dev/receipt	Sat Mar 15 03:41:10 2014 +0100
     8.2 +++ b/unixODBC-dev/receipt	Sat Mar 15 05:33:56 2014 +0100
     8.3 @@ -8,6 +8,7 @@
     8.4  LICENSE="LGPL2.1"
     8.5  WEB_SITE="http://www.unixodbc.org/"
     8.6  WANTED="unixODBC"
     8.7 +HOST_ARCH="i486 arm"
     8.8  
     8.9  DEPENDS="unixODBC"
    8.10  
     9.1 --- a/unixODBC/receipt	Sat Mar 15 03:41:10 2014 +0100
     9.2 +++ b/unixODBC/receipt	Sat Mar 15 05:33:56 2014 +0100
     9.3 @@ -10,16 +10,18 @@
     9.4  WEB_SITE="http://www.unixodbc.org/"
     9.5  WGET_URL="${WEB_SITE}$TARBALL"
     9.6  TAGS="database"
     9.7 +HOST_ARCH="i486 arm"
     9.8  
     9.9  DEPENDS="libunixODBC readline"
    9.10 +DEPENDS="readline-dev"
    9.11  
    9.12  # Rules to configure and make the package.
    9.13  compile_rules()
    9.14  {
    9.15 -	cd $src
    9.16 -	./configure --prefix=/usr --infodir=/usr/share/info \
    9.17 -	--disable-gui --sysconfdir=/etc \
    9.18 -	--mandir=/usr/share/man $CONFIGURE_ARGS &&
    9.19 +	./configure \
    9.20 +		--sysconfdir=/etc \
    9.21 +		--disable-gui \
    9.22 +		$CONFIGURE_ARGS &&
    9.23  	make $MAKEFLAGS &&
    9.24  	make DESTDIR=$DESTDIR install
    9.25  }
    10.1 --- a/usbids/receipt	Sat Mar 15 03:41:10 2014 +0100
    10.2 +++ b/usbids/receipt	Sat Mar 15 05:33:56 2014 +0100
    10.3 @@ -1,24 +1,21 @@
    10.4  # SliTaz package receipt.
    10.5  
    10.6  PACKAGE="usbids"
    10.7 -VERSION="20130310"
    10.8 +VERSION="20140315"
    10.9  CATEGORY="misc"
   10.10  SHORT_DESC="usb.ids file"
   10.11  MAINTAINER="slaxemulator@gmail.com"
   10.12  LICENSE="PublicDomain"
   10.13 -DEPENDS=""
   10.14  TARBALL="usb-$VERSION.ids"
   10.15  WEB_SITE="http://www.linux-usb.org/"
   10.16  WGET_URL="${WEB_SITE}usb.ids"
   10.17 +HOST_ARCH="i486 arm"
   10.18  
   10.19  # Rules to gen a SliTaz package suitable for Tazpkg.
   10.20  genpkg_rules()
   10.21  {
   10.22  	mkdir -p $fs/usr/share/misc
   10.23  	cp -a $src/usb-$VERSION.ids $fs/usr/share/misc/usb.ids
   10.24 -	gzip $fs/usr/share/misc/usb.ids
   10.25 -        # lsusb from usbutils needs this symlink to find usb.ids  
   10.26 -        cd $fs/usr/share
   10.27 -        ln -s /usr/share/misc/usb.ids.gz  
   10.28 +	gzip $fs/usr/share/misc/usb.ids 
   10.29  }
   10.30  
    11.1 --- a/usbutils/receipt	Sat Mar 15 03:41:10 2014 +0100
    11.2 +++ b/usbutils/receipt	Sat Mar 15 05:33:56 2014 +0100
    11.3 @@ -10,15 +10,15 @@
    11.4  WEB_SITE="http://linux-usb.sourceforge.net/"
    11.5  #WGET_URL="http://www.kernel.org/pub/linux/utils/usb/$PACKAGE/$TARBALL"
    11.6  WGET_URL="http://sourceware.mirrors.tds.net/pub/kernel.org/linux/utils/usb/$PACKAGE/$TARBALL"
    11.7 +HOST_ARCH="i486 arm"
    11.8 +
    11.9  TAGS="usb"
   11.10 -
   11.11  DEPENDS="glibc-base libusb libusb-compat zlib usbids"
   11.12  BUILD_DEPENDS="libusb-dev pkg-config zlib-dev"
   11.13  
   11.14  # Rules to configure and make the package.
   11.15  compile_rules()
   11.16  {
   11.17 -	cd $src
   11.18  	./configure \
   11.19  		--prefix=/usr \
   11.20  		--libdir=/usr/lib \
   11.21 @@ -43,8 +43,6 @@
   11.22  #
   11.23  pre_install()
   11.24  {
   11.25 -	local root
   11.26 -	root=$1
   11.27  	echo "Processing pre-install commands..."
   11.28  	echo -n "Removing Busybox lsusb... "
   11.29  	rm -f $root/usr/bin/lsusb