evolution-data-server: Fix build with clang
PATCH 1/4 evolution-data-server: Fix build with clang
--- ...x-Fix-signature-for-imapx_tokenise_struct.patch | 33 ++++++++++++++++++++++ .../recipes-gnome/eds/evolution-data-server_git.bb | 20 ++++++------- 2 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch
meta-gnome/recipes-gnome/eds/evolution-data-server/0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 0e10e976025b21d12df099e82951f759024ad649 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 24 Aug 2017 22:04:56 -0700 +Subject: [PATCH] imapx: Fix signature for imapx_tokenise_struct() + +clang complains about different signature for this patch + +Fixes +camel/providers/imapx/camel-imapx-tokens.txt:56:1: error: conflicting types for 'imapx_tokenise_struct' +| imapx_tokenise_struct (register const char *str, register size_t len) +| ^ + +Signed-off-by: Khem Raj <[email protected]> +--- + camel/providers/imapx/camel-imapx-tokens.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/camel/providers/imapx/camel-imapx-tokens.txt b/camel/providers/imapx/camel-imapx-tokens.txt +index d48501865..994c368c0 100644 +--- a/camel/providers/imapx/camel-imapx-tokens.txt ++++ b/camel/providers/imapx/camel-imapx-tokens.txt +@@ -1,7 +1,7 @@ + /* This contains all of the keywords we care about. These + can be converted to an id very efficiently */ + struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; }; +-struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len); ++struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register size_t len); + %% + ALERT, IMAPX_ALERT + APPENDUID, IMAPX_APPENDUID +-- +2.14.1 +
meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb +10 -10
@@ -15,16 +15,16 @@ SRCREV = "a9e4e74ec4473a4fd09e56b690bd4fa72f686687" # 3.4 series needs libgdata-0.10*, 3.8 series needs also libsecret instead of gnome-keyring PV = "3.2.3+git${SRCPV}" -SRC_URI = " \ - git://git.gnome.org/evolution-data-server;branch=gnome-3-2 \ - file://0001-contact-Replace-the-Novell-sample-contact-with-somet.patch \ - file://0002-Fix-for-automake-1.12.x.patch \ - file://0003-Disable-Werror-for-automake.patch \ - file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \ - file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \ - file://0006-configure.ac-do-not-overwrite-localedir.patch \ - file://iconv-detect.h \ -" +SRC_URI = "git://git.gnome.org/evolution-data-server;branch=gnome-3-2 \ + file://0001-contact-Replace-the-Novell-sample-contact-with-somet.patch \ + file://0002-Fix-for-automake-1.12.x.patch \ + file://0003-Disable-Werror-for-automake.patch \ + file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \ + file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \ + file://0006-configure.ac-do-not-overwrite-localedir.patch \ + file://iconv-detect.h \ + file://0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch \ + " S = "${WORKDIR}/git"
Signature · 1 line
2.14.1
PATCH 2/4 wvstreams: Fix parallel build
--- .../wvstreams/0001-build-fix-parallel-make.patch | 76 ++++++++++++++++++++++ .../0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch | 29 +++++++++ .../recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 4 +- 3 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch create mode 100644 meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch
meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch new file +76 -0
@@ -0,0 +1,76 @@ +From 90de630f21ac744a37b3adac1bd84654471744ff Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 24 Aug 2017 22:30:01 -0700 +Subject: [PATCH 1/2] build: fix parallel make + +Imported from Gentoo + +Signed-off-by: Khem Raj <[email protected]> +--- + Makefile | 15 +++++++++++++-- + wvrules-posix.mk | 7 +++++-- + 2 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 72c8bef..5a4cfb2 100644 +--- a/Makefile ++++ b/Makefile +@@ -131,12 +131,19 @@ utils/tests/%: PRELIBS+=$(LIBWVSTREAMS) + # libwvstreams: stream/event handling library + # + TARGETS += libwvstreams.so +-TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest ++TARGETS += crypto/tests/ssltest ++crypto/tests/ssltest: $(LIBWVSTREAMS) ++ ++TARGETS += ipstreams/tests/unixtest ++ipstreams/tests/unixtest: $(LIBWVSTREAMS) ++ + TARGETS += crypto/tests/printcert ++crypto/tests/printcert: $(LIBWVSTREAMS) + + ifndef _MACOS + ifneq ("$(with_readline)", "no") + TARGETS += ipstreams/tests/wsd ++ ipstreams/tests/wsd: $(LIBWVSTREAMS) + ipstreams/tests/wsd-LIBS += -lreadline + else + TEST_SKIP_OBJS += ipstreams/tests/wsd +@@ -179,7 +186,11 @@ uniconf/tests/%: PRELIBS+=$(LIBUNICONF) + # + ifneq ("$(with_dbus)", "no") + TARGETS += libwvdbus.so +- TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd ++ TARGETS += dbus/tests/wvdbus ++ dbus/tests/wvdbus: $(LIBWVDBUS) ++ ++ TARGETS += dbus/tests/wvdbusd ++ dbus/tests/wvdbusd: $(LIBWVDBUS) + TESTS += $(call tests_cc,dbus/tests) + libwvdbus_OBJS += $(call objects,dbus) + libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS) +diff --git a/wvrules-posix.mk b/wvrules-posix.mk +index f94d2cd..2e99f36 100644 +--- a/wvrules-posix.mk ++++ b/wvrules-posix.mk +@@ -80,12 +80,15 @@ define wvlink_ar + $(AR) s $1 + endef + +-CC: FORCE ++CC: + @CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + $(WVSTREAMS)/gen-cc CC c + +-CXX: FORCE ++CXX: + @CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + $(WVSTREAMS)/gen-cc CXX cc + ++#All files must depend on the above two rules. This is a godawful hack. ++$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX ++ + wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS) +-- +2.14.1 +
meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 4afff42714a15cb796d3589d87c6fac4558b2c95 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 24 Aug 2017 22:33:32 -0700 +Subject: [PATCH 2/2] wvrules.mk: Use _DEFAULT_SOURCE + +Fixes warnings with newer glibc +warning: "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" + +Signed-off-by: Khem Raj <[email protected]> +--- + wvrules.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wvrules.mk b/wvrules.mk +index 877f700..124bffd 100644 +--- a/wvrules.mk ++++ b/wvrules.mk +@@ -83,7 +83,7 @@ runtests: + + INCFLAGS=$(addprefix -I,$(WVSTREAMS_INC) $(XPATH)) + CPPFLAGS+=$(INCFLAGS) \ +- -D_BSD_SOURCE -D_GNU_SOURCE $(OSDEFINE) \ ++ -D_DEFAULT_SOURCE $(OSDEFINE) \ + -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + -DUNSTABLE + +-- +2.14.1 +
meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +2 -2
@@ -19,6 +19,8 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ file://0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch \ file://0004-wvcrash-Replace-use-of-basename-API.patch \ file://0005-check-for-libexecinfo-during-configure.patch \ + file://0001-build-fix-parallel-make.patch \ + file://0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch \ " SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
@@ -26,8 +28,6 @@ SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8eb inherit autotools-brokensep pkgconfig -PARALLEL_MAKE = "" - TARGET_CFLAGS_append = " -fno-tree-dce -fno-optimize-sibling-calls" LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
Signature · 1 line
2.14.1
PATCH 3/4 squid: Disable format-truncation warning only with gcc
In reply to Khem Raj--- meta-networking/recipes-daemons/squid/squid_3.5.26.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-networking/recipes-daemons/squid/squid_3.5.26.bb +2 -1
@@ -22,10 +22,11 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://set_sysroot_patch.patch \ file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ file://0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch \ - file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ file://gcc7-fixes.patch \ file://0001-tools.cc-fixed-unused-result-warning.patch \ " +SRC_URI_append_toolchain-gcc = " file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" + SRC_URI[md5sum] = "dc1830cd361e077814aa39bcc3691d8b" SRC_URI[sha256sum] = "41d8845863dcd026c856508cd1599d417c8947ffd96e86e24085f9893cb8b8c2"
Signature · 1 line
2.14.1
Re: [meta-networking][PATCH 3/4] squid: Disable format-truncation warning only with gcc
Hi,
I got an error after applied this patch with latest oe-core:
| ../../../squid-3.5.26/src/format/Format.cc: In member function 'void Format::Format::assemble(MemBuf&, const Pointer&, int) const': | ../../../squid-3.5.26/src/format/Format.cc:345:1: error: '%0*lld' directive output may be truncated writing between 1 and 2147483646 bytes into a region of size 1024 [-Werror=format-truncation=] | Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logSequenceNumber) const | ^~~~~~ | ../../../squid-3.5.26/src/format/Format.cc:345:1: note: directive argument in the range [-2147483648, 2147483647] | ../../../squid-3.5.26/src/format/Format.cc:542:21: note: 'snprintf' output between 4 and 4294967295 bytes into a destination of size 1024 | snprintf(tmp, sizeof(tmp), "%0*" PRId64 ".%0*d", fmt->zero && (fmt->widthMin - precision - 1 >= 0) ? fmt->widthMin - precision - 1 : 0, static_cast<int64_t>(al->cache.start_time.tv_sec), precision, (int)(al->cache.start_time.tv_usec / fmt->divisor)); | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Thanks,
Yi
Quoted 22 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- meta-networking/recipes-daemons/squid/squid_3.5.26.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta-networking/recipes-daemons/squid/squid_3.5.26.bb +2
-1@@ -22,10 +22,11 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://set_sysroot_patch.patch \ file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ file://0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch \ - file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ file://gcc7-fixes.patch \ file://0001-tools.cc-fixed-unused-result-warning.patch \ " +SRC_URI_append_toolchain-gcc = " file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" + SRC_URI[md5sum] = "dc1830cd361e077814aa39bcc3691d8b" SRC_URI[sha256sum] = "41d8845863dcd026c856508cd1599d417c8947ffd96e86e24085f9893cb8b8c2"
Re: [meta-networking][PATCH 3/4] squid: Disable format-truncation warning only with gcc
Quoted 4 lines · Yi Zhao
Hi,
I got an error after applied this patch with latest oe-core:
yeah, I think its because its bad to use an override which is not in oe-core but from meta-clang. Drop this patch and try the v2 I just sent.
Quoted 55 lines
| ../../../squid-3.5.26/src/format/Format.cc: In member function 'void
Format::Format::assemble(MemBuf&, const Pointer&, int)const':
| ../../../squid-3.5.26/src/format/Format.cc:345:1: error: '%0*lld'
directive output may be truncated writing between 1 and 2147483646 bytes
into a region of size 1024 [-Werror=format-truncation=]
| Format::Format::assemble(MemBuf &mb, constAccessLogEntry::Pointer&al,
int logSequenceNumber) const
| ^~~~~~
| ../../../squid-3.5.26/src/format/Format.cc:345:1: note: directive argument
in the range [-2147483648, 2147483647]
| ../../../squid-3.5.26/src/format/Format.cc:542:21: note: 'snprintf' output
between 4 and 4294967295 bytes into a destination of size 1024
| snprintf(tmp, sizeof(tmp), "%0*" PRId64 ".%0*d",fmt->zero&&
(fmt->widthMin- precision - 1 >= 0) ?fmt->widthMin- precision - 1 : 0,
static_cast<int64_t>(al->cache.start_time.tv_sec), precision,
(int)(al->cache.start_time.tv_usec /fmt->divisor));
| ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Thanks,
YiQuoted 29 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- meta-networking/recipes-daemons/squid/squid_3.5.26.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta-networking/recipes-daemons/squid/squid_3.5.26.bb +0
-0@@ -22,10 +22,11 @@ SRC_URI ="http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P
file://set_sysroot_patch.patch \ file://squid-don-t-do-squid-conf-tests-at-build-time.patch \file://0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch \
-file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ file://gcc7-fixes.patch \ file://0001-tools.cc-fixed-unused-result-warning.patch \ "+SRC_URI_append_toolchain-gcc = " file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" +
SRC_URI[md5sum] = "dc1830cd361e077814aa39bcc3691d8b" SRC_URI[sha256sum] =
"41d8845863dcd026c856508cd1599d417c8947ffd96e86e24085f9893cb8b8c2"
Re: [meta-networking][PATCH 3/4] squid: Disable format-truncation warning only with gcc
Quoted 7 lines · Khem Raj
Quoted 4 lines · Yi Zhao
Hi,
I got an error after applied this patch with latest oe-core:
yeah, I think its because its bad to use an override which is not in oe-core but from meta-clang. Drop this patch and try the v2 I just sent.
It works well with your V2 patch.
Thanks,
Yi
Quoted 54 lines
Quoted 54 lines
| ../../../squid-3.5.26/src/format/Format.cc: In member function 'void
Format::Format::assemble(MemBuf&, const Pointer&, int)const':
| ../../../squid-3.5.26/src/format/Format.cc:345:1: error: '%0*lld'
directive output may be truncated writing between 1 and 2147483646 bytes
into a region of size 1024 [-Werror=format-truncation=]
| Format::Format::assemble(MemBuf &mb, constAccessLogEntry::Pointer&al,
int logSequenceNumber) const
| ^~~~~~
| ../../../squid-3.5.26/src/format/Format.cc:345:1: note: directive argument
in the range [-2147483648, 2147483647]
| ../../../squid-3.5.26/src/format/Format.cc:542:21: note: 'snprintf' output
between 4 and 4294967295 bytes into a destination of size 1024
| snprintf(tmp, sizeof(tmp), "%0*" PRId64 ".%0*d",fmt->zero&&
(fmt->widthMin- precision - 1 >= 0) ?fmt->widthMin- precision - 1 : 0,
static_cast<int64_t>(al->cache.start_time.tv_sec), precision,
(int)(al->cache.start_time.tv_usec /fmt->divisor));
| ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Thanks,
YiQuoted 28 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- meta-networking/recipes-daemons/squid/squid_3.5.26.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta-networking/recipes-daemons/squid/squid_3.5.26.bb +0
-0@@ -22,10 +22,11 @@ SRC_URI ="http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P
file://set_sysroot_patch.patch \ file://squid-don-t-do-squid-conf-tests-at-build-time.patch \file://0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch \
-file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ file://gcc7-fixes.patch \ file://0001-tools.cc-fixed-unused-result-warning.patch \ "+SRC_URI_append_toolchain-gcc = " file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" +
SRC_URI[md5sum] = "dc1830cd361e077814aa39bcc3691d8b" SRC_URI[sha256sum] =
"41d8845863dcd026c856508cd1599d417c8947ffd96e86e24085f9893cb8b8c2"
PATCH 4/4 squid: Fix QA errors about wrong perl interpreter
In reply to Khem Raj--- meta-networking/recipes-daemons/squid/squid_3.5.26.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-networking/recipes-daemons/squid/squid_3.5.26.bb +4 -1
@@ -54,7 +54,10 @@ BASIC_AUTH = "DB SASL LDAP" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" -EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}' --sysconfdir=${sysconfdir}/${BPN} --with-logdir=${localstatedir}/log/${BPN}" +EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}' \ + --sysconfdir=${sysconfdir}/${BPN} \ + --with-logdir=${localstatedir}/log/${BPN} \ + 'PERL=${USRBINPATH}/env perl'" export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
Signature · 1 line
2.14.1