[OE-core] [PATCH] fontconfig: update to 2.13.1
Signed-off-by: Oleksandr Kravchuk --- c-Fix-define-for-HAVE_POSIX_FADVISE.patch | 33 --- ...cxml.c-avoid-double-free-of-filename.patch | 28 .../fontconfig/revert-static-pkgconfig.patch | 12 +++ ...tconfig_2.12.6.bb => fontconfig_2.13.1.bb} | 14 4 files changed, 12 insertions(+), 75 deletions(-) delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch rename meta/recipes-graphics/fontconfig/{fontconfig_2.12.6.bb => fontconfig_2.13.1.bb} (81%) diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch deleted file mode 100644 index d9bce212f6..00 --- a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Mon, 24 Dec 2018 11:03:58 +0800 -Subject: [PATCH] src/fccache.c: Fix define for HAVE_POSIX_FADVISE - -Otherwise, there would be build errors in the following 2 cases: -* define HAVE_POSIX_FADVISE -Or: -* undef HAVE_POSIX_FADVISE - -Upstream-Status: Backport [https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/586e35450e9ca7c1dc647ceb9d75ac8ed08c5c16] - -Signed-off-by: Robert Yang - fccache.c |2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/fccache.c b/src/fccache.c -index 6f3c68a..85cc4b4 100644 a/src/fccache.c -+++ b/src/fccache.c -@@ -700,7 +700,7 @@ FcDirCacheMapFd (FcConfig *config, int fd, struct stat *fd_stat, struct stat *di - { - #if defined(HAVE_MMAP) || defined(__CYGWIN__) - cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0); --#if (HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED) -+#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED) - posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED); - #endif - if (cache == MAP_FAILED) --- -2.7.4 - diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch deleted file mode 100644 index 3ca9fde967..00 --- a/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a163c81ac430cdc292add200f3e6a0c048be4d7e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 11 Oct 2017 17:40:09 +0300 -Subject: [PATCH] src/fcxml.c: avoid double free() of filename - -It's also freed after bail1, so no need to do it here. - -Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=103221] -Signed-off-by: Alexander Kanavin - src/fcxml.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/fcxml.c b/src/fcxml.c -index 19ce96a..edb6054 100644 a/src/fcxml.c -+++ b/src/fcxml.c -@@ -3398,7 +3398,6 @@ FcConfigParseAndLoad (FcConfig *config, - - fd = FcOpen ((char *) filename, O_RDONLY); - if (fd == -1) { -- FcStrFree (filename); - goto bail1; - } - --- -2.14.1 - diff --git a/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch index fca1e65946..30d6423037 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch +++ b/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch @@ -8,13 +8,13 @@ gently refuses and rightly so. Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj -Index: fontconfig-2.11.93/fontconfig.pc.in -=== fontconfig-2.11.93.orig/fontconfig.pc.in -+++ fontconfig-2.11.93/fontconfig.pc.in +diff --git a/fontconfig.pc.in b/fontconfig.pc.in +index 61b35fb..5bc9bab 100644 +--- a/fontconfig.pc.in b/fontconfig.pc.in @@ -15,4 +15,4 @@ Requires: @PKGCONFIG_REQUIRES@ Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@ Libs: -L${libdir} -lfontconfig - Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ @LIBXML2_LIBS@ --Cflags: -I${includedir} @EXPAT_CFLAGS@ @FREETYPE_CFLAGS@ @ICONV_CFLAGS@ @LIBXML2_CFLAGS@ + Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@ +-Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@ +Cflags: -I${includedir} diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb similarity index 81% rename from meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb rename to meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb index 8fa739de24..9c7fcace43
[OE-core] [PATCH] pango: update to 1.43.0
Signed-off-by: Oleksandr Kravchuk --- .../pango/{pango_1.42.4.bb => pango_1.43.0.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/pango/{pango_1.42.4.bb => pango_1.43.0.bb} (93%) diff --git a/meta/recipes-graphics/pango/pango_1.42.4.bb b/meta/recipes-graphics/pango/pango_1.43.0.bb similarity index 93% rename from meta/recipes-graphics/pango/pango_1.42.4.bb rename to meta/recipes-graphics/pango/pango_1.43.0.bb index d3357f82de..e91e02a837 100644 --- a/meta/recipes-graphics/pango/pango_1.42.4.bb +++ b/meta/recipes-graphics/pango/pango_1.43.0.bb @@ -18,8 +18,8 @@ inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspec SRC_URI += "file://run-ptest \ file://insensitive-diff.patch" -SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c" -SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d" +SRC_URI[archive.md5sum] = "2df040d3f6a4ed9bc316a70b35adcd8b" +SRC_URI[archive.sha256sum] = "d2c0c253a5328a0eccb00cdd66ce2c8713fabd2c9836000b6e22a8b06ba3ddd2" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ethtool: update to 5.0
Changelog: - Feature: don't report UFO on kernels v4.14 and above - Fix: zero initialize coalesce struct - Feature: dsa: add pretty dump - Feature: dsa: mv88e6xxx: add pretty dump - Feature: dsa: mv88e6xxx: add pretty dump for 88E6185 - Feature: dsa: mv88e6xxx: add pretty dump for 88E6161 - Feature: dsa: mv88e6xxx: add pretty dump for 88E6352 - Feature: dsa: mv88e6xxx: add pretty dump for 88E6390 - Feature: dsa: mv88e6xxx: add pretty dump for others Signed-off-by: Oleksandr Kravchuk --- .../ethtool/ethtool/avoid_parallel_tests.patch| 2 +- .../ethtool/{ethtool_4.19.bb => ethtool_5.0.bb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-extended/ethtool/{ethtool_4.19.bb => ethtool_5.0.bb} (88%) diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index beae5f98c3..b145188d7f 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -19,7 +19,7 @@ index e891d91..600f8a8 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 4.19, net...@vger.kernel.org) + AC_INIT(ethtool, 5.0, net...@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu]) diff --git a/meta/recipes-extended/ethtool/ethtool_4.19.bb b/meta/recipes-extended/ethtool/ethtool_5.0.bb similarity index 88% rename from meta/recipes-extended/ethtool/ethtool_4.19.bb rename to meta/recipes-extended/ethtool/ethtool_5.0.bb index 74e255c24b..76cdf9c4e7 100644 --- a/meta/recipes-extended/ethtool/ethtool_4.19.bb +++ b/meta/recipes-extended/ethtool/ethtool_5.0.bb @@ -11,8 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[md5sum] = "a533db1d202724822c4ef297643fac12" -SRC_URI[sha256sum] = "e8e88f5a79c78e542cd84fee60b67dbf29cee63e4760e8d61544fea74c761ad1" +SRC_URI[md5sum] = "8998c9eb7e491b0aec420a807ce52ba6" +SRC_URI[sha256sum] = "cc53a6d4d5643f8993ef20d6b638f88d9035529a9e777e222073c3a5b9237178" inherit autotools ptest RDEPENDS_${PN}-ptest += "make" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ofono: update to 1.28
Deleted patch has been mainstremaed. Changelog: ver 1.28: - Fix issue with SIM initialization and Gemalto modems. ver 1.27: - Add support for handling SIMCom based SIM800 modems. - Add support for SIM lock state with xmm7xxx modems. - Add support for coexistence feature with xmm7xxx modems. ver 1.26: - Fix issue with AT callback handler and GPRS. - Fix issue with handling EUTRAN SMS only states. - Fix issue with handling MBIM strings on big endian. - Fix issue with missing char and SMS national language. - Fix issue with unsolicited notifications of +CGAUTH/+CGDCONT. - Add support for setting "none" authentication method. - Add support for SMS and phonebook with xmm7xxx modems. - Add support for voice features and Gemalto modems. - Add support for Bengali and Gujrati SMS alphabets. - Add support for 8 additional languages for GSM 7 bit - Add support for using internal Embedded Linux library. Signed-off-by: Oleksandr Kravchuk --- meta/recipes-connectivity/ofono/ofono.inc | 7 ++--- .../ofono/ofono/use-python3.patch | 27 --- meta/recipes-connectivity/ofono/ofono_1.25.bb | 9 --- meta/recipes-connectivity/ofono/ofono_1.28.bb | 8 ++ 4 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 meta/recipes-connectivity/ofono/ofono/use-python3.patch delete mode 100644 meta/recipes-connectivity/ofono/ofono_1.25.bb create mode 100644 meta/recipes-connectivity/ofono/ofono_1.28.bb diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index 0472414b19..37772121f8 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc @@ -1,13 +1,14 @@ HOMEPAGE = "http://www.ofono.org; -SUMMARY = "open source telephony" -DESCRIPTION = "oFono is a stack for mobile telephony devices on Linux. oFono supports speaking to telephony devices through specific drivers, or with generic AT commands." +SUMMARY = "Open Source Telephony" +DESCRIPTION = "oFono is a stack for mobile telephony devices on Linux. \ +oFono supports speaking to telephony devices through specific drivers, or with generic AT commands." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" inherit autotools pkgconfig update-rc.d systemd bluetooth gobject-introspection-data -DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info" +DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" INITSCRIPT_NAME = "ofono" INITSCRIPT_PARAMS = "defaults 22" diff --git a/meta/recipes-connectivity/ofono/ofono/use-python3.patch b/meta/recipes-connectivity/ofono/ofono/use-python3.patch deleted file mode 100644 index 7b84075257..00 --- a/meta/recipes-connectivity/ofono/ofono/use-python3.patch +++ /dev/null @@ -1,27 +0,0 @@ -set-ddr should use Python3 like all the other tests. - -Upstream-Status: Submitted -Signed-off-by: Ross Burton - -From 17b69cd1da4c5c5f732acb38ca1602446c567ee7 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Mon, 29 Jan 2018 11:31:25 + -Subject: [PATCH] test/setddr: use Python 3 - -All the other tests use Python 3, so this should to. - test/set-ddr | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/set-ddr b/test/set-ddr -index 5d061b95..33631f31 100755 a/test/set-ddr -+++ b/test/set-ddr -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - import sys - import dbus --- -2.11.0 diff --git a/meta/recipes-connectivity/ofono/ofono_1.25.bb b/meta/recipes-connectivity/ofono/ofono_1.25.bb deleted file mode 100644 index 3688b9d2fc..00 --- a/meta/recipes-connectivity/ofono/ofono_1.25.bb +++ /dev/null @@ -1,9 +0,0 @@ -require ofono.inc - -SRC_URI = "\ - ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ - file://ofono \ - file://use-python3.patch \ -" -SRC_URI[md5sum] = "31450cabdd8dbbf3f808ea2f2f066863" -SRC_URI[sha256sum] = "eb011fcd3080e93f3a56f96be60350b6595a8b5f36b61646312ba41b0bcb0d75" diff --git a/meta/recipes-connectivity/ofono/ofono_1.28.bb b/meta/recipes-connectivity/ofono/ofono_1.28.bb new file mode 100644 index 00..130a902322 --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono_1.28.bb @@ -0,0 +1,8 @@ +require ofono.inc + +SRC_URI = "\ +${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ +file://ofono \ +" +SRC_URI[md5sum] = "3a5406565b552b16602610619b034967" +SRC_URI[sha256sum] = "93bb2cedef54f897dd5200e22b072a6e38b5d9b44be57eebbbe8d513f0beb0e4" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] ninja: upate to 1.9.0
Khem - Unfortunately, I could not find a solution of the doxygen build issue. I have failed bug on doxygen and hope the community will assist: https://github.com/doxygen/doxygen/issues/6906 On 28/03/2019 17:45, Khem Raj wrote: > doxygen still fails > > https://errors.yoctoproject.org/Errors/Details/234762/ > > On Sat, Mar 23, 2019 at 9:39 AM Oleksandr Kravchuk > wrote: >> Signed-off-by: Oleksandr Kravchuk >> --- >> .../ninja/ninja/fix-musl.patch| 39 +++ >> .../ninja/{ninja_1.8.2.bb => ninja_1.9.0.bb} | 6 ++- >> 2 files changed, 43 insertions(+), 2 deletions(-) >> create mode 100644 meta/recipes-devtools/ninja/ninja/fix-musl.patch >> rename meta/recipes-devtools/ninja/{ninja_1.8.2.bb => ninja_1.9.0.bb} (87%) >> >> diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch >> b/meta/recipes-devtools/ninja/ninja/fix-musl.patch >> new file mode 100644 >> index 00..543d4f1c48 >> --- /dev/null >> +++ b/meta/recipes-devtools/ninja/ninja/fix-musl.patch >> @@ -0,0 +1,39 @@ >> +2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001 >> +From: makepost >> +Date: Mon, 24 Dec 2018 03:13:16 +0200 >> +Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 >> + >> +In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward >> +compatibility macro. Should help avoid hardcoding platform detection. >> +--- >> + src/disk_interface.cc | 14 -- >> + 1 file changed, 4 insertions(+), 10 deletions(-) >> + >> +diff --git a/src/disk_interface.cc b/src/disk_interface.cc >> +index d4c2fb087..dc297c449 100644 >> +--- src/disk_interface.cc >> /src/disk_interface.cc >> +@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, >> string* err) const { >> + // that it doesn't exist. >> + if (st.st_mtime == 0) >> + return 1; >> +-#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE) >> ++#if defined(_AIX) >> ++ return (int64_t)st.st_mtime * 10LL + st.st_mtime_n; >> ++#elif defined(__APPLE__) >> + return ((int64_t)st.st_mtimespec.tv_sec * 10LL + >> + st.st_mtimespec.tv_nsec); >> +-#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || >> defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \ >> +- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || >> defined(__FreeBSD__)) >> +- // For glibc, see "Timestamp files" in the Notes of >> http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html >> +- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and >> define the right macro values above. >> +- // For bsd, see >> https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar >> +- // For bionic, C and POSIX API is always enabled. >> +- // For solaris, see >> https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html. >> ++#elif defined(st_mtime) // A macro, so we're likely on modern POSIX. >> + return (int64_t)st.st_mtim.tv_sec * 10LL + st.st_mtim.tv_nsec; >> +-#elif defined(_AIX) >> +- return (int64_t)st.st_mtime * 10LL + st.st_mtime_n; >> + #else >> + return (int64_t)st.st_mtime * 10LL + st.st_mtimensec; >> + #endif >> diff --git a/meta/recipes-devtools/ninja/ninja_1.8.2.bb >> b/meta/recipes-devtools/ninja/ninja_1.9.0.bb >> similarity index 87% >> rename from meta/recipes-devtools/ninja/ninja_1.8.2.bb >> rename to meta/recipes-devtools/ninja/ninja_1.9.0.bb >> index c6fcfef3dd..1b06328961 100644 >> --- a/meta/recipes-devtools/ninja/ninja_1.8.2.bb >> +++ b/meta/recipes-devtools/ninja/ninja_1.9.0.bb >> @@ -5,9 +5,11 @@ LIC_FILES_CHKSUM = >> "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" >> >> DEPENDS = "re2c-native ninja-native" >> >> -SRCREV = "253e94c1fa511704baeb61cf69995bbf09ba435e" >> +SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" >> >> -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" >> +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ >> + file://fix-musl.patch \ >> +" >> UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" >> >> S = "${WORKDIR}/git" >> -- >> 2.17.1 >> >> -- >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] connman: update to 1.37
Removed patch has been upstreamed. Changelog: - Fix issue with handling invalid gateway addresses. - Fix issue with handling updates of default gateway. - Fix issue with DHCP servers that require broadcast flag. - Add support for option to use gateways as time servers. - Add support for option to select default technology. - Add support for Address Conflict Detection (ACD). - Add support for IPv6 iptables management. Signed-off-by: Oleksandr Kravchuk --- ...sues-which-cause-problems-under-musl.patch | 362 -- .../{connman_1.36.bb => connman_1.37.bb} | 5 +- 2 files changed, 2 insertions(+), 365 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman/0001-Fix-various-issues-which-cause-problems-under-musl.patch rename meta/recipes-connectivity/connman/{connman_1.36.bb => connman_1.37.bb} (67%) diff --git a/meta/recipes-connectivity/connman/connman/0001-Fix-various-issues-which-cause-problems-under-musl.patch b/meta/recipes-connectivity/connman/connman/0001-Fix-various-issues-which-cause-problems-under-musl.patch deleted file mode 100644 index f344fea109..00 --- a/meta/recipes-connectivity/connman/connman/0001-Fix-various-issues-which-cause-problems-under-musl.patch +++ /dev/null @@ -1,362 +0,0 @@ -From 181ff3439783c6920f5211730672685a210c318f Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Mon, 8 Oct 2018 22:12:56 +0200 -Subject: [PATCH] Fix various issues which cause problems under musl - -Instead of using #define _GNU_SOURCE in some source files which causes -problems when building with musl as more files need the define, simply -use AC_USE_SYSTEM_EXTENSIONS in configure.ac to get it defined globally. - -Signed-off-by: Ross Burton -Upstream-Status: Backport [bd1326ba7d68df38c5ccaafd2403a5fb30bd452b] - configure.ac | 3 +++ - gdhcp/client.c | 1 - - gdhcp/common.h | 5 +++-- - gweb/gresolv.c | 1 + - plugins/tist.c | 1 - - plugins/wifi.c | 3 +-- - src/backtrace.c | 1 - - src/inet.c | 1 - - src/ippool.c | 1 - - src/iptables.c | 2 +- - src/log.c| 1 - - src/ntp.c| 1 - - src/resolver.c | 1 - - src/rfkill.c | 1 - - src/stats.c | 1 - - src/tethering.c | 2 -- - src/timezone.c | 1 - - tools/dhcp-test.c| 1 - - tools/dnsproxy-test.c| 1 + - tools/private-network-test.c | 2 +- - tools/stats-tool.c | 1 - - tools/tap-test.c | 3 +-- - tools/wispr.c| 1 - - vpn/plugins/vpn.c| 1 - - 24 files changed, 12 insertions(+), 25 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 39745f76..984126c2 100644 a/configure.ac -+++ b/configure.ac -@@ -20,6 +20,7 @@ AC_SUBST(abs_top_srcdir) - AC_SUBST(abs_top_builddir) - - AC_LANG_C -+AC_USE_SYSTEM_EXTENSIONS - - AC_PROG_CC - AM_PROG_CC_C_O -@@ -185,6 +186,8 @@ AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [ - AC_CHECK_HEADERS([execinfo.h]) - AM_CONDITIONAL([BACKTRACE], [test "${ac_cv_header_execinfo_h}" = "yes"]) - -+AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr], [], [], [[#include ]]) -+ - AC_CHECK_FUNC(signalfd, dummy=yes, - AC_MSG_ERROR(signalfd support is required)) - -diff --git a/gdhcp/client.c b/gdhcp/client.c -index 67357782..c7db76f0 100644 a/gdhcp/client.c -+++ b/gdhcp/client.c -@@ -23,7 +23,6 @@ - #include - #endif - --#define _GNU_SOURCE - #include - #include - #include -diff --git a/gdhcp/common.h b/gdhcp/common.h -index 75abc183..6899499e 100644 a/gdhcp/common.h -+++ b/gdhcp/common.h -@@ -19,6 +19,7 @@ - * - */ - -+#include - #include - #include - -@@ -170,8 +171,8 @@ static const uint8_t dhcp_option_lengths[] = { - [OPTION_U32]= 4, - }; - --/* already defined within netinet/in.h if using GNU compiler */ --#ifndef __USE_GNU -+/* already defined within netinet/in.h if using glibc or musl */ -+#ifndef HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR - struct in6_pktinfo { - struct in6_addr ipi6_addr; /* src/dst IPv6 address */ - unsigned int ipi6_ifindex; /* send/recv interface index */ -diff --git a/gweb/gresolv.c b/gweb/gresolv.c -index 81c79b6c..b06f8932 100644 a/gweb/gresolv.c -+++ b/gweb/gresolv.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/plugins/tist.c b/plugins/tist.c -index ad5ef79e..cc2800a1 100644 a/plugins/tist.c -+++ b/plugins/tist.c -@@ -23,7 +23,6 @@ - #include - #endif - --#define _GNU_SOURCE - #include - #include - #include -diff --git a/plugins/wifi.c b/plugins/wifi.c -index dc08c6af..46e4cca4 100644 a/plugins/wifi.c -+++ b/plugins/wifi.c -@@ -30,9 +30,8 @@ - #include - #include - #include --#include --#include - #include -+#include - - #ifndef IFF_LOWER_UP - #define IFF_LOWER_UP 0x1
Re: [OE-core] [PATCH] weston: upgrade 5.0.0 -> 6.0.0
On Sat, 30 Mar 2019 at 01:06, Denys Dmytriyenko wrote: > 6.0.0 is the last one to support autotools (needs explicit configure option), > newer versions will only support meson. Thanks, would you be able to prepare the meson conversion patch just after Warrior is out? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core