wok rev 16221
ruby fix duplicated files ARM add libcroco, libgsf
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Mon Mar 31 23:12:38 2014 +0200 (2014-03-31) |
parents | dad87079f1a0 |
children | 88af587617c4 |
files | libcroco-dev/receipt libcroco/receipt libgsf-dev/receipt libgsf/receipt libruby-extras/receipt libruby/receipt ruby/receipt rubygems/receipt |
line diff
1.1 --- a/libcroco-dev/receipt Mon Mar 31 20:28:51 2014 +0000 1.2 +++ b/libcroco-dev/receipt Mon Mar 31 23:12:38 2014 +0200 1.3 @@ -8,6 +8,7 @@ 1.4 LICENSE="LGPL2" 1.5 WANTED="libcroco" 1.6 WEB_SITE="http://www.freespiders.org/projects/libcroco/" 1.7 +HOST_ARCH="i486 arm" 1.8 1.9 DEPENDS="libcroco pkg-config" 1.10
2.1 --- a/libcroco/receipt Mon Mar 31 20:28:51 2014 +0000 2.2 +++ b/libcroco/receipt Mon Mar 31 23:12:38 2014 +0200 2.3 @@ -9,6 +9,7 @@ 2.4 TARBALL="$PACKAGE-$VERSION.tar.xz" 2.5 WEB_SITE="http://www.freespiders.org/projects/libcroco/" 2.6 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:3}/$TARBALL" 2.7 +HOST_ARCH="i486 arm" 2.8 2.9 DEPENDS="libxml2 glib zlib" 2.10 BUILD_DEPENDS="libxml2-dev glib-dev zlib-dev" 2.11 @@ -16,11 +17,9 @@ 2.12 # Rules to configure and make the package. 2.13 compile_rules() 2.14 { 2.15 - cd $src 2.16 ./configure \ 2.17 $CONFIGURE_ARGS && 2.18 - make && 2.19 - make DESTDIR=$DESTDIR install 2.20 + make && make install 2.21 } 2.22 2.23 # Rules to gen a SliTaz package suitable for Tazpkg.
3.1 --- a/libgsf-dev/receipt Mon Mar 31 20:28:51 2014 +0000 3.2 +++ b/libgsf-dev/receipt Mon Mar 31 23:12:38 2014 +0200 3.3 @@ -8,6 +8,7 @@ 3.4 LICENSE="GPL2" 3.5 WANTED="libgsf" 3.6 WEB_SITE="http://freshmeat.net/projects/libgsf/" 3.7 +HOST_ARCH="i486 arm" 3.8 3.9 DEPENDS="libgsf pkg-config" 3.10
4.1 --- a/libgsf/receipt Mon Mar 31 20:28:51 2014 +0000 4.2 +++ b/libgsf/receipt Mon Mar 31 23:12:38 2014 +0200 4.3 @@ -9,14 +9,19 @@ 4.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 4.5 WEB_SITE="http://freshmeat.net/projects/libgsf/" 4.6 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 4.7 +HOST_ARCH="i486 arm" 4.8 4.9 -DEPENDS="gtk+ bzlib" 4.10 -BUILD_DEPENDS="libgio libgio-dev intltool pkg-config glib-dev libxml2-dev zlib-dev" 4.11 +DEPENDS="libgio bzlib libxml2 " 4.12 +BUILD_DEPENDS="libgio-dev glib-dev libxml2-dev zlib-dev" 4.13 + 4.14 +# Handle cross compilation 4.15 +case "$ARCH" in 4.16 + i?86) BUILD_DEPENDS="$BUILD_DEPENDS intltool" ;; 4.17 +esac 4.18 4.19 # Rules to configure and make the package. 4.20 compile_rules() 4.21 { 4.22 - cd $src 4.23 ./configure \ 4.24 --with-html-dir=/usr/share/doc \ 4.25 --without-bonobo \
5.1 --- a/libruby-extras/receipt Mon Mar 31 20:28:51 2014 +0000 5.2 +++ b/libruby-extras/receipt Mon Mar 31 23:12:38 2014 +0200 5.3 @@ -10,11 +10,11 @@ 5.4 WANTED="ruby" 5.5 HOST_ARCH="i486 arm" 5.6 5.7 -DEPENDS="libruby" 5.8 +DEPENDS="ruby" 5.9 5.10 # Rules to gen a SliTaz package suitable for Tazpkg. 5.11 genpkg_rules() 5.12 { 5.13 - mkdir -p $fs/usr/lib/ 5.14 + mkdir -p $fs/usr/lib 5.15 cp -a $install/usr/lib/ruby $fs/usr/lib 5.16 }
6.1 --- a/libruby/receipt Mon Mar 31 20:28:51 2014 +0000 6.2 +++ b/libruby/receipt Mon Mar 31 23:12:38 2014 +0200 6.3 @@ -3,7 +3,7 @@ 6.4 PACKAGE="libruby" 6.5 VERSION="1.9.2-p180" 6.6 CATEGORY="development" 6.7 -SHORT_DESC="Ruby libraries." 6.8 +SHORT_DESC="Ruby shared libraries." 6.9 MAINTAINER="pankso@slitaz.org" 6.10 LICENSE="GPL2" 6.11 WEB_SITE="http://www.ruby-lang.org/" 6.12 @@ -15,9 +15,4 @@ 6.13 { 6.14 mkdir -p $fs/usr/lib/ 6.15 cp -a $install/usr/lib/*.so* $fs/usr/lib 6.16 - #cp -a $install/usr/lib/ruby $fs/usr/lib 6.17 - 6.18 - # Remove devel files --> ruby-dev 6.19 - #~ rm $fs/usr/lib/ruby/${VERSION%.*}/i486-linux/*.h 6.20 - #~ rm $fs/usr/lib/ruby/${VERSION%.*}/mkmf.rb 6.21 }
7.1 --- a/ruby/receipt Mon Mar 31 20:28:51 2014 +0000 7.2 +++ b/ruby/receipt Mon Mar 31 23:12:38 2014 +0200 7.3 @@ -13,8 +13,8 @@ 7.4 HOST_ARCH="i486 arm" 7.5 7.6 SUGGESTED="tk" 7.7 -RELATED="libruby libruby-dev libruby-extras ruby-dev" 7.8 -DEPENDS="libdb ncurses openssl readline zlib gdbm" 7.9 +RELATED="libruby libruby-extras ruby-dev" 7.10 +DEPENDS="libruby libdb ncurses openssl readline zlib gdbm" 7.11 BUILD_DEPENDS="zlib-dev tcl-dev openssl-dev db-dev readline-dev" 7.12 7.13 # Handle cross compilation. 7.14 @@ -45,7 +45,5 @@ 7.15 genpkg_rules() 7.16 { 7.17 mkdir -p $fs/usr/lib 7.18 - cp -a $install/usr/lib/ruby $fs/usr/lib 7.19 - cp -a $install/usr/bin $fs/usr 7.20 - cp -a $install/usr/lib/libruby.so* $fs/usr/lib 7.21 + cp -a $install/usr/bin $fs/usr 7.22 }
8.1 --- a/rubygems/receipt Mon Mar 31 20:28:51 2014 +0000 8.2 +++ b/rubygems/receipt Mon Mar 31 23:12:38 2014 +0200 8.3 @@ -14,7 +14,7 @@ 8.4 8.5 # ARM: ruby-dev libruby-extras build host must be installed 8.6 DEPENDS="ruby libruby-extras" 8.7 -BUILD_DEPENDS="ruby ruby-dev libruby-extras" 8.8 +BUILD_DEPENDS="ruby-dev libruby-extras" 8.9 8.10 # Rules to configure and make the package. 8.11 compile_rules()