diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-dbs/soci')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/soci/soci/0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch | 42 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.3.bb (renamed from meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.2.bb) | 5 |
2 files changed, 2 insertions, 45 deletions
diff --git a/meta-openembedded/meta-oe/recipes-dbs/soci/soci/0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch b/meta-openembedded/meta-oe/recipes-dbs/soci/soci/0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch deleted file mode 100644 index 8e32ebb0bf..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/soci/soci/0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch +++ /dev/null @@ -1,42 +0,0 @@ -From fae154eb209e068586e1adb589de5d273fcf4b4f Mon Sep 17 00:00:00 2001 -From: Denis Arnaud <denis.arnaud_fedora@m4x.org> -Date: Tue, 18 May 2021 00:05:03 +0200 -Subject: [PATCH] Fix build when SIGSTKSZ is no longer a constant - -In the latest glibc versions SIGSTKSZ is not a constant any more, which -broke building the tests with it. - -Work around this by hard-coding a typical value for it. - -closes #886. - -Upstream-Status: Backport. ---- - tests/catch.hpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/catch.hpp b/tests/catch.hpp -index 014df2c5..85067813 100644 ---- a/tests/catch.hpp -+++ b/tests/catch.hpp -@@ -6489,7 +6489,7 @@ namespace Catch { - static bool isSet; - static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; - static stack_t oldSigStack; -- static char altStackMem[SIGSTKSZ]; -+ static char altStackMem[8192]; - - static void handleSignal( int sig ) { - std::string name = "<unknown signal>"; -@@ -6540,7 +6540,7 @@ namespace Catch { - bool FatalConditionHandler::isSet = false; - struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; - stack_t FatalConditionHandler::oldSigStack = {}; -- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; -+ char FatalConditionHandler::altStackMem[8192] = {}; - - } // namespace Catch - --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.2.bb b/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.3.bb index fb67e0c547..ff47e5033e 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/soci/soci_4.0.3.bb @@ -5,9 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SECTION = "libs" DEPENDS = "boost" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz \ - file://0001-Fix-build-when-SIGSTKSZ-is-no-longer-a-constant.patch" -SRC_URI[sha256sum] = "34da2d2320539463da8a5131253246fa2671e0438ab5fd1e5119edb428f558a5" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz" +SRC_URI[sha256sum] = "615e5f7e4b52007f3a3b4050a99aadf6346b56b5098eb08b3a650836083c6a33" TESTCONFIG = '-DSOCI_TEST_EMPTY_CONNSTR="dummy" -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \ -DSOCI_TEST_POSTGRESQL_CONNSTR:STRING="dbname=soci_test" \ |