From e81058822cbf96996a6d5097fcde47e822f2a0db Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 15 Apr 2013 21:45:51 +0000 Subject: [PATCH] Update to current libsolv version * Includes recent OpenSUSE/libsolv changes and sync with package kit changes (BPackageVersion::release -> revision). * Add missing expat [build_]requires. * BUILD(): Remove "build" directory before re-creating it. --- ...01.recipe => libsolv-0.3.0_haiku_2013_04_15.recipe} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename dev-libs/libsolv/{libsolv-0.3.0_haiku_2013_04_01.recipe => libsolv-0.3.0_haiku_2013_04_15.recipe} (73%) diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_01.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_15.recipe similarity index 73% rename from dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_01.recipe rename to dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_15.recipe index 8069e7d01..e917385ba 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_01.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_15.recipe @@ -1,15 +1,16 @@ SUMMARY="Library for solving packages and reading repositories" DESCRIPTION="Library for solving packages and reading repositories." HOMEPAGE="http://github.com/openSUSE/libsolv" -SRC_URI="git+git://github.com/weinhold/libsolv.git#21ca29f8f21fa05384fe3fd095652b7999fec759" +SRC_URI="git+git://github.com/weinhold/libsolv.git#2fbe38d5d38facee568f24b19b51e03ad2e9e3a9" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="libsolv = $portVersion lib:libsolv = $portVersion lib:libsolvext = $portVersion" -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="" +REQUIRES="haiku >= $haikuVersion + lib:libexpat >= 1.5" +BUILD_REQUIRES="lib:libexpat >= 1.5" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion cmd:cmake cmd:gcc @@ -20,6 +21,7 @@ SOURCE_DIR="$portVersionedName" BUILD() { + rm -rf build mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. @@ -31,7 +33,7 @@ INSTALL() cd build make install - # We don't wont the executables. + # We don't want the executables. rm -r $prefix/bin }