diff --git a/dev-lua/luv/luv-1.43.0.recipe b/dev-lua/luv/luv-1.43.0.recipe index 8e19331e0..7c9f24e20 100644 --- a/dev-lua/luv/luv-1.43.0.recipe +++ b/dev-lua/luv/luv-1.43.0.recipe @@ -3,7 +3,7 @@ DESCRIPTION="luv are bare libuv bindings for Lua." HOMEPAGE="https://github.com/luvit/luv" COPYRIGHT="2014 The Luvit Authors" LICENSE="Apache v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/luvit/luv/releases/download/${portVersion}-0/luv-${portVersion}-0.tar.gz" CHECKSUM_SHA256="567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2" SOURCE_DIR="luv-${portVersion}-0" @@ -13,23 +13,28 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then SECONDARY_ARCHITECTURES="x86" fi +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" luv$secondaryArchSuffix = $portVersion - lib:libluv$secondaryArchSuffix + lib:libluv$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix lib:liblua$secondaryArchSuffix >= 5.3 lib:libuv$secondaryArchSuffix " + PROVIDES_devel=" luv${secondaryArchSuffix}_devel = $portVersion - devel:libluv$secondaryArchSuffix + devel:libluv$secondaryArchSuffix = $libVersionCompat devel:libluv_a$secondaryArchSuffix " REQUIRES_devel=" luv$secondaryArchSuffix == $portVersion base " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:liblua$secondaryArchSuffix >= 5.3 @@ -44,7 +49,6 @@ BUILD_PREREQUIRES=" BUILD() { LUAVERSION=$(lua -v | sed 's/Lua //' | head -c3) - rm -rf build cmake \ -B build -S.\ -DWITH_LUA_ENGINE=Lua \ @@ -53,7 +57,12 @@ BUILD() -DWITH_SHARED_LIBUV=ON \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_STATIC_LIBS=ON \ - $cmakeDirArgs + -DCMAKE_INSTALL_PREFIX=$prefix \ + -DSHAREDLIBS_INSTALL_BIN_DIR=$binDir \ + -DSHAREDLIBS_INSTALL_INC_DIR=$includeDir \ + -DSHAREDLIBS_INSTALL_LIB_DIR=$libDir \ + -DSTATICLIBS_INSTALL_INC_DIR=$includeDir \ + -DSTATICLIBS_INSTALL_LIB_DIR=$libDir make -C build $jobArgs } @@ -63,11 +72,6 @@ INSTALL() make -C build install make -C build BUILD_MODULE=0 install - # mmkay. Guess luv's cmake ignoring INCLUDE_INSTALL_DIR - mkdir -p $includeDir - mv $prefix/include/* $includeDir - rm -rf $prefix/include - prepareInstalledDevelLibs libluv libluv_a fixPkgconfig