diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-connectivity')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb (renamed from meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb) | 7 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.2.bb (renamed from meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch | 28 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb | 18 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch | 104 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb | 19 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch | 180 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb | 1 |
8 files changed, 200 insertions, 159 deletions
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb index 6c68aede03..af4f2c54bb 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb @@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77" DEPENDS += "openssl gperf-native" -SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-${PV}.tar.bz2 \ +SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_19/ACE-${PV}.tar.bz2 \ file://ace_config.patch \ file://no_sysctl.patch \ " - -SRC_URI[sha256sum] = "ccd94fa45df1e8bb1c901d02c0a64c1626497e5eeda2f057fcf0a1578dae2148" +SRC_URI[sha256sum] = "739be290a38229aaa5b5150e6ea55ce427e80970f0ace4c5040ac46644526f41" COMPATIBLE_HOST:libc-musl = "null" @@ -23,7 +22,7 @@ export ACE_ROOT="${WORKDIR}/ACE_wrappers" inherit pkgconfig CXXFLAGS:append = " -fpermissive -Wnodeprecated-declarations" -CXX:append = " -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " +CXX:append = " -std=gnu++14 -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.2.bb index 91450e2c77..4aca6fee5f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ " -SRCREV = "d512218c4fa5667d4fe15977d3f15f05591f1f1a" +SRCREV = "c1e878f5710bafb17aca5ece7d9079e73a78c554" SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch deleted file mode 100644 index 8d8867aea7..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch +++ /dev/null @@ -1,28 +0,0 @@ -Using AC_RUN_IFELSE prevent people from configuring package for -cross-compiling. Don't run code while configuring package. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Index: git/scripts/common.m4 -=================================================================== ---- git.orig/scripts/common.m4 -+++ git/scripts/common.m4 -@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses t - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <execinfo.h> - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], -@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <inttypes.h> - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index 28a3e1e77a..50096cfdbc 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -1,36 +1,32 @@ DESCRIPTION = "libTorrent is a BitTorrent library written in C++ for *nix, \ with a focus on high performance and good code." HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "zlib libsigc++-2.0 openssl cppunit" -SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https \ - file://don-t-run-code-while-configuring-package.patch \ - " -SRCREV = "756f70010779927dc0691e1e722ed433d5d295e1" +SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https" +SRCREV = "e60f222241319aaae482789517ad00ae9344bd13" CVE_CHECK_IGNORE += "\ CVE-2009-1760 \ " -PV = "0.13.8" +PV = "0.13.8+git${SRCPV}" S = "${WORKDIR}/git" -PACKAGECONFIG ??= "instrumentation" + +PACKAGECONFIG ??= "instrumentation aligned" PACKAGECONFIG:remove:mipsarch = "instrumentation" PACKAGECONFIG:remove:powerpc = "instrumentation" PACKAGECONFIG:remove:riscv32 = "instrumentation" PACKAGECONFIG[instrumentation] = "--enable-instrumentation,--disable-instrumentation," +PACKAGECONFIG[aligned] = "--enable-aligned,--disable-aligned," inherit autotools pkgconfig EXTRA_OECONF = "--with-zlib=${STAGING_EXECPREFIXDIR}" - -do_configure:prepend() { - (cd ${S}; ./autogen.sh; cd -) -} diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch deleted file mode 100644 index 7d09f4382f..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch +++ /dev/null @@ -1,104 +0,0 @@ -Using AC_RUN_IFELSE prevent people from configuring package - for cross-compiling. Don't run code while configuring package. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Update for 0.9.8. -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - scripts/checks.m4 | 34 ---------------------------------- - scripts/common.m4 | 28 ---------------------------- - 2 files changed, 62 deletions(-) - -diff --git a/scripts/checks.m4 b/scripts/checks.m4 -index 83be846..1af80f5 100644 ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -95,40 +95,6 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - - AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ - AC_MSG_CHECKING(whether kqueue supports pipes and ptys) -- -- AC_LINK_IFELSE([AC_LANG_SOURCE([ -- #include <fcntl.h> -- #include <stdlib.h> -- #include <unistd.h> -- #include <sys/event.h> -- #include <sys/time.h> -- int main() { -- struct kevent ev@<:@2@:>@, ev_out@<:@2@:>@; -- struct timespec ts = { 0, 0 }; -- int pfd@<:@2@:>@, pty@<:@2@:>@, kfd, n; -- char buffer@<:@9001@:>@; -- if (pipe(pfd) == -1) return 1; -- if (fcntl(pfd@<:@1@:>@, F_SETFL, O_NONBLOCK) == -1) return 2; -- while ((n = write(pfd@<:@1@:>@, buffer, sizeof(buffer))) == sizeof(buffer)); -- if ((pty@<:@0@:>@=posix_openpt(O_RDWR | O_NOCTTY)) == -1) return 3; -- if ((pty@<:@1@:>@=grantpt(pty@<:@0@:>@)) == -1) return 4; -- EV_SET(ev+0, pfd@<:@1@:>@, EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, NULL); -- EV_SET(ev+1, pty@<:@1@:>@, EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, NULL); -- if ((kfd = kqueue()) == -1) return 5; -- if ((n = kevent(kfd, ev, 2, NULL, 0, NULL)) == -1) return 6; -- if (ev_out@<:@0@:>@.flags & EV_ERROR) return 7; -- if (ev_out@<:@1@:>@.flags & EV_ERROR) return 8; -- read(pfd@<:@0@:>@, buffer, sizeof(buffer)); -- if ((n = kevent(kfd, NULL, 0, ev_out, 2, &ts)) < 1) return 9; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(yes) -- ], [ -- AC_DEFINE(KQUEUE_SOCKET_ONLY, 1, kqueue only supports sockets.) -- AC_MSG_RESULT(no) -- ]) - ]) - - AC_DEFUN([TORRENT_WITH_KQUEUE], [ -diff --git a/scripts/common.m4 b/scripts/common.m4 -index aaf005e..42fb016 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -152,38 +152,10 @@ dnl Need to fix this so that it uses the stuff defined by the system. - - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) -- -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -- #include <execinfo.h> -- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} -- ])], -- [ -- AC_MSG_RESULT(yes) -- AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h) -- ], [ -- AC_MSG_RESULT(no) -- ]) - ]) - - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) -- -- AC_LINK_IFELSE([AC_LANG_SOURCE([ -- #include <inttypes.h> -- int main() { -- char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; -- int i; -- for (i = 1; i < 4; ++i) -- if (*(uint32_t*)(buf + i) == 0) return -1; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(none needed) -- ], [ -- AC_DEFINE(USE_ALIGNED, 1, Require byte alignment) -- AC_MSG_RESULT(required) -- ]) - ]) - - --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index 7879324cc6..d5411b19b2 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -1,17 +1,14 @@ SUMMARY = "Torrent client" HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" +DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses" -SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https \ - file://don-t-run-code-while-configuring-package.patch \ -" -# v0.9.8 -SRCREV = "6154d1698756e0c4842b1c13a0e56db93f1aa947" +SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https" +SRCREV = "d067bd802e44f0e6a747aabcc311ada2175fd550" -PV = "0.9.8" +PV = "0.9.8+git${SRCPV}" S = "${WORKDIR}/git" @@ -21,6 +18,6 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," inherit autotools pkgconfig -do_configure:prepend() { - (cd ${S}; ./autogen.sh; cd -) -} +EXTRA_AUTORECONF += "--exclude=aclocal" + +CXXFLAGS += "-std=gnu++14" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch new file mode 100644 index 0000000000..fd995153b3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch @@ -0,0 +1,180 @@ +From 0b9c6c4286a33961016839826e709a0e7394b28b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Jan 2023 00:00:04 -0800 +Subject: [PATCH] cmake: Use -idirafter instead of -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/thrift/0.17.0-r0/recipe-sysroot/usr/include/c++/v1/cstdlib:90:5: error: <cstdlib> tried including <stdlib.h> but didn't find libc++'s <stdlib.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard Library, and you are probably using compiler flags that make that not be the case. + ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + build/cmake/BoostMacros.cmake | 2 +- + lib/c_glib/CMakeLists.txt | 4 ++-- + lib/c_glib/test/CMakeLists.txt | 2 +- + lib/cpp/CMakeLists.txt | 7 +++---- + lib/cpp/test/CMakeLists.txt | 2 +- + test/c_glib/CMakeLists.txt | 6 +++--- + test/cpp/CMakeLists.txt | 6 +++--- + 7 files changed, 14 insertions(+), 15 deletions(-) + +diff --git a/build/cmake/BoostMacros.cmake b/build/cmake/BoostMacros.cmake +index ffb85af..9f9d2dd 100644 +--- a/build/cmake/BoostMacros.cmake ++++ b/build/cmake/BoostMacros.cmake +@@ -26,7 +26,7 @@ macro(REQUIRE_BOOST_HEADERS) + endif() + if (DEFINED Boost_INCLUDE_DIRS) + # pre-boost 1.70.0 aware cmake, otherwise it is using targets +- include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${Boost_INCLUDE_DIRS}") + endif() + endmacro() + +diff --git a/lib/c_glib/CMakeLists.txt b/lib/c_glib/CMakeLists.txt +index 218f7dd..d7a6161 100644 +--- a/lib/c_glib/CMakeLists.txt ++++ b/lib/c_glib/CMakeLists.txt +@@ -83,7 +83,7 @@ if(OPENSSL_FOUND AND WITH_OPENSSL) + list(APPEND SYSLIBS OpenSSL::Crypto) + endif() + else() +- include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") + endif() + endif() +@@ -97,7 +97,7 @@ target_link_libraries(thrift_c_glib PUBLIC ${SYSLIBS}) + + # If Zlib is not found just ignore the Zlib stuff + if(WITH_ZLIB) +- include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + ADD_LIBRARY_THRIFT(thrift_c_glib_zlib ${thrift_c_glib_zlib_SOURCES}) + target_link_libraries(thrift_c_glib_zlib ${SYSLIBS} ${ZLIB_LIBRARIES}) + target_link_libraries(thrift_c_glib_zlib thrift_c_glib) +diff --git a/lib/c_glib/test/CMakeLists.txt b/lib/c_glib/test/CMakeLists.txt +index 85c6dd0..0c8d3d2 100644 +--- a/lib/c_glib/test/CMakeLists.txt ++++ b/lib/c_glib/test/CMakeLists.txt +@@ -129,7 +129,7 @@ target_link_libraries(testthriftmemorybufferreadcheck testgenc) + add_test(NAME testthriftmemorybufferreadcheck COMMAND testthriftmemorybufferreadcheck) + + if(WITH_ZLIB) +- include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + add_executable(testzlibtransport testzlibtransport.c) + target_link_libraries(testzlibtransport testgenc ${ZLIB_LIBRARIES}) + target_link_libraries(testzlibtransport thrift_c_glib_zlib) +diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt +index 13b41c5..96bea53 100644 +--- a/lib/cpp/CMakeLists.txt ++++ b/lib/cpp/CMakeLists.txt +@@ -111,7 +111,7 @@ if(OPENSSL_FOUND AND WITH_OPENSSL) + list(APPEND SYSLIBS OpenSSL::Crypto) + endif() + else() +- include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") + endif() + endif() +@@ -167,8 +167,7 @@ ADD_PKGCONFIG_THRIFT(thrift) + + if(WITH_LIBEVENT) + find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream +- include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) +- ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${LIBEVENT_INCLUDE_DIRS}") + ADD_LIBRARY_THRIFT(thriftnb ${thriftcppnb_SOURCES}) + target_link_libraries(thriftnb PUBLIC thrift) + if(TARGET libevent::core AND TARGET libevent::extra) +@@ -182,7 +181,7 @@ endif() + + if(WITH_ZLIB) + find_package(ZLIB REQUIRED) +- include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + + ADD_LIBRARY_THRIFT(thriftz ${thriftcppz_SOURCES}) + target_link_libraries(thriftz PUBLIC thrift) +diff --git a/lib/cpp/test/CMakeLists.txt b/lib/cpp/test/CMakeLists.txt +index 19854e1..1b36b47 100644 +--- a/lib/cpp/test/CMakeLists.txt ++++ b/lib/cpp/test/CMakeLists.txt +@@ -127,7 +127,7 @@ endif () + add_test(NAME TServerIntegrationTest COMMAND TServerIntegrationTest) + + if(WITH_ZLIB) +-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + add_executable(TransportTest TransportTest.cpp) + target_link_libraries(TransportTest + testgencpp +diff --git a/test/c_glib/CMakeLists.txt b/test/c_glib/CMakeLists.txt +index 410774d..cbda860 100644 +--- a/test/c_glib/CMakeLists.txt ++++ b/test/c_glib/CMakeLists.txt +@@ -21,14 +21,14 @@ + include(ThriftMacros) + + find_package(GLIB REQUIRED COMPONENTS gobject) +-include_directories(SYSTEM "${GLIB_INCLUDE_DIR}") +-include_directories(SYSTEM "${GLIBCONFIG_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${GLIB_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${GLIBCONFIG_INCLUDE_DIR}") + + #Make sure gen-c_glib files can be included + include_directories("${CMAKE_CURRENT_BINARY_DIR}") + include_directories("${CMAKE_CURRENT_BINARY_DIR}/gen-c_glib") + include_directories("${PROJECT_SOURCE_DIR}/lib/c_glib/src") +-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + + set(crosstestgencglib_SOURCES + gen-c_glib/t_test_second_service.c +diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt +index a6c1fd5..160c67b 100644 +--- a/test/cpp/CMakeLists.txt ++++ b/test/cpp/CMakeLists.txt +@@ -27,13 +27,13 @@ REQUIRE_BOOST_LIBRARIES(BOOST_COMPONENTS) + include(ThriftMacros) + + find_package(OpenSSL REQUIRED) +-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + + find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream +-include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${LIBEVENT_INCLUDE_DIRS}") + + find_package(ZLIB REQUIRED) +-include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + + #Make sure gen-cpp files can be included + include_directories("${CMAKE_CURRENT_BINARY_DIR}") +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb index 24d07b8e52..216af02c42 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb @@ -10,6 +10,7 @@ DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz \ file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ + file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ " SRC_URI[sha256sum] = "b272c1788bb165d99521a2599b31b97fa69e5931d099015d91ae107a0b0cc58f" |