1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-05 14:29:48 +00:00

fribidi: use Meson instead of autotools

Upstream is moving to Meson, so backport a patch to use that instead of
autotools.

(From OE-Core rev: d297f7ebf3f62528d055e1938a9693d6f3a61935)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-09-14 00:28:39 +01:00
committed by Richard Purdie
parent 51749fb8db
commit 4569d6163d
2 changed files with 47 additions and 5 deletions
@@ -0,0 +1,44 @@
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@intel.com>
From f5feb6c599adb52f24656f8589868039b0d14272 Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@exherbo.org>
Date: Fri, 7 Sep 2018 20:57:11 +0200
Subject: [PATCH] Build generator executables natively
They are run during the build and not installed in the end. Without
this one gets the following error from meson: "ERROR: Can not use
target gen-unicode-version as a generator because it is cross-built
and no exe wrapper is defined. You might want to set it to native
instead."
Closes #87.
---
gen.tab/meson.build | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gen.tab/meson.build b/gen.tab/meson.build
index 6006d98..8c21e98 100644
--- a/gen.tab/meson.build
+++ b/gen.tab/meson.build
@@ -33,7 +33,8 @@ gen_unicode_version = executable('gen-unicode-version',
'gen-unicode-version.c',
include_directories: incs,
c_args: native_args,
- install: false)
+ install: false,
+ native: true)
fribidi_unicode_version_h = custom_target('fribidi-unicode-version.h',
input: files('unidata/ReadMe.txt', 'unidata/BidiMirroring.txt'),
@@ -67,7 +68,8 @@ foreach tab : tabs
gen_prog_src, 'packtab.c',
include_directories: incs,
c_args: native_args,
- install: false)
+ install: false,
+ native: true)
tab_inc_file = custom_target(gen_prog_name,
input: gen_prog_inputs,
@@ -3,16 +3,14 @@ SECTION = "libs"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \
file://meson.patch"
SRC_URI[md5sum] = "0f97f65038545340316ec0f4bd53df0b"
SRC_URI[sha256sum] = "6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce"
UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
inherit autotools lib_package pkgconfig
# TODO use Meson instead of autotools when
# https://github.com/fribidi/fribidi/issues/87 is solved
inherit meson lib_package pkgconfig
CVE_PRODUCT = "gnu_fribidi"