wok-next diff wvstreams/receipt @ rev 20853

Up xgalaga++; fix build: vzctl, vzquota, w3m
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jun 24 19:03:37 2018 +0300 (2018-06-24)
parents d43bf7aae921
children d5aab818505e
line diff
     1.1 --- a/wvstreams/receipt	Wed Mar 21 15:58:17 2018 +0200
     1.2 +++ b/wvstreams/receipt	Sun Jun 24 19:03:37 2018 +0300
     1.3 @@ -6,55 +6,55 @@
     1.4  SHORT_DESC="makes modem-based connection to Internet"
     1.5  MAINTAINER="jozee@slitaz.org"
     1.6  LICENSE="GPL2"
     1.7 +WEB_SITE="https://code.google.com/archive/p/wvstreams/"
     1.8 +
     1.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.10 -WEB_SITE="http://wvstreams.googlecode.com"
    1.11 -WGET_URL="http://wvstreams.googlecode.com/files/$TARBALL"
    1.12 +WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/$TARBALL"
    1.13  
    1.14 -BUILD_DEPENDS="ppp-dev openssl-dev xplc-dev readline-dev bash zlib-dev"
    1.15 -SPLIT="wvstreams wvstreams-dev"
    1.16 +BUILD_DEPENDS="ppp-dev openssl10-dev xplc-dev readline-dev bash zlib-dev"
    1.17 +SPLIT="wvstreams-dev"
    1.18  
    1.19 -# Rules to configure and make the package.
    1.20 -compile_rules()
    1.21 -{
    1.22 +compile_rules() {
    1.23  	sed -i 's/wvuid.h"/&\n#include <unistd.h>/' utils/wvuid.cc
    1.24  	sed -i 's/  X509V3_EXT_METHOD/  const X509V3_EXT_METHOD/' crypto/wvx509.cc
    1.25  	sed -i 's/def MACOS/ 1/' streams/wvatomicfile.cc \
    1.26  		ipstreams/wvunixdgsocket.cc
    1.27 -	./configure $CONFIGURE_ARGS \
    1.28 -		--prefix=/usr \
    1.29 +
    1.30 +	CPPFLAGS=-I/usr/include/openssl-1.0 \
    1.31 +	LDFLAGS=-L/usr/lib/openssl-1.0 \
    1.32 +	./configure \
    1.33  		--without-dbus \
    1.34  		--without-tcl \
    1.35  		--without-qt \
    1.36  		--without-pam \
    1.37 -		--without-valgrind &&
    1.38 -	make -j1 && make -j1 install
    1.39 +		--without-valgrind \
    1.40 +		$CONFIGURE_ARGS &&
    1.41 +	make \
    1.42 +		-j1 \
    1.43 +		COPTS="$CFLAGS -fPIC" \
    1.44 +		CXXOPTS="$CXXFLAGS -fPIC -fpermissive -fno-tree-dce -fno-optimize-sibling-calls" \
    1.45 +		VERBOSE=1 &&
    1.46 +	make -j1 install || return 1
    1.47 +
    1.48 +	# --without-dbus still installs the .pc file
    1.49 +	rm $install/usr/lib/pkgconfig/libwvdbus.pc
    1.50 +	# --without-qt still installs the .pc file
    1.51 +	rm $install/usr/lib/pkgconfig/libwvqt.pc
    1.52  }
    1.53  
    1.54 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.55 -genpkg_rules()
    1.56 -{
    1.57 +genpkg_rules() {
    1.58  	case $PACKAGE in
    1.59 -	wvstreams)
    1.60 -		TAGS="network 3G"
    1.61 -		DEPENDS="ppp openssl xplc readline"
    1.62 -		mkdir -p $fs/usr/lib $fs/etc $fs/var			
    1.63 -		cp -a $install/usr/bin $fs/usr
    1.64 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.65 -		cp -a $install/usr/lib/valgrind $fs/usr/lib
    1.66 -		cp -a $install/usr/sbin $fs/usr
    1.67 -		cp -a $install/usr/etc/* $fs/etc
    1.68 -		cp -a $install/usr/var/* $fs/var
    1.69 -		;;
    1.70 -	wvstreams-dev)
    1.71 -		mkdir -p $fs/usr/lib
    1.72 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.73 -		cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.74 -		cp -a $install/usr/include/ $fs/usr	
    1.75 -		;;
    1.76 +		wvstreams)
    1.77 +			copy @std
    1.78 +			DEPENDS="openssl10 readline zlib   ppp xplc"
    1.79 +			TAGS="network 3G"
    1.80 +			;;
    1.81 +		*-dev)
    1.82 +			copy @dev
    1.83 +			;;
    1.84  	esac
    1.85  }
    1.86  
    1.87 -post_remove_wvstreams()
    1.88 -{
    1.89 +post_remove_wvstreams() {
    1.90  	rm -rf "$1/etc/ppp/peers/wvdial"
    1.91  }