fuzzylite, fix 32bit (#8103)

This commit is contained in:
Schrijvers Luc
2023-03-24 20:24:44 +01:00
committed by GitHub
parent 25942e5cf1
commit 2d30accaa3
2 changed files with 46 additions and 9 deletions

View File

@@ -5,17 +5,17 @@ external libraries."
HOMEPAGE="https://fuzzylite.com"
COPYRIGHT="2017 Juan Rada-Vilela"
LICENSE="GNU GPL v3"
REVISION="2"
SOURCE_URI="https://github.com/fuzzylite/fuzzylite/archive/refs/tags/v6.0.tar.gz"
CHECKSUM_SHA256="7e9f56deb9baf063de2232bfd8285f57ddccb651dae842fe3f587d0ac65ecdb0"
SOURCE_DIR="$portVersionedName/fuzzylite"
REVISION="1"
PATCHES="fuzzylite-$portVersion.patchset"
ARCHITECTURES="all ?x86_gcc2"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
fuzzylite$secondaryArchSuffix = $portVersion
cmd:fuzzylite$secondaryArchSuffix
cmd:fuzzylite
lib:libfuzzylite$secondaryArchSuffix = 6.0 compat >= 6
"
REQUIRES="
@@ -42,18 +42,18 @@ BUILD_PREREQUIRES="
BUILD()
{
cd fuzzylite
cmake $cmakeDirArgs -DCMAKE_BUILD_TYPE=Release -DFL_BUILD_STATIC=0
make $jobArgs OBJ_DIR=objects
}
INSTALL()
{
make install
make -C fuzzylite install
mkdir -p $developDir
mv $prefix/include $developDir/headers
prepareInstalledDevelLibs libfuzzylite
prepareInstalledDevelLib libfuzzylite
fixPkgconfig
packageEntries devel $developDir
}

View File

@@ -0,0 +1,37 @@
From e4ffa5c547eddad56b8641f9b417539ed11a4ece Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Fri, 24 Mar 2023 20:12:31 +0100
Subject: Add FL_INSTALL_INCLUDEDIR to install the headers to the wright place
diff --git a/fuzzylite/CMakeLists.txt b/fuzzylite/CMakeLists.txt
index 28435e2..060724b 100644
--- a/fuzzylite/CMakeLists.txt
+++ b/fuzzylite/CMakeLists.txt
@@ -235,6 +235,14 @@ if(NOT FL_INSTALL_LIBDIR)
endif()
endif()
+if(NOT FL_INSTALL_INCLUDEDIR)
+ if(NOT CMAKE_INSTALL_INCLUDEDIR)
+ set(FL_INSTALL_INCLUDEDIR include)
+ else()
+ set(FL_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
+ endif()
+endif()
+
if(FL_BUILD_BINARY)
install(TARGETS fl-bin
RUNTIME DESTINATION ${FL_INSTALL_BINDIR}
@@ -259,7 +267,7 @@ if(FL_BUILD_STATIC)
)
endif()
-install(DIRECTORY fl/ DESTINATION include/fl)
+install(DIRECTORY fl/ DESTINATION ${FL_INSTALL_INCLUDEDIR}/fl)
#pkg-config
configure_file(${CMAKE_SOURCE_DIR}/fuzzylite.pc.in ${CMAKE_BINARY_DIR}/fuzzylite.pc @ONLY)
--
2.37.3