haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

meson: recipe cleanups, add patch for symbols extraction. (#13327)

Browse Source 
Co-authored-by: Jérôme Duval <jerome.duval@gmail.com>
This commit is contained in:
OscarL
2025-12-05 08:04:58 -03:00
committed by GitHub
parent 3d2dbfb8b9
commit b5667aecd5
2 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
dev-build/meson/meson-1.9.1.recipe
View File

@@ -4,11 +4,13 @@ build system."
HOMEPAGE="https://mesonbuild.com/"
COPYRIGHT="2013-2025 The Meson development team"
LICENSE="Apache v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz"
CHECKSUM_SHA256="4e076606f2afff7881d195574bddcd8d89286f35a17b4977a216f535dc0c74ac"
PATCHES="meson-$portVersion.patchset"
PYTHON_VERSION="3.10"
pythonVersion=3.10
pythonPackage=python${pythonVersion//.}
ARCHITECTURES="any"
@@ -22,17 +24,19 @@ PROVIDES="
"
REQUIRES="
haiku
setuptools_python310
cmd:python$PYTHON_VERSION
cmd:ninja >= 1.6
cmd:python$pythonVersion
"
BUILD_REQUIRES="
haiku_devel
setuptools_python310
build_$pythonPackage
installer_$pythonPackage
setuptools_$pythonPackage
wheel_$pythonPackage
"
BUILD_PREREQUIRES="
cmd:python$PYTHON_VERSION
cmd:python$pythonVersion
"
TEST_REQUIRES="
@@ -44,17 +48,15 @@ TEST_REQUIRES="
devel:libglib_2.0
"
BUILD()
{
python$pythonVersion -m build --wheel --skip-dependency-check --no-isolation
}
INSTALL()
{
# GENERIC: all python_setuptools-based installs need this
python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3.10
pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
export PYTHONPATH=$installLocation:$PYTHONPATH
mkdir -p $installLocation
$python setup.py install \
--root=/ --prefix=$prefix
python$pythonVersion -m installer --p $prefix dist/$portName-$portVersion-py3-none-any.whl
mkdir -p $docDir
mv $prefix/share/man $manDir

31
dev-build/meson/patches/meson-1.9.1.patchset
View File

@@ -1,4 +1,4 @@
From cd80688dfb321acbc7e9be7564246e4fcace77c8 Mon Sep 17 00:00:00 2001
From 73c3c93c5b88f857d3f501b769895ac1988e2b5a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Aug 2020 11:56:45 +0200
Subject: Fix include path for boost
@@ -25,7 +25,7 @@ index fdb35d4..eaa3688 100644
2.51.0
From df95b4db10d2ac95052da33aeaeea6a0d2ba7a01 Mon Sep 17 00:00:00 2001
From b5dde43198368ec6dd4b7e0fbc630e602ec57cee Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 26 Nov 2021 11:39:48 +0100
Subject: add support for gcc 2.95.3
@@ -78,7 +78,7 @@ index ddcd14a..d78e575 100644
2.51.0
From 2930cafe09d76ccaa3c802367ff33a506cb76884 Mon Sep 17 00:00:00 2001
From 39928ce216e8776f17d632ec7454dae1549e584b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 12 Apr 2023 17:58:48 +0200
Subject: Revert b1384b9c9f64ff909d5431176503a7dcdadd426c
@@ -102,7 +102,7 @@ index 8eb382b..c639e8e 100644
2.51.0
From 79897326c7096dd27f9851a644f7c0d3e8c60d40 Mon Sep 17 00:00:00 2001
From 56a0beb07a2783c26aa6d3eca5984257619d5149 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sat, 12 Aug 2023 09:56:44 +0100
Subject: python module: Respect PATH when python is not given in machine file
@@ -130,3 +130,26 @@ index 3c07960..c4a353b 100644
--
2.51.0
From 325d5efd5055b67b0c81b021b1d0ee75767bf282 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Thu, 4 Dec 2025 07:38:46 -0300
Subject: Use gnu_sym() for symbol extraction.
diff --git a/mesonbuild/scripts/symbolextractor.py b/mesonbuild/scripts/symbolextractor.py
index b0a07d9..d57a219 100644
--- a/mesonbuild/scripts/symbolextractor.py
+++ b/mesonbuild/scripts/symbolextractor.py
@@ -273,7 +273,7 @@ def gen_symbols(libfilename: str, impfilename: str, outfilename: str, cross_host
windows_syms(impfilename, outfilename)
else:
dummy_syms(outfilename)
- elif mesonlib.is_linux() or mesonlib.is_hurd():
+ elif mesonlib.is_linux() or mesonlib.is_hurd() or mesonlib.is_haiku():
gnu_syms(libfilename, outfilename)
elif mesonlib.is_osx():
osx_syms(libfilename, outfilename)
--
2.51.0