diff options
| author | Khem Raj <raj.khem@gmail.com> | 2023-01-02 22:05:36 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-01-04 15:33:58 -0800 |
| commit | ed18e545c9f1ac1a0b23458323d07e3da24c646d (patch) | |
| tree | dca8aa1ef8c715dc6bf5f1d0bf3c5804ed78bb00 | |
| parent | 5d304b24af348c7050a590b5ba65a8b154f4084d (diff) | |
| download | meta-openembedded-ed18e545c9f1ac1a0b23458323d07e3da24c646d.tar.gz | |
libcereal,poco: Link with -latomic on ppc32 as well
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb | 1 | ||||
| -rw-r--r-- | meta-oe/recipes-support/poco/poco_1.12.4.bb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index 5248b1e288..a40d2bc2e6 100644 --- a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb | |||
| @@ -29,6 +29,7 @@ inherit cmake pkgconfig ptest | |||
| 29 | 29 | ||
| 30 | LIBATOMIC:mips = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" | 30 | LIBATOMIC:mips = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" |
| 31 | LIBATOMIC:riscv32 = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" | 31 | LIBATOMIC:riscv32 = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" |
| 32 | LIBATOMIC:powerpc = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" | ||
| 32 | 33 | ||
| 33 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" | 34 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" |
| 34 | PACKAGECONFIG[with-tests] = "-DWITH_WERROR=OFF -DBUILD_TESTS=ON ${LIBATOMIC},," | 35 | PACKAGECONFIG[with-tests] = "-DWITH_WERROR=OFF -DBUILD_TESTS=ON ${LIBATOMIC},," |
diff --git a/meta-oe/recipes-support/poco/poco_1.12.4.bb b/meta-oe/recipes-support/poco/poco_1.12.4.bb index fc8e4deced..f66a272524 100644 --- a/meta-oe/recipes-support/poco/poco_1.12.4.bb +++ b/meta-oe/recipes-support/poco/poco_1.12.4.bb | |||
| @@ -65,6 +65,7 @@ EXTRA_OECMAKE:append = " -DCMAKE_SKIP_RPATH=ON" | |||
| 65 | 65 | ||
| 66 | LDFLAGS:append:riscv32 = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" | 66 | LDFLAGS:append:riscv32 = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" |
| 67 | LDFLAGS:append:mips = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" | 67 | LDFLAGS:append:mips = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" |
| 68 | LDFLAGS:append:powerpc = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" | ||
| 68 | 69 | ||
| 69 | python populate_packages:prepend () { | 70 | python populate_packages:prepend () { |
| 70 | poco_libdir = d.expand('${libdir}') | 71 | poco_libdir = d.expand('${libdir}') |
