diff --git a/sys-devel/libuuid/libuuid-1.3.1.recipe b/sys-devel/libuuid/libuuid-1.3.1.recipe index 3da707fb8..e231c0b1c 100644 --- a/sys-devel/libuuid/libuuid-1.3.1.recipe +++ b/sys-devel/libuuid/libuuid-1.3.1.recipe @@ -10,10 +10,11 @@ unique\"." HOMEPAGE="https://gitlab.com/kallisti5/libuuid" COPYRIGHT="2013-2014 Ralph Böhme" LICENSE="BSD (3-clause)" -REVISION="1" +REVISION="2" SOURCE_URI="https://gitlab.com/kallisti5/libuuid/-/archive/v${portVersion}/libuuid-v${portVersion}.tar.gz" SOURCE_DIR="libuuid-v${portVersion}" CHECKSUM_SHA256="5c4985534b5a8a4c3100e298a6cbb30b6bbf1800a6bab39e214a3bcdb0cd5aed" +PATCHES="libuuid-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64 arm riscv64 ppc sparc m68k" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -47,12 +48,14 @@ BUILD_PREREQUIRES=" BUILD() { - scons --prefix=$prefix --lib-dir=$libDir --exec-prefix=$libExecDir --inc-dir=$includeDir --man-dir=$manDir $jobArgs + scons --prefix=$prefix --lib-dir=$libDir --exec-prefix=$libExecDir \ + --inc-dir=$includeDir --man-dir=$manDir } INSTALL() { - scons --prefix=$prefix --lib-dir=$libDir --exec-prefix=$libExecDir --inc-dir=$includeDir --man-dir=$manDir install + scons --prefix=$prefix --lib-dir=$libDir --exec-prefix=$libExecDir \ + --inc-dir=$includeDir --man-dir=$manDir install fixPkgconfig diff --git a/sys-devel/libuuid/patches/libuuid-1.3.1.patchset b/sys-devel/libuuid/patches/libuuid-1.3.1.patchset new file mode 100644 index 000000000..25567411d --- /dev/null +++ b/sys-devel/libuuid/patches/libuuid-1.3.1.patchset @@ -0,0 +1,22 @@ +From 435db43cfc3957193c868ea52a648971888d42a8 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 27 Apr 2020 17:03:00 +0200 +Subject: haiku uses libnetwork + + +diff --git a/src/SConscript b/src/SConscript +index 42c6ee4..41893c8 100644 +--- a/src/SConscript ++++ b/src/SConscript +@@ -8,7 +8,7 @@ test_src = ['test_uuid.c'] + extra_libs = [] + + if platform.system() == "Haiku": +- extra_libs.append("net") ++ extra_libs.append("network") + + libuuid = env.SharedLibrary(target = 'libuuid', source = [lib_src, helper_src], LIBS=extra_libs) + env.Program(target = 'test_uuid', source = test_src, LIBS=[libuuid], LIBPATH='.') +-- +2.24.0 +