From 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf Mon Sep 17 00:00:00 2001 From: takeshi_hoshina Date: Mon, 2 Nov 2020 11:07:33 +0900 Subject: basesystem-jj recipes --- ...-don-t-link-against-host-system-libraries.patch | 42 +++++++++++++++++++ ...le-serial-tests-automake-option-for-ptest.patch | 36 +++++++++++++++++ .../meta-oe/recipes-support/onig/onig/run-ptest | 47 ++++++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 external/meta-openembedded/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch create mode 100755 external/meta-openembedded/meta-oe/recipes-support/onig/onig/run-ptest (limited to 'external/meta-openembedded/meta-oe/recipes-support/onig/onig') diff --git a/external/meta-openembedded/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch b/external/meta-openembedded/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch new file mode 100644 index 00000000..89159265 --- /dev/null +++ b/external/meta-openembedded/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?= +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 +--- + 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/external/meta-openembedded/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch b/external/meta-openembedded/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch new file mode 100644 index 00000000..587e5ac1 --- /dev/null +++ b/external/meta-openembedded/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?= +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 +--- + 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/external/meta-openembedded/meta-oe/recipes-support/onig/onig/run-ptest b/external/meta-openembedded/meta-oe/recipes-support/onig/onig/run-ptest new file mode 100755 index 00000000..2574d7ef --- /dev/null +++ b/external/meta-openembedded/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 ] -- cgit 1.2.3-korg