libp8_platform, cleanup, fix cmake configuration install path (#8301)

This commit is contained in:
Schrijvers Luc
2023-04-07 11:19:18 +02:00
committed by GitHub
parent 49cbe61c66
commit 5a6dad0085
2 changed files with 38 additions and 23 deletions

View File

@@ -3,7 +3,7 @@ DESCRIPTION="This library provides platform specific support for other libraries
HOMEPAGE="http://libcec.pulse-eight.com/"
COPYRIGHT="2011-2015 Pulse-Eight Limited"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/Pulse-Eight/platform/archive/p8-platform-$portVersion.tar.gz"
CHECKSUM_SHA256="064f8d2c358895c7e0bea9ae956f8d46f3f057772cb97f2743a11d478a0f68a0"
SOURCE_DIR="platform-p8-platform-$portVersion"
@@ -12,7 +12,8 @@ PATCHES="libp8_platform-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersionCompat="2.1.0 compat >= 2"
libVersion="$portVersion"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
libp8_platform$secondaryArchSuffix = $portVersion
@@ -43,22 +44,22 @@ BUILD_PREREQUIRES="
BUILD()
{
mkdir -p build
cd build
cmake -DCMAKE_BUILD_TYPE=Release \
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$prefix \
-DCMAKE_INSTALL_LIBDIR=$libDir \
-DCMAKE_INSTALL_INCLUDEDIR=$includeDir \
-DBUILD_SHARED_LIBS=1 ..
make $jobArgs
-DBUILD_SHARED_LIBS=1
make -C build $jobArgs
}
INSTALL()
{
cd build
make install
make -C build install
prepareInstalledDevelLib libp8-platform
fixPkgconfig
packageEntries devel $developDir
packageEntries devel \
$developDir \
$libDir/cmake
}

View File

@@ -1,12 +1,8 @@
From 621149fd3f5b0720be2a020561e22a6b29cea328 Mon Sep 17 00:00:00 2001
From fb9a73866d8264fd2457faa2449e768d363f0c91 Mon Sep 17 00:00:00 2001
From: TURX <turx2003@gmail.com>
Date: Thu, 23 Jan 2020 02:34:28 +0800
Subject: [PATCH 1/2] add includedir support for cmake
Subject: add includedir support for cmake
---
CMakeLists.txt | 12 ++++++------
p8-platform.pc.in | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7144b0b..8f09ba8 100644
@@ -71,17 +67,14 @@ index f97a2d4..611edb7 100644
Name: @p8-platform_NAME@
--
2.20.1
2.37.3
From 837bc04d661b7c328b0c35fd8b286dac47c04e89 Mon Sep 17 00:00:00 2001
From c34abe1d4c86660a8b62d041bacea12347624943 Mon Sep 17 00:00:00 2001
From: TURX <turx2003@gmail.com>
Date: Thu, 23 Jan 2020 02:34:56 +0800
Subject: [PATCH 2/2] fix Haiku support
Subject: fix Haiku support
---
src/posix/os-types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/posix/os-types.h b/src/posix/os-types.h
index 7fb832c..dcb8a61 100644
@@ -97,5 +90,26 @@ index 7fb832c..dcb8a61 100644
#endif
#include <pthread.h>
--
2.20.1
2.37.3
From 16da42d05ffcd5518c32d65a16bc1270b7484a0b Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Fri, 7 Apr 2023 09:08:19 +0200
Subject: Set correct path for cmake configuration file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f09ba8..084f851 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,5 +81,5 @@ ENDIF(NOT WIN32)
configure_file (p8-platform-config.cmake.in
p8-platform-config.cmake @ONLY)
install(FILES ${CMAKE_BINARY_DIR}/p8-platform-config.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/p8-platform)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/p8-platform)
--
2.37.3