From 04f13bf19977ca98e81f36ac0f81313e2c4dae0d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 2 Feb 2014 12:09:43 +0100 Subject: [PATCH] rtorrent: proper cross build support. --- .../rtorrent/patches/fix-sysroot-handling.patch | 14 ++++++++++++++ srcpkgs/rtorrent/template | 9 ++------- 2 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/rtorrent/patches/fix-sysroot-handling.patch diff --git a/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch b/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch new file mode 100644 index 0000000000..b22379dad2 --- /dev/null +++ b/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch @@ -0,0 +1,14 @@ +--sysroot should be enough. + +--- scripts/common.m4.orig 2014-02-02 11:58:17.361448885 +0100 ++++ scripts/common.m4 2014-02-02 11:59:13.048185911 +0100 +@@ -63,8 +63,7 @@ AC_DEFUN([TORRENT_WITH_SYSROOT], [ + else + AC_MSG_RESULT($withval) + +- CXXFLAGS="$CXXFLAGS -isysroot $withval" +- LDFLAGS="$LDFLAGS -Wl,-syslibroot,$withval" ++ CXXFLAGS="$CXXFLAGS --sysroot=$withval" + fi + ]) + ]) diff --git a/srcpkgs/rtorrent/template b/srcpkgs/rtorrent/template index b5daae9bef..be788d2094 100644 --- a/srcpkgs/rtorrent/template +++ b/srcpkgs/rtorrent/template @@ -1,10 +1,10 @@ # Template file for 'rtorrent' pkgname=rtorrent version=0.9.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-debug" -hostmakedepends="automake pkg-config" +hostmakedepends="automake libtool pkg-config" makedepends="libcurl-devel libsigc++-devel libtorrent-devel>=0.13.2 ncurses-devel" depends="libtorrent>=0.13.2" short_desc="Ncurses BitTorrent client based on libTorrent" @@ -13,11 +13,6 @@ homepage="http://libtorrent.rakshasa.no" license="GPL-2" distfiles="http://libtorrent.rakshasa.no/downloads/$pkgname-$version.tar.gz" checksum=5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d -long_desc=" - rtorrent is a BitTorrent client for ncurses, using the libtorrent library. - The client and library is written in C++ with emphasis on speed and efficiency, - while delivering equivalent features to those found in GUI based clients - in an ncurses client." pre_configure() { sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac