* [meta-oe][PATCH 1/2] onigurama: update to v6.9.4
@ 2020-01-07 15:46 André Draszik
2020-01-07 15:46 ` [meta-oe][PATCH 2/2] onigurama: enable ptest André Draszik
2020-01-08 8:55 ` [meta-oe][PATCH 1/2 v2] oniguruma: update to v6.9.4 André Draszik
0 siblings, 2 replies; 7+ messages in thread
From: André Draszik @ 2020-01-07 15:46 UTC (permalink / raw)
To: openembedded-devel
The version meta-oe is carrying is more than 4 years old,
from 2015, with numerous CVEs fixed and more than 2000
commits since.
The license checksum changed because it contains the
year (which is at 2019 now).
Onigurama can now also be built using CMake, but for
now this recipe stays with using autotools as only
autotools builds support testing (which the next
patch adds support for).
Signed-off-by: André Draszik <git@andred.net>
---
.../onig/files/configure.patch | 13 ------
.../files/do-not-use-system-headers.patch | 44 -------------------
...t-link-against-host-system-libraries.patch | 42 ++++++++++++++++++
meta-oe/recipes-support/onig/onig_5.9.6.bb | 19 --------
meta-oe/recipes-support/onig/onig_6.9.4.bb | 22 ++++++++++
5 files changed, 64 insertions(+), 76 deletions(-)
delete mode 100644 meta-oe/recipes-support/onig/files/configure.patch
delete mode 100644 meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch
delete mode 100644 meta-oe/recipes-support/onig/onig_5.9.6.bb
create mode 100644 meta-oe/recipes-support/onig/onig_6.9.4.bb
diff --git a/meta-oe/recipes-support/onig/files/configure.patch b/meta-oe/recipes-support/onig/files/configure.patch
deleted file mode 100644
index 5fa700f19..000000000
--- a/meta-oe/recipes-support/onig/files/configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: onig-5.9.3/configure.in
-===================================================================
---- onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.000000000 +0000
-+++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 +0000
-@@ -3,7 +3,7 @@
-
- AC_CONFIG_MACRO_DIR([m4])
-
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
- AC_CONFIG_HEADER(config.h)
-
-
diff --git a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch b/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
deleted file mode 100644
index b93602a26..000000000
--- a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-
-When build on host with older eglibc (Ubuntu 12.04) build fails with:
-
-/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: error: #error "Never use <bits/predefs.h> directly; include <stdc-predef.h> instead."
-
-Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-
-Upstream-Status: Inappropriate [embedded specific]
-
----
- Makefile.am | 2 +-
- sample/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- onig-5.9.3.orig/Makefile.am
-+++ onig-5.9.3/Makefile.am
-@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample
- libname = libonig.la
-
- ACLOCAL_AMFLAGS = -I m4
- #AM_CFLAGS = -DNOT_RUBY
- AM_CFLAGS =
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
-
- SUBDIRS = . sample
-
- include_HEADERS = oniguruma.h oniggnu.h onigposix.h
- lib_LTLIBRARIES = $(libname)
---- onig-5.9.3.orig/sample/Makefile.am
-+++ onig-5.9.3/sample/Makefile.am
-@@ -1,10 +1,10 @@
- noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl
-
- libname = $(top_builddir)/libonig.la
- LDADD = $(libname)
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
-
- encode_SOURCES = encode.c
- listcap_SOURCES = listcap.c
- names_SOURCES = names.c
- posix_SOURCES = posix.c
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
new file mode 100644
index 000000000..891592650
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch
@@ -0,0 +1,42 @@
+From 78103ecd18efcd0966531d8718f6e94dcb7a5abf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net>
+Date: Mon, 6 Jan 2020 16:56:31 +0000
+Subject: [PATCH] build: don't link against (host) system libraries
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: André Draszik <git@andred.net>
+---
+ sample/Makefile.am | 1 -
+ test/Makefile.am | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/sample/Makefile.am b/sample/Makefile.am
+index 22a4989..e935bf0 100644
+--- a/sample/Makefile.am
++++ b/sample/Makefile.am
+@@ -3,7 +3,6 @@
+ lib_onig = ../src/libonig.la
+ LDADD = $(lib_onig)
+
+-AM_LDFLAGS = -L$(prefix)/lib
+ AM_CPPFLAGS = -I$(top_srcdir)/src
+
+ if ENABLE_POSIX_API
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 4d62568..b7a2105 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_CFLAGS = -Wall -Wno-invalid-source-encoding
+ AM_CPPFLAGS = -I$(top_srcdir)/src
+
+--
+2.23.0.rc1
+
diff --git a/meta-oe/recipes-support/onig/onig_5.9.6.bb b/meta-oe/recipes-support/onig/onig_5.9.6.bb
deleted file mode 100644
index 20a71c6c9..000000000
--- a/meta-oe/recipes-support/onig/onig_5.9.6.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Regular expressions library. The characteristics of this \
-library is that different character encoding for every regular expression \
-object can be specified."
-HOMEPAGE = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f"
-
-SRC_URI = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/archive/${BP}.tar.gz \
- file://do-not-use-system-headers.patch \
- file://configure.patch"
-
-SRC_URI[md5sum] = "d08f10ea5c94919780e6b7bed1ef9830"
-SRC_URI[sha256sum] = "d5642010336a6f68b7f2e34b1f1cb14be333e4d95c2ac02b38c162caf44e47a7"
-
-BINCONFIG = "${bindir}/onig-config"
-
-inherit autotools binconfig-disabled
-
-BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb b/meta-oe/recipes-support/onig/onig_6.9.4.bb
new file mode 100644
index 000000000..ce9eab9e8
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
@@ -0,0 +1,22 @@
+SUMMART = "Regular expressions library"
+DESCRIPTION = "Oniguruma is a modern and flexible regular expressions library. \
+It encompasses features from different regular expression \
+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"
+
+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 \
+"
+
+SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
+SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53"
+
+BINCONFIG = "${bindir}/onig-config"
+
+inherit autotools binconfig-disabled
+
+BBCLASSEXTEND = "native"
--
2.23.0.rc1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 2/2] onigurama: enable ptest
2020-01-07 15:46 [meta-oe][PATCH 1/2] onigurama: update to v6.9.4 André Draszik
@ 2020-01-07 15:46 ` André Draszik
2020-01-07 16:04 ` [meta-oe][PATCH 2/2 v2] " André Draszik
2020-01-08 8:55 ` [meta-oe][PATCH 1/2 v2] oniguruma: update to v6.9.4 André Draszik
1 sibling, 1 reply; 7+ messages in thread
From: André Draszik @ 2020-01-07 15:46 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: André Draszik <git@andred.net>
---
...rial-tests-automake-option-for-ptest.patch | 36 ++++++++++++++
meta-oe/recipes-support/onig/onig/run-ptest | 48 +++++++++++++++++++
meta-oe/recipes-support/onig/onig_6.9.4.bb | 12 ++++-
3 files changed, 95 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
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/0001-build-enable-serial-tests-automake-option-for-ptest.patch
new file mode 100644
index 000000000..587e5ac1b
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
@@ -0,0 +1,36 @@
+From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net>
+Date: Mon, 6 Jan 2020 15:10:30 +0000
+Subject: [PATCH] build: enable serial-tests automake option (for ptest)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For ptest, we need to be able to compile the tests without
+running them.
+
+Enabling the serial-tests automake option will add
+buildtest-TESTS and runtest-TESTS makefile targets, the
+former being what we want.
+
+Signed-off-by: André Draszik <git@andred.net>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ac51e85..48e63ce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4)
+
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([-Wno-portability])
++AM_INIT_AUTOMAKE([-Wno-portability serial-tests])
+ AC_CONFIG_HEADERS([src/config.h])
+
+
+--
+2.23.0.rc1
+
diff --git a/meta-oe/recipes-support/onig/onig/run-ptest b/meta-oe/recipes-support/onig/onig/run-ptest
new file mode 100755
index 000000000..ffc855d61
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/run-ptest
@@ -0,0 +1,48 @@
+#!/bin/sh -eu
+
+my_cleanup() {
+ [ -n "${workdir:-}" ] && rm -rf "${workdir}"
+}
+
+trap "my_cleanup" EXIT
+for sig in INT TERM ; do
+ # We want sig to expand right here and now, as it's
+ # a loop variable, not when signalled. For $$ it
+ # doesn't matter.
+ # shellcheck disable=SC2064
+ trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$" ${sig}
+done
+
+workdir=$(mktemp -d -t onig.ptest.XXXXXX)
+status="${workdir}/failed"
+touch "${status}"
+
+#find test/.libs -perm -111 -type f -exec sh -c '
+find tests/ -perm -111 -type f -exec sh -c '
+ workdir="${1}"
+ status="${2}"
+ t="${3}"
+ t_log="${workdir}/$(basename ${t}).log"
+
+ res=0
+ ./${t} > "${t_log}" 2>&1 \
+ || res=$?
+ if [ $res -eq 0 ] ; then
+ echo "PASS: ${t}"
+ else
+ echo "FAIL: ${t}"
+ echo "$(basename ${t}): ${t_log}" >> "${status}"
+ fi
+ ' _ "${workdir}" "${status}" {} \;
+
+if [ $(stat -c '%s' "${status}") -ne 0 ] ; then
+ exec >&2
+ while IFS=': ' read -r t t_log ; do
+ printf "\n=========================\n"
+ printf "ERROR: %s:\n" "${t}"
+ printf -- "-------------------------\n"
+ cat "${t_log}"
+ done < "${status}"
+fi
+
+[ $(stat -c '%s' "${status}") -eq 0 ]
diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb b/meta-oe/recipes-support/onig/onig_6.9.4.bb
index ce9eab9e8..16a8be5a2 100644
--- a/meta-oe/recipes-support/onig/onig_6.9.4.bb
+++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b"
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://run-ptest \
"
SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
@@ -17,6 +19,14 @@ SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f
BINCONFIG = "${bindir}/onig-config"
-inherit autotools binconfig-disabled
+inherit autotools binconfig-disabled ptest
BBCLASSEXTEND = "native"
+
+do_compile_ptest() {
+ oe_runmake -C test buildtest-TESTS
+}
+
+do_install_ptest() {
+ install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/*
+}
--
2.23.0.rc1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 2/2 v2] onigurama: enable ptest
2020-01-07 15:46 ` [meta-oe][PATCH 2/2] onigurama: enable ptest André Draszik
@ 2020-01-07 16:04 ` André Draszik
2020-01-08 8:56 ` [meta-oe][PATCH 2/2 v3] oniguruma: " André Draszik
0 siblings, 1 reply; 7+ messages in thread
From: André Draszik @ 2020-01-07 16:04 UTC (permalink / raw)
To: openembedded-devel
All tests (with 3400 subtests) are passing (on musl+arm).
Signed-off-by: André Draszik <git@andred.net>
---
v2:
* remove useless line in run-ptest
* update commit message
---
...rial-tests-automake-option-for-ptest.patch | 36 ++++++++++++++
meta-oe/recipes-support/onig/onig/run-ptest | 47 +++++++++++++++++++
meta-oe/recipes-support/onig/onig_6.9.4.bb | 12 ++++-
3 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
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/0001-build-enable-serial-tests-automake-option-for-ptest.patch
new file mode 100644
index 000000000..587e5ac1b
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
@@ -0,0 +1,36 @@
+From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net>
+Date: Mon, 6 Jan 2020 15:10:30 +0000
+Subject: [PATCH] build: enable serial-tests automake option (for ptest)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For ptest, we need to be able to compile the tests without
+running them.
+
+Enabling the serial-tests automake option will add
+buildtest-TESTS and runtest-TESTS makefile targets, the
+former being what we want.
+
+Signed-off-by: André Draszik <git@andred.net>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ac51e85..48e63ce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4)
+
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([-Wno-portability])
++AM_INIT_AUTOMAKE([-Wno-portability serial-tests])
+ AC_CONFIG_HEADERS([src/config.h])
+
+
+--
+2.23.0.rc1
+
diff --git a/meta-oe/recipes-support/onig/onig/run-ptest b/meta-oe/recipes-support/onig/onig/run-ptest
new file mode 100755
index 000000000..2574d7efa
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/run-ptest
@@ -0,0 +1,47 @@
+#!/bin/sh -eu
+
+my_cleanup() {
+ [ -n "${workdir:-}" ] && rm -rf "${workdir}"
+}
+
+trap "my_cleanup" EXIT
+for sig in INT TERM ; do
+ # We want sig to expand right here and now, as it's
+ # a loop variable, not when signalled. For $$ it
+ # doesn't matter.
+ # shellcheck disable=SC2064
+ trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$" ${sig}
+done
+
+workdir=$(mktemp -d -t onig.ptest.XXXXXX)
+status="${workdir}/failed"
+touch "${status}"
+
+find tests/ -perm -111 -type f -exec sh -c '
+ workdir="${1}"
+ status="${2}"
+ t="${3}"
+ t_log="${workdir}/$(basename ${t}).log"
+
+ res=0
+ ./${t} > "${t_log}" 2>&1 \
+ || res=$?
+ if [ $res -eq 0 ] ; then
+ echo "PASS: ${t}"
+ else
+ echo "FAIL: ${t}"
+ echo "$(basename ${t}): ${t_log}" >> "${status}"
+ fi
+ ' _ "${workdir}" "${status}" {} \;
+
+if [ $(stat -c '%s' "${status}") -ne 0 ] ; then
+ exec >&2
+ while IFS=': ' read -r t t_log ; do
+ printf "\n=========================\n"
+ printf "ERROR: %s:\n" "${t}"
+ printf -- "-------------------------\n"
+ cat "${t_log}"
+ done < "${status}"
+fi
+
+[ $(stat -c '%s' "${status}") -eq 0 ]
diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb b/meta-oe/recipes-support/onig/onig_6.9.4.bb
index ce9eab9e8..16a8be5a2 100644
--- a/meta-oe/recipes-support/onig/onig_6.9.4.bb
+++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b"
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://run-ptest \
"
SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
@@ -17,6 +19,14 @@ SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f
BINCONFIG = "${bindir}/onig-config"
-inherit autotools binconfig-disabled
+inherit autotools binconfig-disabled ptest
BBCLASSEXTEND = "native"
+
+do_compile_ptest() {
+ oe_runmake -C test buildtest-TESTS
+}
+
+do_install_ptest() {
+ install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/*
+}
--
2.23.0.rc1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 1/2 v2] oniguruma: update to v6.9.4
2020-01-07 15:46 [meta-oe][PATCH 1/2] onigurama: update to v6.9.4 André Draszik
2020-01-07 15:46 ` [meta-oe][PATCH 2/2] onigurama: enable ptest André Draszik
@ 2020-01-08 8:55 ` André Draszik
2020-01-08 9:00 ` André Draszik
1 sibling, 1 reply; 7+ messages in thread
From: André Draszik @ 2020-01-08 8:55 UTC (permalink / raw)
To: openembedded-devel
The version meta-oe is carrying is more than 4 years old,
from 2015, with numerous CVEs fixed and more than 2000
commits since.
The license checksum changed because it contains the
year (which is at 2019 now).
Onigurama can now also be built using CMake, but for
now this recipe stays with using autotools as only
autotools builds support testing (which the next
patch adds support for).
Signed-off-by: André Draszik <git@andred.net>
---
v2:
* fix typo in subject line
* fix SUMMARY
---
.../onig/files/configure.patch | 13 ------
.../files/do-not-use-system-headers.patch | 44 -------------------
...t-link-against-host-system-libraries.patch | 42 ++++++++++++++++++
meta-oe/recipes-support/onig/onig_5.9.6.bb | 19 --------
meta-oe/recipes-support/onig/onig_6.9.4.bb | 22 ++++++++++
5 files changed, 64 insertions(+), 76 deletions(-)
delete mode 100644 meta-oe/recipes-support/onig/files/configure.patch
delete mode 100644 meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch
delete mode 100644 meta-oe/recipes-support/onig/onig_5.9.6.bb
create mode 100644 meta-oe/recipes-support/onig/onig_6.9.4.bb
diff --git a/meta-oe/recipes-support/onig/files/configure.patch b/meta-oe/recipes-support/onig/files/configure.patch
deleted file mode 100644
index 5fa700f19..000000000
--- a/meta-oe/recipes-support/onig/files/configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: onig-5.9.3/configure.in
-===================================================================
---- onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.000000000 +0000
-+++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 +0000
-@@ -3,7 +3,7 @@
-
- AC_CONFIG_MACRO_DIR([m4])
-
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
- AC_CONFIG_HEADER(config.h)
-
-
diff --git a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch b/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
deleted file mode 100644
index b93602a26..000000000
--- a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-
-When build on host with older eglibc (Ubuntu 12.04) build fails with:
-
-/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: error: #error "Never use <bits/predefs.h> directly; include <stdc-predef.h> instead."
-
-Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-
-Upstream-Status: Inappropriate [embedded specific]
-
----
- Makefile.am | 2 +-
- sample/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- onig-5.9.3.orig/Makefile.am
-+++ onig-5.9.3/Makefile.am
-@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample
- libname = libonig.la
-
- ACLOCAL_AMFLAGS = -I m4
- #AM_CFLAGS = -DNOT_RUBY
- AM_CFLAGS =
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
-
- SUBDIRS = . sample
-
- include_HEADERS = oniguruma.h oniggnu.h onigposix.h
- lib_LTLIBRARIES = $(libname)
---- onig-5.9.3.orig/sample/Makefile.am
-+++ onig-5.9.3/sample/Makefile.am
-@@ -1,10 +1,10 @@
- noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl
-
- libname = $(top_builddir)/libonig.la
- LDADD = $(libname)
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
-
- encode_SOURCES = encode.c
- listcap_SOURCES = listcap.c
- names_SOURCES = names.c
- posix_SOURCES = posix.c
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
new file mode 100644
index 000000000..891592650
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch
@@ -0,0 +1,42 @@
+From 78103ecd18efcd0966531d8718f6e94dcb7a5abf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net>
+Date: Mon, 6 Jan 2020 16:56:31 +0000
+Subject: [PATCH] build: don't link against (host) system libraries
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: André Draszik <git@andred.net>
+---
+ sample/Makefile.am | 1 -
+ test/Makefile.am | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/sample/Makefile.am b/sample/Makefile.am
+index 22a4989..e935bf0 100644
+--- a/sample/Makefile.am
++++ b/sample/Makefile.am
+@@ -3,7 +3,6 @@
+ lib_onig = ../src/libonig.la
+ LDADD = $(lib_onig)
+
+-AM_LDFLAGS = -L$(prefix)/lib
+ AM_CPPFLAGS = -I$(top_srcdir)/src
+
+ if ENABLE_POSIX_API
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 4d62568..b7a2105 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_CFLAGS = -Wall -Wno-invalid-source-encoding
+ AM_CPPFLAGS = -I$(top_srcdir)/src
+
+--
+2.23.0.rc1
+
diff --git a/meta-oe/recipes-support/onig/onig_5.9.6.bb b/meta-oe/recipes-support/onig/onig_5.9.6.bb
deleted file mode 100644
index 20a71c6c9..000000000
--- a/meta-oe/recipes-support/onig/onig_5.9.6.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Regular expressions library. The characteristics of this \
-library is that different character encoding for every regular expression \
-object can be specified."
-HOMEPAGE = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f"
-
-SRC_URI = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/archive/${BP}.tar.gz \
- file://do-not-use-system-headers.patch \
- file://configure.patch"
-
-SRC_URI[md5sum] = "d08f10ea5c94919780e6b7bed1ef9830"
-SRC_URI[sha256sum] = "d5642010336a6f68b7f2e34b1f1cb14be333e4d95c2ac02b38c162caf44e47a7"
-
-BINCONFIG = "${bindir}/onig-config"
-
-inherit autotools binconfig-disabled
-
-BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb b/meta-oe/recipes-support/onig/onig_6.9.4.bb
new file mode 100644
index 000000000..d873088fe
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Regular expressions library"
+DESCRIPTION = "Oniguruma is a modern and flexible regular expressions library. \
+It encompasses features from different regular expression \
+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"
+
+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 \
+"
+
+SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
+SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53"
+
+BINCONFIG = "${bindir}/onig-config"
+
+inherit autotools binconfig-disabled
+
+BBCLASSEXTEND = "native"
--
2.23.0.rc1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 2/2 v3] oniguruma: enable ptest
2020-01-07 16:04 ` [meta-oe][PATCH 2/2 v2] " André Draszik
@ 2020-01-08 8:56 ` André Draszik
2020-01-08 9:00 ` André Draszik
0 siblings, 1 reply; 7+ messages in thread
From: André Draszik @ 2020-01-08 8:56 UTC (permalink / raw)
To: openembedded-devel
All tests (with 3400 subtests) are passing (on musl+arm).
Signed-off-by: André Draszik <git@andred.net>
---
v3:
* fix subject line
v2:
* remove useless line in run-ptest
* update commit message
---
...rial-tests-automake-option-for-ptest.patch | 36 ++++++++++++++
meta-oe/recipes-support/onig/onig/run-ptest | 47 +++++++++++++++++++
meta-oe/recipes-support/onig/onig_6.9.4.bb | 12 ++++-
3 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
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/0001-build-enable-serial-tests-automake-option-for-ptest.patch
new file mode 100644
index 000000000..587e5ac1b
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
@@ -0,0 +1,36 @@
+From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net>
+Date: Mon, 6 Jan 2020 15:10:30 +0000
+Subject: [PATCH] build: enable serial-tests automake option (for ptest)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For ptest, we need to be able to compile the tests without
+running them.
+
+Enabling the serial-tests automake option will add
+buildtest-TESTS and runtest-TESTS makefile targets, the
+former being what we want.
+
+Signed-off-by: André Draszik <git@andred.net>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ac51e85..48e63ce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4)
+
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([-Wno-portability])
++AM_INIT_AUTOMAKE([-Wno-portability serial-tests])
+ AC_CONFIG_HEADERS([src/config.h])
+
+
+--
+2.23.0.rc1
+
diff --git a/meta-oe/recipes-support/onig/onig/run-ptest b/meta-oe/recipes-support/onig/onig/run-ptest
new file mode 100755
index 000000000..2574d7efa
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/run-ptest
@@ -0,0 +1,47 @@
+#!/bin/sh -eu
+
+my_cleanup() {
+ [ -n "${workdir:-}" ] && rm -rf "${workdir}"
+}
+
+trap "my_cleanup" EXIT
+for sig in INT TERM ; do
+ # We want sig to expand right here and now, as it's
+ # a loop variable, not when signalled. For $$ it
+ # doesn't matter.
+ # shellcheck disable=SC2064
+ trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$" ${sig}
+done
+
+workdir=$(mktemp -d -t onig.ptest.XXXXXX)
+status="${workdir}/failed"
+touch "${status}"
+
+find tests/ -perm -111 -type f -exec sh -c '
+ workdir="${1}"
+ status="${2}"
+ t="${3}"
+ t_log="${workdir}/$(basename ${t}).log"
+
+ res=0
+ ./${t} > "${t_log}" 2>&1 \
+ || res=$?
+ if [ $res -eq 0 ] ; then
+ echo "PASS: ${t}"
+ else
+ echo "FAIL: ${t}"
+ echo "$(basename ${t}): ${t_log}" >> "${status}"
+ fi
+ ' _ "${workdir}" "${status}" {} \;
+
+if [ $(stat -c '%s' "${status}") -ne 0 ] ; then
+ exec >&2
+ while IFS=': ' read -r t t_log ; do
+ printf "\n=========================\n"
+ printf "ERROR: %s:\n" "${t}"
+ printf -- "-------------------------\n"
+ cat "${t_log}"
+ done < "${status}"
+fi
+
+[ $(stat -c '%s' "${status}") -eq 0 ]
diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb b/meta-oe/recipes-support/onig/onig_6.9.4.bb
index d873088fe..cfa86f04c 100644
--- a/meta-oe/recipes-support/onig/onig_6.9.4.bb
+++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b"
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://run-ptest \
"
SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
@@ -17,6 +19,14 @@ SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f
BINCONFIG = "${bindir}/onig-config"
-inherit autotools binconfig-disabled
+inherit autotools binconfig-disabled ptest
BBCLASSEXTEND = "native"
+
+do_compile_ptest() {
+ oe_runmake -C test buildtest-TESTS
+}
+
+do_install_ptest() {
+ install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/*
+}
--
2.23.0.rc1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [meta-oe][PATCH 2/2 v3] oniguruma: enable ptest
2020-01-08 8:56 ` [meta-oe][PATCH 2/2 v3] oniguruma: " André Draszik
@ 2020-01-08 9:00 ` André Draszik
0 siblings, 0 replies; 7+ messages in thread
From: André Draszik @ 2020-01-08 9:00 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
Khem,
I got the subject line wrong originally - not sure how that works with
patchwork.
Can you still pick this up please?
Cheers,
Andre'
On Wed, 2020-01-08 at 08:56 +0000, André Draszik wrote:
> All tests (with 3400 subtests) are passing (on musl+arm).
>
> Signed-off-by: André Draszik <git@andred.net>
>
> ---
> v3:
> * fix subject line
>
> v2:
> * remove useless line in run-ptest
> * update commit message
> ---
> ...rial-tests-automake-option-for-ptest.patch | 36 ++++++++++++++
> meta-oe/recipes-support/onig/onig/run-ptest | 47 +++++++++++++++++++
> meta-oe/recipes-support/onig/onig_6.9.4.bb | 12 ++++-
> 3 files changed, 94 insertions(+), 1 deletion(-)
> create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
> create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
>
> 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/0001-build-enable-serial-tests-automake-option-for-ptest.patch
> new file mode 100644
> index 000000000..587e5ac1b
> --- /dev/null
> +++ b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
> @@ -0,0 +1,36 @@
> +From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net>
> +Date: Mon, 6 Jan 2020 15:10:30 +0000
> +Subject: [PATCH] build: enable serial-tests automake option (for ptest)
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +For ptest, we need to be able to compile the tests without
> +running them.
> +
> +Enabling the serial-tests automake option will add
> +buildtest-TESTS and runtest-TESTS makefile targets, the
> +former being what we want.
> +
> +Signed-off-by: André Draszik <git@andred.net>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index ac51e85..48e63ce 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4)
> +
> + AC_CONFIG_MACRO_DIR([m4])
> +
> +-AM_INIT_AUTOMAKE([-Wno-portability])
> ++AM_INIT_AUTOMAKE([-Wno-portability serial-tests])
> + AC_CONFIG_HEADERS([src/config.h])
> +
> +
> +--
> +2.23.0.rc1
> +
> diff --git a/meta-oe/recipes-support/onig/onig/run-ptest b/meta-oe/recipes-support/onig/onig/run-ptest
> new file mode 100755
> index 000000000..2574d7efa
> --- /dev/null
> +++ b/meta-oe/recipes-support/onig/onig/run-ptest
> @@ -0,0 +1,47 @@
> +#!/bin/sh -eu
> +
> +my_cleanup() {
> + [ -n "${workdir:-}" ] && rm -rf "${workdir}"
> +}
> +
> +trap "my_cleanup" EXIT
> +for sig in INT TERM ; do
> + # We want sig to expand right here and now, as it's
> + # a loop variable, not when signalled. For $$ it
> + # doesn't matter.
> + # shellcheck disable=SC2064
> + trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$" ${sig}
> +done
> +
> +workdir=$(mktemp -d -t onig.ptest.XXXXXX)
> +status="${workdir}/failed"
> +touch "${status}"
> +
> +find tests/ -perm -111 -type f -exec sh -c '
> + workdir="${1}"
> + status="${2}"
> + t="${3}"
> + t_log="${workdir}/$(basename ${t}).log"
> +
> + res=0
> + ./${t} > "${t_log}" 2>&1 \
> + || res=$?
> + if [ $res -eq 0 ] ; then
> + echo "PASS: ${t}"
> + else
> + echo "FAIL: ${t}"
> + echo "$(basename ${t}): ${t_log}" >> "${status}"
> + fi
> + ' _ "${workdir}" "${status}" {} \;
> +
> +if [ $(stat -c '%s' "${status}") -ne 0 ] ; then
> + exec >&2
> + while IFS=': ' read -r t t_log ; do
> + printf "\n=========================\n"
> + printf "ERROR: %s:\n" "${t}"
> + printf -- "-------------------------\n"
> + cat "${t_log}"
> + done < "${status}"
> +fi
> +
> +[ $(stat -c '%s' "${status}") -eq 0 ]
> diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb b/meta-oe/recipes-support/onig/onig_6.9.4.bb
> index d873088fe..cfa86f04c 100644
> --- a/meta-oe/recipes-support/onig/onig_6.9.4.bb
> +++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
> @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b"
> 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://run-ptest \
> "
>
> SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
> @@ -17,6 +19,14 @@ SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f
>
> BINCONFIG = "${bindir}/onig-config"
>
> -inherit autotools binconfig-disabled
> +inherit autotools binconfig-disabled ptest
>
> BBCLASSEXTEND = "native"
> +
> +do_compile_ptest() {
> + oe_runmake -C test buildtest-TESTS
> +}
> +
> +do_install_ptest() {
> + install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/*
> +}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-oe][PATCH 1/2 v2] oniguruma: update to v6.9.4
2020-01-08 8:55 ` [meta-oe][PATCH 1/2 v2] oniguruma: update to v6.9.4 André Draszik
@ 2020-01-08 9:00 ` André Draszik
0 siblings, 0 replies; 7+ messages in thread
From: André Draszik @ 2020-01-08 9:00 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
Khem,
I got the subject line wrong originally - not sure if it's too late already...
Cheers,
Andre'
On Wed, 2020-01-08 at 08:55 +0000, André Draszik wrote:
> The version meta-oe is carrying is more than 4 years old,
> from 2015, with numerous CVEs fixed and more than 2000
> commits since.
>
> The license checksum changed because it contains the
> year (which is at 2019 now).
>
> Onigurama can now also be built using CMake, but for
> now this recipe stays with using autotools as only
> autotools builds support testing (which the next
> patch adds support for).
>
> Signed-off-by: André Draszik <git@andred.net>
>
> ---
> v2:
> * fix typo in subject line
> * fix SUMMARY
> ---
> .../onig/files/configure.patch | 13 ------
> .../files/do-not-use-system-headers.patch | 44 -------------------
> ...t-link-against-host-system-libraries.patch | 42 ++++++++++++++++++
> meta-oe/recipes-support/onig/onig_5.9.6.bb | 19 --------
> meta-oe/recipes-support/onig/onig_6.9.4.bb | 22 ++++++++++
> 5 files changed, 64 insertions(+), 76 deletions(-)
> delete mode 100644 meta-oe/recipes-support/onig/files/configure.patch
> delete mode 100644 meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
> create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch
> delete mode 100644 meta-oe/recipes-support/onig/onig_5.9.6.bb
> create mode 100644 meta-oe/recipes-support/onig/onig_6.9.4.bb
>
> diff --git a/meta-oe/recipes-support/onig/files/configure.patch b/meta-oe/recipes-support/onig/files/configure.patch
> deleted file mode 100644
> index 5fa700f19..000000000
> --- a/meta-oe/recipes-support/onig/files/configure.patch
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -Index: onig-5.9.3/configure.in
> -===================================================================
> ---- onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.000000000 +0000
> -+++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 +0000
> -@@ -3,7 +3,7 @@
> -
> - AC_CONFIG_MACRO_DIR([m4])
> -
> --AM_INIT_AUTOMAKE
> -+AM_INIT_AUTOMAKE([foreign])
> - AC_CONFIG_HEADER(config.h)
> -
> -
> diff --git a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch b/meta-oe/recipes-
> support/onig/files/do-not-use-system-headers.patch
> deleted file mode 100644
> index b93602a26..000000000
> --- a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> -
> -When build on host with older eglibc (Ubuntu 12.04) build fails with:
> -
> -/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: error: #error "Never use
> <bits/predefs.h> directly; include <stdc-predef.h> instead."
> -
> -Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> -
> -Upstream-Status: Inappropriate [embedded specific]
> -
> ----
> - Makefile.am | 2 +-
> - sample/Makefile.am | 2 +-
> - 2 files changed, 2 insertions(+), 2 deletions(-)
> -
> ---- onig-5.9.3.orig/Makefile.am
> -+++ onig-5.9.3/Makefile.am
> -@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample
> - libname = libonig.la
> -
> - ACLOCAL_AMFLAGS = -I m4
> - #AM_CFLAGS = -DNOT_RUBY
> - AM_CFLAGS =
> --INCLUDES = -I$(top_srcdir) -I$(includedir)
> -+INCLUDES = -I$(top_srcdir)
> -
> - SUBDIRS = . sample
> -
> - include_HEADERS = oniguruma.h oniggnu.h onigposix.h
> - lib_LTLIBRARIES = $(libname)
> ---- onig-5.9.3.orig/sample/Makefile.am
> -+++ onig-5.9.3/sample/Makefile.am
> -@@ -1,10 +1,10 @@
> - noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl
> -
> - libname = $(top_builddir)/libonig.la
> - LDADD = $(libname)
> --INCLUDES = -I$(top_srcdir) -I$(includedir)
> -+INCLUDES = -I$(top_srcdir)
> -
> - encode_SOURCES = encode.c
> - listcap_SOURCES = listcap.c
> - names_SOURCES = names.c
> - posix_SOURCES = posix.c
> 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
> new file mode 100644
> index 000000000..891592650
> --- /dev/null
> +++ b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch
> @@ -0,0 +1,42 @@
> +From 78103ecd18efcd0966531d8718f6e94dcb7a5abf Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net>
> +Date: Mon, 6 Jan 2020 16:56:31 +0000
> +Subject: [PATCH] build: don't link against (host) system libraries
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Inappropriate [OE specific]
> +Signed-off-by: André Draszik <git@andred.net>
> +---
> + sample/Makefile.am | 1 -
> + test/Makefile.am | 1 -
> + 2 files changed, 2 deletions(-)
> +
> +diff --git a/sample/Makefile.am b/sample/Makefile.am
> +index 22a4989..e935bf0 100644
> +--- a/sample/Makefile.am
> ++++ b/sample/Makefile.am
> +@@ -3,7 +3,6 @@
> + lib_onig = ../src/libonig.la
> + LDADD = $(lib_onig)
> +
> +-AM_LDFLAGS = -L$(prefix)/lib
> + AM_CPPFLAGS = -I$(top_srcdir)/src
> +
> + if ENABLE_POSIX_API
> +diff --git a/test/Makefile.am b/test/Makefile.am
> +index 4d62568..b7a2105 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_CFLAGS = -Wall -Wno-invalid-source-encoding
> + AM_CPPFLAGS = -I$(top_srcdir)/src
> +
> +--
> +2.23.0.rc1
> +
> diff --git a/meta-oe/recipes-support/onig/onig_5.9.6.bb b/meta-oe/recipes-support/onig/onig_5.9.6.bb
> deleted file mode 100644
> index 20a71c6c9..000000000
> --- a/meta-oe/recipes-support/onig/onig_5.9.6.bb
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -DESCRIPTION = "Regular expressions library. The characteristics of this \
> -library is that different character encoding for every regular expression \
> -object can be specified."
> -HOMEPAGE = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/"
> -LICENSE = "BSD-2-Clause"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f"
> -
> -SRC_URI = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/archive/${BP}.tar.gz
> \
> - file://do-not-use-system-headers.patch \
> - file://configure.patch"
> -
> -SRC_URI[md5sum] = "d08f10ea5c94919780e6b7bed1ef9830"
> -SRC_URI[sha256sum] = "d5642010336a6f68b7f2e34b1f1cb14be333e4d95c2ac02b38c162caf44e47a7"
> -
> -BINCONFIG = "${bindir}/onig-config"
> -
> -inherit autotools binconfig-disabled
> -
> -BBCLASSEXTEND = "native"
> diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb b/meta-oe/recipes-support/onig/onig_6.9.4.bb
> new file mode 100644
> index 000000000..d873088fe
> --- /dev/null
> +++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
> @@ -0,0 +1,22 @@
> +SUMMARY = "Regular expressions library"
> +DESCRIPTION = "Oniguruma is a modern and flexible regular expressions library. \
> +It encompasses features from different regular expression \
> +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"
> +
> +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 \
> +"
> +
> +SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
> +SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53"
> +
> +BINCONFIG = "${bindir}/onig-config"
> +
> +inherit autotools binconfig-disabled
> +
> +BBCLASSEXTEND = "native"
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-01-08 9:00 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-07 15:46 [meta-oe][PATCH 1/2] onigurama: update to v6.9.4 André Draszik
2020-01-07 15:46 ` [meta-oe][PATCH 2/2] onigurama: enable ptest André Draszik
2020-01-07 16:04 ` [meta-oe][PATCH 2/2 v2] " André Draszik
2020-01-08 8:56 ` [meta-oe][PATCH 2/2 v3] oniguruma: " André Draszik
2020-01-08 9:00 ` André Draszik
2020-01-08 8:55 ` [meta-oe][PATCH 1/2 v2] oniguruma: update to v6.9.4 André Draszik
2020-01-08 9:00 ` André Draszik
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.