php7: upgrade to 7.1.7
PATCH 1/9 php7: upgrade to 7.1.7
License checksum changed due to opyright year changed to 2017 Fix build with clang/hardening
---
.../php-7.1.7/0001-Specify-tag-with-libtool.patch | 62 ++++++++++++++++++++++
.../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 0
meta-oe/recipes-devtools/php/php_7.1.0.bb | 14 -----
meta-oe/recipes-devtools/php/php_7.1.7.bb | 16 ++++++
4 files changed, 78 insertions(+), 14 deletions(-)
create mode 100644 meta-oe/recipes-devtools/php/php-7.1.7/0001-Specify-tag-with-libtool.patch
rename meta-oe/recipes-devtools/php/{php-7.1.0 => php-7.1.7}/change-AC_TRY_RUN-to-AC_TRY_LINK.patch (100%)
delete mode 100644 meta-oe/recipes-devtools/php/php_7.1.0.bb
create mode 100644 meta-oe/recipes-devtools/php/php_7.1.7.bbmeta-oe/recipes-devtools/php/php-7.1.7/0001-Specify-tag-with-libtool.patch new file +62 -0
@@ -0,0 +1,62 @@ +From 5c84b039e97abd88f6a18da0e6d27383c00fea92 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 26 Jul 2017 23:06:56 -0700 +Subject: [PATCH] Specify --tag with libtool + +This helps in compiling with external toolchains +with -fPIE appended to CC e.g. via hardening flags + +Signed-off-by: Khem Raj <[email protected]> +--- + acinclude.m4 | 8 ++++---- + configure.in | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index a114a98..1cc7a26 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -806,10 +806,10 @@ dnl + dnl PHP_BUILD_PROGRAM + dnl + AC_DEFUN([PHP_BUILD_PROGRAM],[ +- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' ++ php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' + php_c_post= +- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' ++ php_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' + php_cxx_post= + php_lo=lo +@@ -819,10 +819,10 @@ AC_DEFUN([PHP_BUILD_PROGRAM],[ + no) pic_setting='-prefer-non-pic';; + esac + +- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' ++ shared_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)' + shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting + shared_c_post= +- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' ++ shared_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)' + shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting + shared_cxx_post= + shared_lo=lo +diff --git a/configure.in b/configure.in +index 7d65b63..7221af9 100644 +--- a/configure.in ++++ b/configure.in +@@ -1431,8 +1431,8 @@ PHP_SET_LIBTOOL_VARIABLE([--silent]) + dnl libtool 1.4.3 needs this. + PHP_SET_LIBTOOL_VARIABLE([--preserve-dup-deps]) + +-test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<' +-test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<' ++test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --tag=CC --mode=compile $(COMPILE) -c $<' ++test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --tag=CXX --mode=compile $(CXX_COMPILE) -c $<' + SHARED_LIBTOOL='$(LIBTOOL)' + + CC=$old_CC +-- +2.13.3 +
meta-oe/recipes-devtools/php/php-7.1.7/change-AC_TRY_RUN-to-AC_TRY_LINK.patch renamed from meta-oe/recipes-devtools/php/php-7.1.0/change-AC_TRY_RUN-to-AC_TRY_LINK.patch +0 -0
meta-oe/recipes-devtools/php/php_7.1.0.bb deleted +0 -14
@@ -1,14 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=b602636d46a61c0ac0432bbf5c078fe4" - -SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch" -SRC_URI[md5sum] = "54e364b60a88db77adb96aacb10f10a4" -SRC_URI[sha256sum] = "68bcfd7deed5b3474d81dec9f74d122058327e2bed0ac25bbc9ec70995228e61" - -PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ - --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ - ,--without-mysqli --without-pdo-mysql \ - ,mysql5" - -FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default"
meta-oe/recipes-devtools/php/php_7.1.7.bb new file +16 -0
@@ -0,0 +1,16 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=c0af599f66d0461c5837c695fcbc5c1e" + +SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ + file://0001-Specify-tag-with-libtool.patch \ + " +SRC_URI[md5sum] = "22e11a372f99afbbbf3f46a31e8a82ca" +SRC_URI[sha256sum] = "079b6792987f38dc485f92258c04f9e02dedd593f9d260ebe725343f812d1ff8" + +PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ + --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ + ,--without-mysqli --without-pdo-mysql \ + ,mysql5" + +FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default"
Signature · 1 line
2.14.0
PATCH 2/9 llvm: Remove
Moved to OE-core, with a version upgrade
--- meta-oe/recipes-core/llvm/llvm-common.bb | 22 --- meta-oe/recipes-core/llvm/llvm-common/llvm-config | 11 -- meta-oe/recipes-core/llvm/llvm.inc | 162 --------------------- ...r-output-from-configure-if-CFLAGS-is-set-.patch | 52 ------- .../llvm/llvm3.3/arm_fenv_uclibc.patch | 14 -- meta-oe/recipes-core/llvm/llvm3.3_3.3.bb | 22 --- 6 files changed, 283 deletions(-) delete mode 100644 meta-oe/recipes-core/llvm/llvm-common.bb delete mode 100644 meta-oe/recipes-core/llvm/llvm-common/llvm-config delete mode 100644 meta-oe/recipes-core/llvm/llvm.inc delete mode 100644 meta-oe/recipes-core/llvm/llvm3.3/Remove-error-output-from-configure-if-CFLAGS-is-set-.patch delete mode 100644 meta-oe/recipes-core/llvm/llvm3.3/arm_fenv_uclibc.patch delete mode 100644 meta-oe/recipes-core/llvm/llvm3.3_3.3.bb
meta-oe/recipes-core/llvm/llvm-common.bb deleted +0 -22
@@ -1,22 +0,0 @@ -SUMMARY = "Helper script for OE's llvm support" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ -" - -SRC_URI = "file://llvm-config" - -ALLOW_EMPTY_${PN} = "1" -SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_common_sysroot_preprocess" - -llvm_common_sysroot_preprocess() { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ -} - -do_install_class-native() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/llvm-config ${D}${bindir} -} - -BBCLASSEXTEND = "native"
meta-oe/recipes-core/llvm/llvm-common/llvm-config deleted +0 -11
@@ -1,11 +0,0 @@ -#!/bin/sh -# Wrapper script for real llvm-config. Simply calls - -if [ $WANT_LLVM_RELEASE ]; then - exec `dirname $0`/${TARGET_PREFIX}llvm-config$WANT_LLVM_RELEASE ${@} -else - echo "To use llvm-common WANT_LLVM_RELEASE needs to be exported." - echo "For example if this is being called through a recipe:" - echo "export WANT_LLVM_RELEASE=\"3.3\"" - exit 1 -fi
meta-oe/recipes-core/llvm/llvm.inc deleted +0 -162
162 lines not on this page · raw message
meta-oe/recipes-core/llvm/llvm3.3/Remove-error-output-from-configure-if-CFLAGS-is-set-.patch deleted +0 -52
52 lines not on this page · raw message
meta-oe/recipes-core/llvm/llvm3.3/arm_fenv_uclibc.patch deleted +0 -14
@@ -1,14 +0,0 @@ -Index: llvm-2.9/include/llvm/Support/FEnv.h -=================================================================== ---- llvm-2.9.orig/include/llvm/Support/FEnv.h 2010-11-29 20:44:50.000000000 +0100 -+++ llvm-2.9/include/llvm/Support/FEnv.h 2011-11-18 18:42:22.580161297 +0100 -@@ -17,6 +17,9 @@ - - #include "llvm/Config/config.h" - #include <cerrno> -+ -+#undef HAVE_FENV_H -+ - #ifdef HAVE_FENV_H - #include <fenv.h> - #endif
meta-oe/recipes-core/llvm/llvm3.3_3.3.bb deleted +0 -22
@@ -1,22 +0,0 @@ -require llvm.inc - -DEPENDS += "zlib" -EXTRA_OECONF += "--enable-zlib" - -SRC_URI += "file://Remove-error-output-from-configure-if-CFLAGS-is-set-.patch" - -SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch " - -SRC_URI[md5sum] = "40564e1dc390f9844f1711c08b08e391" -SRC_URI[sha256sum] = "68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[r600] = "--enable-experimental-targets=R600,,," - -# Fails to build with thumb-1 (qemuarm) -# | {standard input}: Assembler messages: -# | {standard input}:22: Error: selected processor does not support Thumb mode `stmdb sp!,{r0,r1,r2,r3,lr}' -# | {standard input}:31: Error: lo register required -- `ldmia sp!,{r0,r1,r2,r3,lr}' -# | {standard input}:32: Error: lo register required -- `ldr pc,[sp],#4' -# | make[3]: *** [/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/llvm3.3/3.3-r0/llvm-3.3.build/lib/Target/ARM/Release/ARMJITInfo.o] Error 1 -ARM_INSTRUCTION_SET = "arm"
Signature · 1 line
2.14.0
PATCH 3/9 squid: Add missing dependencies on openssl expat and libxml2
In reply to Khem Rajinherit classes needed for pkgconfig and perl
NIS is not buildable with gold linker, disable it
--- meta-networking/recipes-daemons/squid/squid_3.5.26.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
meta-networking/recipes-daemons/squid/squid_3.5.26.bb +2 -3
@@ -32,9 +32,9 @@ SRC_URI[sha256sum] = "41d8845863dcd026c856508cd1599d417c8947ffd96e86e24085f9893c LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ file://errors/COPYRIGHT;md5=8861130fae91400bcf99b66f133172b3 \ " -DEPENDS = "libtool krb5 openldap db cyrus-sasl" +DEPENDS = "libtool krb5 openldap db cyrus-sasl openssl expat libxml2" -inherit autotools useradd ptest +inherit autotools pkgconfig useradd ptest perlnative USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid"
@@ -49,7 +49,6 @@ PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," BASIC_AUTH = "DB SASL LDAP" -BASIC_AUTH_append_libc-glibc = " NIS" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}"
Signature · 1 line
2.14.0
PATCH 4/9 kodi: Use std namespace for string objects
In reply to Khem Raj--- ...ilesystems-string-is-in-the-std-namespace.patch | 88 ++++++++++++++++++++++ .../recipes-mediacenter/kodi/kodi_17.bb | 1 + 2 files changed, 89 insertions(+) create mode 100644 meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-filesystems-string-is-in-the-std-namespace.patch
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-filesystems-string-is-in-the-std-namespace.patch new file +88 -0
@@ -0,0 +1,88 @@ +From 4f2448129128f12fcf3a232c6801eb687c742947 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 1 Aug 2017 20:04:33 -0700 +Subject: [PATCH] filesystems: string is in the std namespace + +Use std::string instead of string + +Signed-off-by: Khem Raj <[email protected]> +--- + xbmc/filesystem/FTPParse.cpp | 44 ++++++++++++++++++++++---------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp +index cfcc7c64ed..b0f676ae1a 100644 +--- a/xbmc/filesystem/FTPParse.cpp ++++ b/xbmc/filesystem/FTPParse.cpp +@@ -34,7 +34,7 @@ CFTPParse::CFTPParse() + m_time = 0; + } + +-string CFTPParse::getName() ++std::string CFTPParse::getName() + { + return m_name; + } +@@ -59,16 +59,16 @@ time_t CFTPParse::getTime() + return m_time; + } + +-void CFTPParse::setTime(string str) ++void CFTPParse::setTime(std::string str) + { + /* Variables used to capture patterns via the regexes */ +- string month; +- string day; +- string year; +- string hour; +- string minute; +- string second; +- string am_or_pm; ++ std::string month; ++ std::string day; ++ std::string year; ++ std::string hour; ++ std::string minute; ++ std::string second; ++ std::string am_or_pm; + + /* time struct used to set the time_t variable */ + struct tm time_struct = {}; +@@ -338,21 +338,21 @@ int CFTPParse::getDayOfWeek(int month, int date, int year) + return day_of_week; + } + +-int CFTPParse::FTPParse(string str) ++int CFTPParse::FTPParse(std::string str) + { + /* Various variable to capture patterns via the regexes */ +- string permissions; +- string link_count; +- string owner; +- string group; +- string size; +- string date; +- string name; +- string type; +- string stuff; +- string facts; +- string version; +- string file_id; ++ std::string permissions; ++ std::string link_count; ++ std::string owner; ++ std::string group; ++ std::string size; ++ std::string date; ++ std::string name; ++ std::string type; ++ std::string stuff; ++ std::string facts; ++ std::string version; ++ std::string file_id; + + /* Regex for standard Unix listing formats */ + pcrecpp::RE unix_re("^([-bcdlps])" // type +-- +2.13.3 +
meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb +1 -0
@@ -79,6 +79,7 @@ SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Krypton \ file://0011-Let-configure-pass-on-unknown-architectures-setting-.patch \ file://0012-Revert-droid-fix-builds-with-AML-disabled.patch \ file://0001-change-order-of-detecting-libegl-and-libgles2.patch \ + file://0013-filesystems-string-is-in-the-std-namespace.patch \ " SRC_URI_append_libc-musl = " \
Signature · 1 line
2.14.0
PATCH 5/9 mongodb: Upgrade to 3.4.6
In reply to Khem RajAdd missing Zlib to license list
Add patches to fix build issue with gcc7 and missing internal build dependency
--- .../mongodb/0001-mongo-Add-using-std-string.patch | 72 ++++++++++++++++++++++ ...-Add-missing-dependenncy-on-local_shardin.patch | 28 +++++++++ meta-oe/recipes-support/mongodb/mongodb_git.bb | 12 ++-- 3 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch create mode 100644 meta-oe/recipes-support/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch
meta-oe/recipes-support/mongodb/mongodb/0001-mongo-Add-using-std-string.patch new file +72 -0
@@ -0,0 +1,72 @@ +From 5fdec9592285f5976345fbccb3d07fae1245ab53 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 2 Aug 2017 15:41:22 -0700 +Subject: [PATCH] mongo: Add using std::string + +This is needed with latest clang +Fixes +src/mongo/db/dbwebserver.cpp:206:23: error: use of undeclared identifier 'string'; did you mean 'String'? + static vector<string> commands; + ^~~~~~ + String + +Signed-off-by: Khem Raj <[email protected]> +--- + src/mongo/db/dbwebserver.cpp | 1 + + src/mongo/db/matcher/expression_leaf.cpp | 2 ++ + src/mongo/db/repl/master_slave.cpp | 1 + + src/mongo/util/net/miniwebserver.cpp | 1 + + 4 files changed, 5 insertions(+) + +diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp +index b202e0500b..0255613524 100644 +--- a/src/mongo/db/dbwebserver.cpp ++++ b/src/mongo/db/dbwebserver.cpp +@@ -67,6 +67,7 @@ namespace mongo { + using std::map; + using std::stringstream; + using std::vector; ++using std::string; + + using namespace html; + +diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp +index d562bff141..4d931985e2 100644 +--- a/src/mongo/db/matcher/expression_leaf.cpp ++++ b/src/mongo/db/matcher/expression_leaf.cpp +@@ -44,6 +44,8 @@ + #include "mongo/stdx/memory.h" + #include "mongo/util/mongoutils/str.h" + ++using std::string; ++ + namespace mongo { + + Status LeafMatchExpression::setPath(StringData path) { +diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp +index 05faad1259..ea25d7151b 100644 +--- a/src/mongo/db/repl/master_slave.cpp ++++ b/src/mongo/db/repl/master_slave.cpp +@@ -78,6 +78,7 @@ using std::endl; + using std::max; + using std::min; + using std::set; ++using std::string; + using std::stringstream; + using std::unique_ptr; + using std::vector; +diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp +index 5f4165d42f..239720c349 100644 +--- a/src/mongo/util/net/miniwebserver.cpp ++++ b/src/mongo/util/net/miniwebserver.cpp +@@ -46,6 +46,7 @@ namespace mongo { + + using std::shared_ptr; + using std::stringstream; ++using std::string; + using std::vector; + + MiniWebServer::MiniWebServer(const string& name, const string& ip, int port, ServiceContext* ctx) +-- +2.13.3 +
meta-oe/recipes-support/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 5759878e5d278f11a1063e8fccd1e6b7b54caadf Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 2 Aug 2017 16:25:37 -0700 +Subject: [PATCH 2/2] d_state.cpp: Add missing dependenncy on + local_sharding_info + +Fixes +| src/mongo/s/d_state.cpp:81: error: undefined reference to 'mongo::enableLocalShardingInfo(mongo::ServiceContext*, std::function<bool (mongo::OperationContext*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>)' + +Signed-off-by: Khem Raj <[email protected]> +--- + src/mongo/s/SConscript | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript +index 71720be517..51bd199127 100644 +--- a/src/mongo/s/SConscript ++++ b/src/mongo/s/SConscript +@@ -317,5 +317,6 @@ env.Library( + "$BUILD_DIR/mongo/db/s/sharding", + "$BUILD_DIR/mongo/executor/network_interface_factory", + "$BUILD_DIR/mongo/s/client/shard_local", ++ "$BUILD_DIR/mongo/s/local_sharding_info", + ], + ) +-- +2.13.3 +
meta-oe/recipes-support/mongodb/mongodb_git.bb +7 -5
@@ -1,16 +1,18 @@ SUMMARY = "mongodb" -LICENSE = "AGPL-3.0 & Apache-2.0" +LICENSE = "AGPL-3.0 & Apache-2.0 & Zlib" LIC_FILES_CHKSUM = "file://GNU-AGPL-3.0.txt;md5=73f1eb20517c55bf9493b7dd6e480788 \ file://APACHE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -DEPENDS = "openssl libpcre libpcap zlib" +DEPENDS = "openssl libpcre libpcap zlib python boost" inherit scons -PV = "3.3.0+git${SRCPV}" -SRCREV = "aacd231be0626a204cb40908afdf62c4b67bb0ad" -SRC_URI = "git://github.com/mongodb/mongo.git;branch=master \ +PV = "3.4.6+git${SRCPV}" +SRCREV = "c55eb86ef46ee7aede3b1e2a5d184a7df4bfb5b5" +SRC_URI = "git://github.com/mongodb/mongo.git;branch=v3.4 \ file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ + file://0001-mongo-Add-using-std-string.patch \ + file://0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.14.0
PATCH 6/9 python3-twisted: Fix build with clang
In reply to Khem Raj--- .../0001-initsendmsg-Return-NULL-on-error.patch | 76 ++++++++++++++++++++++ .../python/python3-twisted_13.2.0.bb | 3 + 2 files changed, 79 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-twisted/0001-initsendmsg-Return-NULL-on-error.patch
meta-python/recipes-devtools/python/python3-twisted/0001-initsendmsg-Return-NULL-on-error.patch new file +76 -0
@@ -0,0 +1,76 @@ +From 890d039f067d52a0ab77b561d40da13f0c135634 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 3 Aug 2017 11:24:43 -0700 +Subject: [PATCH] initsendmsg: Return NULL on error + +Fixes a clang error + +sendmsg.c:129:9: error: non-void function 'initsendmsg' should return a value [-Wreturn-type] + +Signed-off-by: Khem Raj <[email protected]> +--- + twisted/python/sendmsg.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/twisted/python/sendmsg.c b/twisted/python/sendmsg.c +index 9f2fd8c..9c080e1 100644 +--- a/twisted/python/sendmsg.c ++++ b/twisted/python/sendmsg.c +@@ -126,7 +126,7 @@ PyMODINIT_FUNC initsendmsg(void) { + module = Py_InitModule3("sendmsg", sendmsg_methods, sendmsg_doc); + + if (!module) { +- return; ++ return NULL; + } + + /* +@@ -135,39 +135,39 @@ PyMODINIT_FUNC initsendmsg(void) { + */ + + if (-1 == PyModule_AddIntConstant(module, "SCM_RIGHTS", SCM_RIGHTS)) { +- return; ++ return NULL; + } + + + /* BSD, Darwin, Hurd */ + #if defined(SCM_CREDS) + if (-1 == PyModule_AddIntConstant(module, "SCM_CREDS", SCM_CREDS)) { +- return; ++ return NULL; + } + #endif + + /* Linux */ + #if defined(SCM_CREDENTIALS) + if (-1 == PyModule_AddIntConstant(module, "SCM_CREDENTIALS", SCM_CREDENTIALS)) { +- return; ++ return NULL; + } + #endif + + /* Apparently everywhere, but not standardized. */ + #if defined(SCM_TIMESTAMP) + if (-1 == PyModule_AddIntConstant(module, "SCM_TIMESTAMP", SCM_TIMESTAMP)) { +- return; ++ return NULL; + } + #endif + + module = PyImport_ImportModule("socket"); + if (!module) { +- return; ++ return NULL; + } + + sendmsg_socket_error = PyObject_GetAttrString(module, "error"); + if (!sendmsg_socket_error) { +- return; ++ return NULL; + } + } + +-- +2.13.4 +
meta-python/recipes-devtools/python/python3-twisted_13.2.0.bb +3 -0
@@ -1,6 +1,9 @@ inherit pypi setuptools3 require python-twisted.inc +SRC_URI += "file://0001-initsendmsg-Return-NULL-on-error.patch \ + " + RDEPENDS_${PN}-core = "python3-core python3-zopeinterface python3-lang" FILES_${PN}-core_append += " \
Signature · 1 line
2.14.0
PATCH 7/9 python-grpcio: Do not hardcode compiler -std options
In reply to Khem Raj--- ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 36 ++++++++++++++++++++++ .../recipes-devtools/python/python-grpcio_1.4.0.bb | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch new file +36 -0
@@ -0,0 +1,36 @@ +From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 4 Aug 2017 09:04:07 -0700 +Subject: [PATCH] setup.py: Do not mix C and C++ compiler options + +EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX +so using -std=c++11 or -std=gnu99 together will cause +build time errors espcially with clang + +error: invalid argument '-std=gnu99' not allowed with 'C++' + +gcc7 ( defaults are -std=gnu11 and -std=gnu++14 ) + as well clang default to these standards mode or newer +anyway + +Signed-off-by: Khem Raj <[email protected]> +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index cb85273..f79878d 100644 +--- a/setup.py ++++ b/setup.py +@@ -116,7 +116,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: + elif 'win32' in sys.platform: + EXTRA_ENV_COMPILE_ARGS += ' -D_PYTHON_MSVC' + elif "linux" in sys.platform: +- EXTRA_ENV_COMPILE_ARGS += ' -std=c++11 -std=gnu99 -fvisibility=hidden -fno-wrapv' ++ EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv' + elif "darwin" in sys.platform: + EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv' + +-- +2.13.4 +
meta-python/recipes-devtools/python/python-grpcio_1.4.0.bb +2 -0
@@ -4,6 +4,8 @@ SECTION = "devel/python" DEPENDS = "python-protobuf" +SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ + " RDEPENDS_${PN} = "python-enum34 \ python-futures \ python-protobuf \
Signature · 1 line
2.14.0
PATCH 8/9 collectd: Fix build with clang
In reply to Khem Raj--- ...onfigure-Check-for-Wno-error-format-truncation-comp.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch +8 -4
@@ -1,14 +1,18 @@ -From 14d469bc82c758116aef7d549abd49c131b4170f Mon Sep 17 00:00:00 2001 +From b459c55e4968321e5a82272cb39aa69d4054990f Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 22 Apr 2017 11:54:57 -0700 Subject: [PATCH] configure: Check for -Wno-error=format-truncation compiler option If this option is supported by compiler then disable it ( gcc7+) +Use -Werror to elevate the warning to an error in case compiler like clang +which warn about unknown options but not error out unless asked for + Fixes client.c:834:23: error: '%s' directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Werror=format-truncation=] Signed-off-by: Khem Raj <[email protected]> + --- configure.ac | 3 +- m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++
@@ -16,7 +20,7 @@ Signed-off-by: Khem Raj <[email protected]> create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/configure.ac b/configure.ac -index 8854542..f3a6b57 100644 +index 8854542..edb8cfb 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,6 @@ AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
@@ -31,7 +35,7 @@ index 8854542..f3a6b57 100644 AM_CFLAGS="$AM_CFLAGS -Werror" AM_CXXFLAGS="$AM_CXXFLAGS -Werror" fi -+AX_CHECK_COMPILE_FLAG([-Werror=format-truncation],[AM_CFLAGS="$AM_CFLAGS -Wno-error=format-truncation" AM_CXXFLAGS="$AM_CXXFLAGS -Wno-error=format-truncation"]) ++AX_CHECK_COMPILE_FLAG([-Werror -Werror=format-truncation],[AM_CFLAGS="$AM_CFLAGS -Wno-error=format-truncation" AM_CXXFLAGS="$AM_CXXFLAGS -Wno-error=format-truncation"]) + AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CXXFLAGS])
@@ -117,5 +121,5 @@ index 0000000..dcabb92 +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS -- -2.12.2 +2.13.4
Signature · 1 line
2.14.0
PATCH 9/9 fbida: Fix build with libjpeg-turbo
In reply to Khem RajDont hardcode cpp to point to gcc collection, helps compiling with clang
--- meta-oe/recipes-graphics/fbida/fbida_2.10.bb | 5 +- .../fbida/files/fix-preprocessor.patch | 14 + .../fbida/files/support-jpeg-turbo.patch | 1854 ++++++++++++++++++++ .../fbida/files/use-jpeg-turbo.patch | 13 + 4 files changed, 1885 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch create mode 100644 meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch create mode 100644 meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch
meta-oe/recipes-graphics/fbida/fbida_2.10.bb +4 -1
@@ -12,6 +12,9 @@ DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif" SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \ file://0001-Avoid-using-host-path.patch \ + file://fix-preprocessor.patch \ + file://support-jpeg-turbo.patch \ + file://use-jpeg-turbo.patch \ " SRC_URI[md5sum] = "09460b964b58c2e39b665498eca29018" SRC_URI[sha256sum] = "7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6"
@@ -34,7 +37,7 @@ PACKAGECONFIG[lirc] = ",,lirc" do_compile() { sed -i -e 's# fbgs# \$(srcdir)/fbgs#; s#-Ijpeg#-I\$(srcdir)/jpeg#; s# jpeg/# \$(srcdir)/jpeg/#' ${S}/GNUmakefile sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk - sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I${STAGING_INCDIR}:' ${S}/GNUmakefile + sed -i -e 's: cpp: ${CPP}:' ${S}/GNUmakefile # Be sure to respect preferences (force to "no") # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH}
meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch new file +14 -0
@@ -0,0 +1,14 @@ +Index: fbida-2.13/GNUmakefile +=================================================================== +--- fbida-2.13.orig/GNUmakefile ++++ fbida-2.13/GNUmakefile +@@ -53,8 +53,7 @@ include $(srcdir)/mk/Autoconf.mk + + ac_jpeg_ver = $(shell \ + $(call ac_init,for libjpeg version);\ +- $(call ac_s_cmd,echo JPEG_LIB_VERSION \ +- | cpp -include jpeglib.h | tail -n 1);\ ++ $(call ac_s_cmd,cpp -include jpeglib.h -dM -E -x c /dev/null | grep 'define JPEG_LIB_VERSION' | cut -f 3 -d' ');\ + $(call ac_fini)) + + define make-config
meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch new file +1854 -0
1,854 lines not on this page · raw message
meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch new file +13 -0
@@ -0,0 +1,13 @@ +Index: fbida-2.10/GNUmakefile +=================================================================== +--- fbida-2.10.orig/GNUmakefile ++++ fbida-2.10/GNUmakefile +@@ -51,7 +51,7 @@ HAVE_LIBSANE := $(call ac_lib,sane_init, + HAVE_LIBCURL := $(call ac_lib,curl_easy_init,curl) + HAVE_LIBLIRC := $(call ac_lib,lirc_init,lirc_client) + HAVE_MOTIF := $(call ac_lib,XmStringGenerate,Xm,-L/usr/X11R6/$(LIB) -lXpm -lXt -lXext -lX11) +-JPEG_VER := $(call ac_jpeg_ver) ++JPEG_VER := 62 + endef + + # transposing
Signature · 1 line
2.14.0