wok-stable rev 5558

ruby: fix compiling issues and receipt; still need to make it busybox compatible with 'cat -e'
author Rohit Joshi <jozee@slitaz.org>
date Thu May 13 14:07:53 2010 -0400 (2010-05-13)
parents c2b3198d2d91
children 39f586a2b014
files ruby-dev/receipt ruby/receipt
line diff
     1.1 --- a/ruby-dev/receipt	Thu May 13 23:51:36 2010 +0200
     1.2 +++ b/ruby-dev/receipt	Thu May 13 14:07:53 2010 -0400
     1.3 @@ -11,8 +11,7 @@
     1.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     1.5  genpkg_rules()
     1.6  {
     1.7 -	mkdir -p $fs/usr/lib/ruby/1.9.1/i486-linux
     1.8 +	mkdir -p $fs/usr/lib/
     1.9  	cp -a $_pkg/usr/lib/*.a $fs/usr/lib
    1.10 -	cp -a $_pkg/usr/lib/ruby/1.9.1/i486-linux/*.h \
    1.11 -		$fs/usr/lib/ruby/1.9.1/i486-linux
    1.12 +	cp -a $_pkg/usr/include $fs/usr
    1.13  }
     2.1 --- a/ruby/receipt	Thu May 13 23:51:36 2010 +0200
     2.2 +++ b/ruby/receipt	Thu May 13 14:07:53 2010 -0400
     2.3 @@ -9,18 +9,15 @@
     2.4  WEB_SITE="http://www.ruby-lang.org/"
     2.5  WGET_URL="ftp://ftp.ruby-lang.org/pub/ruby/${VERSION%.*}/$TARBALL"
     2.6  DEPENDS="libdb ncurses openssl readline zlib tk xorg-libXss gdbm"
     2.7 +BUILD_DEPENDS=" coreutils-file-output-full"
     2.8  TAGS="ruby language programming"
     2.9  
    2.10  # Rules to configure and make the package.
    2.11  compile_rules()
    2.12  {
    2.13  	cd $src
    2.14 -	patch -p1 < ../stuff/openssl-1.0.patch || return 1
    2.15 -	./configure \
    2.16 -		--prefix=/usr \
    2.17 -		--infodir=/usr/share/info \
    2.18 -		--mandir=/usr/share/man \
    2.19 -		$CONFIGURE_ARGS &&
    2.20 +	patch -Np1 < ../stuff/openssl-1.0.patch 
    2.21 +	./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man $CONFIGURE_ARGS && 		 
    2.22  	make &&
    2.23  	make DESTDIR=$PWD/_pkg install
    2.24  }
    2.25 @@ -30,8 +27,6 @@
    2.26  {
    2.27  	mkdir -p $fs/usr/lib
    2.28  	cp -a $_pkg/usr/lib/ruby $fs/usr/lib
    2.29 -	cp -a $_pkg/usr/bin $fs/usr
    2.30 +	cp -a $_pkg/usr/bin $fs/usr	
    2.31  	
    2.32 -	# Remove devel files --> ruby-dev
    2.33 -	rm $fs/usr/lib/ruby/1.9.1/i486-linux/*.h
    2.34  }