wok-next diff gdb/receipt @ rev 20738

Up scons (3.0.1); add scons2 (2.5.1)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue May 29 21:13:51 2018 +0300 (2018-05-29)
parents c3a368c0cddb
children d5aab818505e
line diff
     1.1 --- a/gdb/receipt	Fri Mar 02 03:33:54 2018 +0200
     1.2 +++ b/gdb/receipt	Tue May 29 21:13:51 2018 +0300
     1.3 @@ -12,58 +12,40 @@
     1.4  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
     1.5  
     1.6  BUILD_DEPENDS="ncurses-dev python-dev readline-dev perl-dev texinfo"
     1.7 -SPLIT="gdb-python:python gdb-dev"
     1.8 +SPLIT="gdb-python:py gdb-dev"
     1.9  
    1.10  compile_rules() {
    1.11  	case $SET in
    1.12 -		'')     SET_ARGS='--with-python=no';;
    1.13 -		python) SET_ARGS='';;
    1.14 +		'') SET_ARGS='--with-python=no';;
    1.15 +		py) SET_ARGS='';;
    1.16  	esac
    1.17  
    1.18  	./configure \
    1.19  		--disable-werror \
    1.20  		$SET_ARGS \
    1.21  		$CONFIGURE_ARGS &&
    1.22 -	make && make install
    1.23 +	make &&
    1.24 +	make install || return 1
    1.25 +
    1.26 +	# Do not copy static libs, as they are all part of binutils;
    1.27 +	# binutils includes libbdf.*a, libiberty.a, and libopcodes.*a
    1.28 +	find $install -name '*.a' -delete
    1.29  }
    1.30  
    1.31  genpkg_rules() {
    1.32  	case $PACKAGE in
    1.33  		gdb)
    1.34 -			mkdir -p $fs/usr
    1.35 -			cp -a $install/usr/bin $fs/usr
    1.36 +			copy @std
    1.37  			DEPENDS="ncurses expat glibc-dev"
    1.38  			;;
    1.39  		gdb-python)
    1.40 -			mkdir -p $fs/usr/share
    1.41 -			cp -a $install/usr/bin $fs/usr
    1.42 -			cp -a $install/usr/lib $fs/usr
    1.43 -			cp -a $install/usr/share/gdb $fs/usr/share
    1.44 +			copy @std
    1.45  			CAT="development|with Python support"
    1.46  			DEPENDS="ncurses expat glibc-dev python"
    1.47  			PROVIDE="gdb"
    1.48  			;;
    1.49  		*-dev)
    1.50 -			mkdir -p $fs/usr
    1.51 -
    1.52 -			# Copying include dir if exists
    1.53 -			if [ -d "$install/usr/include" ]; then
    1.54 -				cp -a $install/usr/include $fs/usr
    1.55 -			fi
    1.56 -
    1.57 -			# Copying pkgconfig dir if exists
    1.58 -			if [ -d "$install/usr/lib/pkgconfig" ]; then
    1.59 -				test -d $fs/usr/lib/ || mkdir -p $fs/usr/lib/
    1.60 -				cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.61 -			fi
    1.62 -
    1.63 -			# Do not copy static libs, as they are all part of binutils
    1.64 -			# binutils includes libbdf.*a, libiberty.a, and libopcodes.*a
    1.65 -			# Copying static libs if exists
    1.66 -			#if ( find $install/usr/lib -name "*.*a" > /dev/null ); then
    1.67 -			#	test -d $fs/usr/lib || mkdir -p $fs/usr/lib
    1.68 -			#	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.69 -			#fi
    1.70 +			copy @dev
    1.71  			DEPENDS="gdb"
    1.72  			;;
    1.73  	esac