haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libtorrent_rasterbar: switch to autoconf.

Browse Source
This commit is contained in:
Jerome Duval
2017-09-30 15:01:45 +02:00
parent 2f8bdf89a9
commit b49fb2c5ad
2 changed files with 59 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.4.recipe
View File

@@ -13,7 +13,7 @@ The main goals of libtorrent are:
HOMEPAGE="http://www.libtorrent.org/"
COPYRIGHT="2003-2017 Arvid Norberg"
LICENSE="BSD (2-clause)"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${portVersion//./_}/libtorrent-rasterbar-$portVersion.tar.gz"
CHECKSUM_SHA256="ccf42367803a6df7edcf4756d1f7d0a9ce6158ec33b851b3b58fd470ac4eeba6"
SOURCE_DIR="libtorrent-rasterbar-$portVersion"
@@ -24,21 +24,21 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
PROVIDES="
libtorrent_rasterbar${secondaryArchSuffix} = $portVersion
lib:libtorrent_rasterbar$secondaryArchSuffix = 8 compat >= 8
lib:libtorrent_rasterbar$secondaryArchSuffix = 9 compat >= 9
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_atomic$secondaryArchSuffix
lib:libboost_chrono$secondaryArchSuffix
lib:libboost_date_time$secondaryArchSuffix
lib:libboost_random$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libboost_thread$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
"
PROVIDES_devel="
libtorrent_rasterbar${secondaryArchSuffix}_devel = $portVersion
devel:libtorrent_rasterbar$secondaryArchSuffix = 8 compat >= 8
devel:libtorrent_rasterbar$secondaryArchSuffix = 9 compat >= 9
"
REQUIRES_devel="
libtorrent_rasterbar$secondaryArchSuffix == $portVersion base
@@ -46,37 +46,40 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libboost_chrono$secondaryArchSuffix
devel:libboost_random$secondaryArchSuffix
devel:libboost_system$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libssl$secondaryArchSuffix >= 1.0.0
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:cmake
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
# this CMake setup does not use GNUInstallDirs
cmake -DCMAKE_INSTALL_PREFIX=$prefix
sed -i 's/-msse4.2//' configure.ac
autoreconf -fi
export CXXFLAGS="$CXXFLAGS -std=c++11 -DBOOST_NO_CXX11_CONSTEXPR"
runConfigure ./configure --disable-static --with-libiconv \
--with-boost-system=boost_system \
--with-boost-chrono=boost_chrono \
--with-boost-random=boost_random
make $jobArgs
}
INSTALL()
{
mkdir -p $includeDir $libDir
make install
make install-strip
mv $prefix/include/libtorrent $includeDir
if [ -n "$secondaryArchSuffix" ]; then
mv $prefix/lib/*.so* $libDir
mv $prefix/lib/pkgconfig $libDir
fi
rm -r $prefix/include
strip $libDir/libtorrent-rasterbar.so.8
rm $libDir/libtorrent-rasterbar.la
prepareInstalledDevelLib libtorrent-rasterbar
fixPkgconfig

37
net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.1.4.patchset
View File

@@ -1,4 +1,4 @@
From 4931a1a693ff8939c95c6e3e74294c247023cda4 Mon Sep 17 00:00:00 2001
From 74689dea505a419387d2179bcd584a94a9cb0e40 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 8 Sep 2017 09:25:29 +0300
Subject: Replace BeOS support code with Haiku
@@ -115,3 +115,38 @@ index eec8c10..8042f03 100644
--
2.13.1
From b8fd200de6a5bd06d42a0d508a622e341406c812 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@cs.umu.se>
Date: Tue, 11 Jul 2017 23:16:50 -0700
Subject: use the official boost.config header
diff --git a/include/libtorrent/export.hpp b/include/libtorrent/export.hpp
index 87536af..503afe2 100644
--- a/include/libtorrent/export.hpp
+++ b/include/libtorrent/export.hpp
@@ -33,19 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef TORRENT_EXPORT_HPP_INCLUDED
#define TORRENT_EXPORT_HPP_INCLUDED
-#if !defined(BOOST_COMPILER_CONFIG) && !defined(BOOST_NO_COMPILER_CONFIG)
-# include <boost/config/select_compiler_config.hpp>
-#endif
-#ifdef BOOST_COMPILER_CONFIG
-# include BOOST_COMPILER_CONFIG
-#endif
-
-#if !defined(BOOST_PLATFORM_CONFIG) && !defined(BOOST_NO_PLATFORM_CONFIG)
-# include <boost/config/select_platform_config.hpp>
-#endif
-#ifdef BOOST_PLATFORM_CONFIG
-# include BOOST_PLATFORM_CONFIG
-#endif
+#include <boost/config.hpp>
// backwards compatibility with older versions of boost
#if !defined BOOST_SYMBOL_EXPORT && !defined BOOST_SYMBOL_IMPORT
--
2.13.1