License-Update: Update year
Signed-off-by: Alex Kiernan <alex.kier...@gmail.com>
---
...-t-link-against-host-system-libraries.patch | 18 +++++++++---------
...rial-tests-automake-option-for-ptest.patch} | 10 +++++-----
.../onig/{onig_6.9.4.bb => onig_6.9.8.bb} | 13 ++++++-------
3 files changed, 20 insertions(+), 21 deletions(-)
rename
meta-oe/recipes-support/onig/onig/{0001-build-enable-serial-tests-automake-option-for-ptest.patch
=> 0002-build-enable-serial-tests-automake-option-for-ptest.patch} (77%)
rename meta-oe/recipes-support/onig/{onig_6.9.4.bb => onig_6.9.8.bb} (64%)
diff --git
a/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch
b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch
index 891592650d50..1db9684abde1 100644
---
a/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch
+++
b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch
@@ -1,7 +1,7 @@
-From 78103ecd18efcd0966531d8718f6e94dcb7a5abf Mon Sep 17 00:00:00 2001
+From 543990bc34a0e5d4f66a9167efb1f3b8de6a3635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <g...@andred.net>
Date: Mon, 6 Jan 2020 16:56:31 +0000
-Subject: [PATCH] build: don't link against (host) system libraries
+Subject: [PATCH 1/2] build: don't link against (host) system libraries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -14,29 +14,29 @@ Signed-off-by: André Draszik <g...@andred.net>
2 files changed, 2 deletions(-)
diff --git a/sample/Makefile.am b/sample/Makefile.am
-index 22a4989..e935bf0 100644
+index 681cd2a933de..c4f796d36da0 100644
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
-@@ -3,7 +3,6 @@
- lib_onig = ../src/libonig.la
+@@ -4,7 +4,6 @@ lib_onig = ../src/libonig.la
LDADD = $(lib_onig)
--AM_LDFLAGS = -L$(prefix)/lib
+ AM_CFLAGS = -Wall
+-AM_LDFLAGS = -L$(libdir)
AM_CPPFLAGS = -I$(top_srcdir)/src
if ENABLE_POSIX_API
diff --git a/test/Makefile.am b/test/Makefile.am
-index 4d62568..b7a2105 100644
+index 94739a24ab22..a23ef1e2e139 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,6 @@
## Makefile.am for Oniguruma
lib_onig = ../src/libonig.la
--AM_LDFLAGS = -L$(prefix)/lib
+-AM_LDFLAGS = -L$(libdir)
AM_CFLAGS = -Wall -Wno-invalid-source-encoding
AM_CPPFLAGS = -I$(top_srcdir)/src
--
-2.23.0.rc1
+2.35.1
diff --git
a/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
b/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch
similarity index 77%
rename from
meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
rename to
meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch
index 587e5ac1b8e1..a7a28536fb36 100644
---
a/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
+++
b/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch
@@ -1,7 +1,7 @@
-From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001
+From 1ab999aa5a7a21329bab13e05f843e5e029493e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <g...@andred.net>
Date: Mon, 6 Jan 2020 15:10:30 +0000
-Subject: [PATCH] build: enable serial-tests automake option (for ptest)
+Subject: [PATCH 2/2] build: enable serial-tests automake option (for ptest)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -19,10 +19,10 @@ Signed-off-by: André Draszik <g...@andred.net>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index ac51e85..48e63ce 100644
+index 079fef9a1a52..058b5504b9b7 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4)
+@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.8)
AC_CONFIG_MACRO_DIR([m4])
@@ -32,5 +32,5 @@ index ac51e85..48e63ce 100644
--
-2.23.0.rc1
+2.35.1
diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb
b/meta-oe/recipes-support/onig/onig_6.9.8.bb
similarity index 64%
rename from meta-oe/recipes-support/onig/onig_6.9.4.bb
rename to meta-oe/recipes-support/onig/onig_6.9.8.bb
index 701f65c29948..214459228611 100644
--- a/meta-oe/recipes-support/onig/onig_6.9.4.bb
+++ b/meta-oe/recipes-support/onig/onig_6.9.8.bb
@@ -5,17 +5,16 @@ implementations that traditionally exist in different
languages. \
Character encoding can be specified per regular expression object."
HOMEPAGE = "https://github.com/kkos/oniguruma";
LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e6365c225bb5cc4321d0913f0baffa04"
SRC_URI = "\
https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \
file://0001-build-don-t-link-against-host-system-libraries.patch \
- file://0001-build-enable-serial-tests-automake-option-for-ptest.patch \
+ file://0002-build-enable-serial-tests-automake-option-for-ptest.patch \
file://run-ptest \
"
-SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
-SRC_URI[sha256sum] =
"4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53"
+SRC_URI[sha256sum] =
"28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e"
BINCONFIG = "${bindir}/onig-config"
@@ -24,12 +23,12 @@ inherit autotools binconfig-disabled ptest
BBCLASSEXTEND = "native"
do_compile_ptest() {
- oe_runmake -C test buildtest-TESTS
+ oe_runmake -C test buildtest-TESTS
}
do_install_ptest() {
- mkdir -p ${D}${PTEST_PATH}/tests
- install -m 0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/*
+ mkdir -p ${D}${PTEST_PATH}/tests
+ install -m 0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/*
}
PROVIDES += "oniguruma"
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#98952):
https://lists.openembedded.org/g/openembedded-devel/message/98952
Mute This Topic: https://lists.openembedded.org/mt/93923840/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
