[oe] [meta-networking][PATCH] wireshark: 2.2.11 -> 2.4.5
1.Upgrade wireshark from 2.2.11 to 2.4.5.
2.Delete one configure option "--with-gcrypt", since it has been not supported
in 2.4.5.
3.Add 0001-use-pkgconfig-to-check-libgcrypt.patch, since libgcrypt does no
longer provide
libgcrypt-config, and provide *.pc, so we should use pkgconfig to check.
Signed-off-by: Huang Qiyu
---
.../0001-use-pkgconfig-to-check-libgcrypt.patch| 29 ++
.../{wireshark_2.2.11.bb => wireshark_2.4.5.bb}| 11
2 files changed, 35 insertions(+), 5 deletions(-)
create mode 100644
meta-networking/recipes-support/wireshark/wireshark/0001-use-pkgconfig-to-check-libgcrypt.patch
rename meta-networking/recipes-support/wireshark/{wireshark_2.2.11.bb =>
wireshark_2.4.5.bb} (91%)
diff --git
a/meta-networking/recipes-support/wireshark/wireshark/0001-use-pkgconfig-to-check-libgcrypt.patch
b/meta-networking/recipes-support/wireshark/wireshark/0001-use-pkgconfig-to-check-libgcrypt.patch
new file mode 100644
index 000..c2cb078
--- /dev/null
+++
b/meta-networking/recipes-support/wireshark/wireshark/0001-use-pkgconfig-to-check-libgcrypt.patch
@@ -0,0 +1,29 @@
+Subject: [PATCH] use pkgconfig to check libgcrypt
+
+Upstream-status: Inappropriate [configuration]
+
+libgcrypt does no longer provide libgcrypt-config, and provide
+*.pc, so we should use pkgconfig to check
+
+Signed-off-by: Zheng Ruoqin
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4b8654a..4182875 100644
+--- a/configure.ac
b/configure.ac
+@@ -303,8 +303,8 @@ if test "x$with_gnutls" = "xyes"; then
+ fi
+
+ # libgrypt (for decryption, MAC, etc. functionality).
+-AM_PATH_LIBGCRYPT(1.4.2, [ ] , [
+- AC_MSG_ERROR([[libgcrypt not installed for development; install libgcrypt,
including any development package, for your system]])
++PKG_CHECK_MODULES([LIBGCRYPT], [libgcrypt >= 1.4.2], [ ],
++[AC_MSG_ERROR([libgcrypt not installed for development; install libgcrypt,
including any development package, for your system])
+ ])
+
+ AC_ARG_WITH(libnl,
+--
+2.7.4
diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb
b/meta-networking/recipes-support/wireshark/wireshark_2.4.5.bb
similarity index 91%
rename from meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb
rename to meta-networking/recipes-support/wireshark/wireshark_2.4.5.bb
index 5eb372e..d6669b7 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_2.4.5.bb
@@ -4,14 +4,16 @@ SECTION = "net"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77"
-DEPENDS = "pcre expat glib-2.0 glib-2.0-native"
+DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt"
-SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2";
+SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.xz \
+ file://0001-use-pkgconfig-to-check-libgcrypt.patch \
+"
PE = "1"
-SRC_URI[md5sum] = "a79ba6cda83be2a91bde4110fe194788"
-SRC_URI[sha256sum] =
"a9f11621e85d7e1d72259157edd94825e72af3fd72e184b8474459f92ad5fc40"
+SRC_URI[md5sum] = "2b6f1f37c72fa15a0a1863016a0abcc0"
+SRC_URI[sha256sum] =
"b3b2ec29fba0f4a3a590438abe4054e56f19108d440fc2d61492db9d8ff16fd7"
inherit autotools pkgconfig perlnative
@@ -30,7 +32,6 @@ PACKAGECONFIG[gtk2] = "--with-gtk=2, , gtk+"
PACKAGECONFIG[gtk3] = "--with-gtk=3, , gtk+3"
PACKAGECONFIG[graphics] = "--enable-wireshark, --with-gtk=no
--disable-wireshark,"
PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
-PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl"
PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5"
PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 0/5] Upgrade php versions and enable opcache
These patches upgrade the versions of php recipes and enable opcache
in both. I had to move around some patches to ensure both the versions
compile without any fuzz warnings.
There are still some unrelated issues with these recipes like the ini file not
getting installed and the do_install logic should perhaps be reviewed again.
Anuj Mittal (5):
php: move patches to a single directory
php7: upgrade to 7.2.4
php5: upgrade to 5.6.35
php: add opcache extension to PACKAGECONFIG
php: enable opcache by default
.../php-7.1.9/0001-Specify-tag-with-libtool.patch | 62 -
.../php/php-7.1.9/CVE-2017-16642.patch | 5241
.../php/php-7.1.9/CVE-2018-5711.patch | 56 -
meta-oe/recipes-devtools/php/php.inc | 23 +-
.../0001-Add-lpthread-to-link.patch|0
...-acinclude.m4-don-t-unset-cache-variables.patch | 39 +
...nclude.m4-skip-binconfig-check-for-libxml.patch | 56 +
...i.c-build-empty-php_load_zend_extension_c.patch | 63 +
.../0001-opcache-config.m4-enable-opcache.patch| 385 ++
.../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 13 +-
meta-oe/recipes-devtools/php/php/configure.patch | 11 -
meta-oe/recipes-devtools/php/php/iconv.patch | 19 +-
.../php/php/imap-fix-autofoo.patch | 19 +-
.../recipes-devtools/php/php/pear-makefile.patch | 18 +-
.../recipes-devtools/php/php/phar-makefile.patch | 15 +-
...hp5-0001-opcache-config.m4-enable-opcache.patch | 387 ++
.../php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch} | 11 +-
...ear-makefile.patch => php5-pear-makefile.patch} | 12 +-
...har-makefile.patch => php5-phar-makefile.patch} | 15 +-
.../recipes-devtools/php/php/php_exec_native.patch | 16 +-
meta-oe/recipes-devtools/php/php_5.6.33.bb | 10 -
meta-oe/recipes-devtools/php/php_5.6.35.bb | 23 +
meta-oe/recipes-devtools/php/php_7.1.9.bb | 18 -
meta-oe/recipes-devtools/php/php_7.2.4.bb | 23 +
24 files changed, 1084 insertions(+), 5451 deletions(-)
delete mode 100644
meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch
delete mode 100644 meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch
delete mode 100644 meta-oe/recipes-devtools/php/php-7.1.9/CVE-2018-5711.patch
rename meta-oe/recipes-devtools/php/{php-5.6.33 =>
php}/0001-Add-lpthread-to-link.patch (100%)
create mode 100644
meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch
create mode 100644
meta-oe/recipes-devtools/php/php/0001-acinclude.m4-skip-binconfig-check-for-libxml.patch
create mode 100644
meta-oe/recipes-devtools/php/php/0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch
create mode 100644
meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
rename meta-oe/recipes-devtools/php/{php-7.1.9 =>
php}/change-AC_TRY_RUN-to-AC_TRY_LINK.patch (75%)
delete mode 100644 meta-oe/recipes-devtools/php/php/configure.patch
create mode 100644
meta-oe/recipes-devtools/php/php/php5-0001-opcache-config.m4-enable-opcache.patch
rename
meta-oe/recipes-devtools/php/{php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
=> php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch} (78%)
copy meta-oe/recipes-devtools/php/php/{pear-makefile.patch =>
php5-pear-makefile.patch} (66%)
copy meta-oe/recipes-devtools/php/php/{phar-makefile.patch =>
php5-phar-makefile.patch} (79%)
delete mode 100644 meta-oe/recipes-devtools/php/php_5.6.33.bb
create mode 100644 meta-oe/recipes-devtools/php/php_5.6.35.bb
delete mode 100644 meta-oe/recipes-devtools/php/php_7.1.9.bb
create mode 100644 meta-oe/recipes-devtools/php/php_7.2.4.bb
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/5] php5: upgrade to 5.6.35
For changes, see:
http://php.net/ChangeLog-5.php#5.6.35
Split patches between php5 and php7 to ensure there are no
fuzz warnings for both the versions.
Signed-off-by: Anuj Mittal
---
meta-oe/recipes-devtools/php/php.inc | 2 -
.../php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch| 63 ++
.../php/php/php5-pear-makefile.patch | 26 +
.../php/php/php5-phar-makefile.patch | 46
.../php/{php_5.6.33.bb => php_5.6.35.bb} | 12 +++--
meta-oe/recipes-devtools/php/php_7.2.4.bb | 4 ++
6 files changed, 148 insertions(+), 5 deletions(-)
create mode 100644
meta-oe/recipes-devtools/php/php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch
create mode 100644 meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch
create mode 100644 meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch
rename meta-oe/recipes-devtools/php/{php_5.6.33.bb => php_5.6.35.bb} (52%)
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index d2af4f6..fbc750d 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -18,8 +18,6 @@ SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
SRC_URI_append_class-target = " \
file://iconv.patch \
file://imap-fix-autofoo.patch \
-file://pear-makefile.patch \
-file://phar-makefile.patch \
file://php_exec_native.patch \
file://php-fpm.conf \
file://php-fpm-apache.conf \
diff --git
a/meta-oe/recipes-devtools/php/php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch
b/meta-oe/recipes-devtools/php/php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch
new file mode 100644
index 000..1d21f8c
--- /dev/null
+++
b/meta-oe/recipes-devtools/php/php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch
@@ -0,0 +1,63 @@
+From 5f49987e88dfcbdb84be6e0c9025432fbd998709 Mon Sep 17 00:00:00 2001
+From: Roy Li
+Date: Thu, 20 Aug 2015 16:29:35 +0800
+Subject: [PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK
+
+Upstream-Status: Pending
+
+AC_TRY_RUN is not suitable for cross-compile
+
+Signed-off-by: Roy Li
+
+%% original patch: change-AC_TRY_RUN-to-AC_TRY_LINK.patch
+
+%% original patch: php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch
+---
+ ext/fileinfo/config.m4 | 31 ++-
+ 1 file changed, 6 insertions(+), 25 deletions(-)
+
+diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
+index 7e98d62..8a8ea0e 100644
+--- a/ext/fileinfo/config.m4
b/ext/fileinfo/config.m4
+@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then
+ libmagic/readcdf.c libmagic/softmagic.c"
+
+ AC_MSG_CHECKING([for strcasestr])
+- AC_TRY_RUN([
+-#include
+-#include
+-#include
+-
+-int main(void)
+-{
+-char *s0, *s1, *ret;
+-
+-s0 = (char *) malloc(42);
+-s1 = (char *) malloc(8);
+-
+-memset(s0, 'X', 42);
+-s0[24] = 'Y';
+-s0[26] = 'Z';
+-s0[41] = '\0';
+-memset(s1, 'x', 8);
+-s1[0] = 'y';
+-s1[2] = 'Z';
+-s1[7] = '\0';
+-
+-ret = strcasestr(s0, s1);
+-
+-return !(NULL != ret);
+-}
++ AC_TRY_COMPILE([
++ #include
++ #include
++ #include
++ ],[
++ strcasestr(NULL, NULL);
+ ],[
+ dnl using the platform implementation
+ AC_MSG_RESULT(yes)
+--
+2.7.4
+
diff --git a/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch
b/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch
new file mode 100644
index 000..cff6426
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch
@@ -0,0 +1,26 @@
+From 79725e82d5981fc94eb657f0f46a499dbfc1cc40 Mon Sep 17 00:00:00 2001
+From: Koen Kooi
+Date: Wed, 2 Nov 2011 16:54:57 +0100
+Subject: [PATCH] Upstream-status: Unknown
+
+%% original patch: php5-pear-makefile.patch
+---
+ pear/Makefile.frag | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pear/Makefile.frag b/pear/Makefile.frag
+index 00bacae..739eeca 100644
+--- a/pear/Makefile.frag
b/pear/Makefile.frag
+@@ -11,7 +11,7 @@ PEAR_PREFIX = -dp a${program_prefix}
+ PEAR_SUFFIX = -ds a$(program_suffix)
+
+ install-pear-installer: $(SAPI_CLI_PATH)
+- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS)
pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX}
${PEAR_SUFFIX}
++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS)
$(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
${PEAR_PREFIX} ${PEAR_SUFFIX}
+
+ install-pear:
+ @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
+--
+2.7.4
+
diff --git a/meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch
b/meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch
new file mode 100644
index 000..4e1efd4
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch
@@ -0,0 +1,46 @@
+From 3ea626a8d081f56b01004b7992534d4e6b81a9cc Mon
[oe] [meta-oe][PATCH 4/5] php: add opcache extension to PACKAGECONFIG
OPcache improves PHP performance by storing precompiled script bytecode
in shared memory, thereby removing the need for PHP to load and parse
scripts on each request [1].
Add an option to enable opcache in php. AC_CHECK_FUNC isn't suitable for a
cross-compile environment, so pass the configure options instead to force
dlopen detection that is necessary to have extension support enabled.
On a standard phpbench test, I see a performance improvement of > 40%.
[1] http://php.net/manual/en/book.opcache.php
Signed-off-by: Anuj Mittal
---
meta-oe/recipes-devtools/php/php.inc | 14 +-
...-acinclude.m4-don-t-unset-cache-variables.patch | 39 +++
.../0001-opcache-config.m4-enable-opcache.patch| 385
meta-oe/recipes-devtools/php/php/configure.patch | 21 --
...hp5-0001-opcache-config.m4-enable-opcache.patch | 387 +
meta-oe/recipes-devtools/php/php_5.6.35.bb | 1 +
meta-oe/recipes-devtools/php/php_7.2.4.bb | 1 +
7 files changed, 822 insertions(+), 26 deletions(-)
create mode 100644
meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch
create mode 100644
meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
delete mode 100644 meta-oe/recipes-devtools/php/php/configure.patch
create mode 100644
meta-oe/recipes-devtools/php/php/php5-0001-opcache-config.m4-enable-opcache.patch
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index fbc750d..8ba218c 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -21,7 +21,7 @@ SRC_URI_append_class-target = " \
file://php_exec_native.patch \
file://php-fpm.conf \
file://php-fpm-apache.conf \
-file://configure.patch \
+file://0001-acinclude.m4-don-t-unset-cache-variables.patch \
file://70_mod_php${PHP_MAJOR_VERSION}.conf \
file://php-fpm.service \
"
@@ -40,7 +40,6 @@ PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}"
COMMON_EXTRA_OECONF = "--enable-sockets \
--enable-pcntl \
--enable-shared \
- --disable-opcache \
--disable-rpath \
--with-pic \
--libdir=${PHP_LIBDIR} \
@@ -59,6 +58,9 @@ EXTRA_OECONF = "--enable-mbstring \
${@bb.utils.contains('PACKAGECONFIG', 'pam', '',
'ac_cv_lib_pam_pam_start=no', d)} \
${COMMON_EXTRA_OECONF} \
"
+
+CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes"
+
EXTRA_OECONF_class-native = " \
--with-zlib=${STAGING_LIBDIR_NATIVE}/.. \
--without-iconv \
@@ -89,7 +91,7 @@ PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \
,--without-imap --without-imap-ssl \
,uw-imap"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-
+PACKAGECONFIG[opcache] = ",--disable-opcache"
export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php"
@@ -196,14 +198,14 @@ php_sysroot_preprocess () {
MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2',
'${PN}-modphp', '', d)}"
-PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2
${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc
${PN}"
+PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2
${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc
${PN}-opcache ${PN}"
RDEPENDS_${PN} += "libgcc"
RDEPENDS_${PN}-pear = "${PN}"
RDEPENDS_${PN}-phar = "${PN}-cli"
RDEPENDS_${PN}-cli = "${PN}"
RDEPENDS_${PN}-modphp = "${PN} apache2"
-RDEPENDS_${PN}-dev = "${PN}"
+RDEPENDS_${PN}-opcache = "${PN}"
INITSCRIPT_PACKAGES = "${PN}-fpm"
inherit update-rc.d
@@ -232,6 +234,8 @@ FILES_${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build
${bindir}/phpize \
${bindir}/php-config ${PHP_LIBDIR}/php/.depdb \
${PHP_LIBDIR}/php/.depdblock ${PHP_LIBDIR}/php/.filemap \
${PHP_LIBDIR}/php/.lock ${PHP_LIBDIR}/php/test"
+FILES_${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a"
+FILES_${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}"
FILES_${PN} = "${PHP_LIBDIR}/php"
FILES_${PN} += "${bindir}"
diff --git
a/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch
b/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch
new file mode 100644
index 000..a250cac
--- /dev/null
+++
b/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch
@@ -0,0 +1,39 @@
+From dfebe81f946a83fe2499fc84d4f3dbdc5612276c Mon Sep 17 00:00:00 2001
+From: Anuj Mittal
+Date: Tue, 3 Apr 2018 11:35:03 +0800
+Subject: [PATCH] acinclude.m4: don't unset cache variables
[oe] [meta-oe][PATCH 2/5] php7: upgrade to 7.2.4
* For changes, see:
http://www.php.net/ChangeLog-7.php#7.2.4
* Remove patches as they've been upstreamed:
- 0001-Specify-tag-with-libtool.patch
- CVE-2017-16642.patch
- CVE-2018-5711.patch
* mcrypt module has been deprecated and as such dependency has been moved
from php.inc to php5 recipe.
* Refresh patches to avoid fuzz warnings.
* New patches to:
- Make sure libxml is detected using pkg-config instead of binconfig.
- Fix link time warnings (backport, see patch for details)
* Move the following patches to php5 from inc as they were getting applied
out of context:
- acinclude-xml2-config.patch
- 0001-acinclude-use-pkgconfig-for-libxml2-config.patch
License-Update: License is same, just a change in copyright year to 2018.
Signed-off-by: Anuj Mittal
---
meta-oe/recipes-devtools/php/php.inc |5 +-
.../php/php/0001-Specify-tag-with-libtool.patch| 62 -
...nclude.m4-skip-binconfig-check-for-libxml.patch | 56 +
...i.c-build-empty-php_load_zend_extension_c.patch | 63 +
.../recipes-devtools/php/php/CVE-2017-16642.patch | 5241
.../recipes-devtools/php/php/CVE-2018-5711.patch | 56 -
.../php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 13 +-
meta-oe/recipes-devtools/php/php/configure.patch | 20 +-
meta-oe/recipes-devtools/php/php/iconv.patch | 19 +-
.../php/php/imap-fix-autofoo.patch | 19 +-
.../recipes-devtools/php/php/pear-makefile.patch | 18 +-
.../recipes-devtools/php/php/phar-makefile.patch | 15 +-
.../recipes-devtools/php/php/php_exec_native.patch | 16 +-
meta-oe/recipes-devtools/php/php_5.6.33.bb |8 +-
.../php/{php_7.1.9.bb => php_7.2.4.bb} | 12 +-
15 files changed, 213 insertions(+), 5410 deletions(-)
delete mode 100644
meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch
create mode 100644
meta-oe/recipes-devtools/php/php/0001-acinclude.m4-skip-binconfig-check-for-libxml.patch
create mode 100644
meta-oe/recipes-devtools/php/php/0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch
delete mode 100644 meta-oe/recipes-devtools/php/php/CVE-2017-16642.patch
delete mode 100644 meta-oe/recipes-devtools/php/php/CVE-2018-5711.patch
rename meta-oe/recipes-devtools/php/{php_7.1.9.bb => php_7.2.4.bb} (52%)
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index 8394c4f..d2af4f6 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -6,15 +6,13 @@ LICENSE = "PHP-3.0"
BBCLASSEXTEND = "native"
DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \
- openssl libmcrypt"
+ openssl"
DEPENDS_class-native = "zlib-native libxml2-native"
PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}"
SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
- file://acinclude-xml2-config.patch \
file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \
- file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \
"
SRC_URI_append_class-target = " \
@@ -57,7 +55,6 @@ EXTRA_OECONF = "--enable-mbstring \
--with-gettext=${STAGING_LIBDIR}/.. \
--with-zlib=${STAGING_LIBDIR}/.. \
--with-iconv=${STAGING_LIBDIR}/.. \
---with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
--with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
--with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le',
'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \
diff --git
a/meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch
b/meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch
deleted file mode 100644
index 18b4937..000
--- a/meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 5c84b039e97abd88f6a18da0e6d27383c00fea92 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-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
- 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_CXX
[oe] [meta-oe][PATCH 1/5] php: move patches to a single directory
Having two directories with version numbers just leads to unnecessary
churn everytime there's a version update.
We can have all patches in one single directory and differentiate b/w
specific version by prefix php5-/php7-
Signed-off-by: Anuj Mittal
---
.../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 56 --
.../0001-Add-lpthread-to-link.patch| 0
.../0001-Specify-tag-with-libtool.patch| 0
.../php/{php-7.1.9 => php}/CVE-2017-16642.patch| 0
.../php/{php-7.1.9 => php}/CVE-2018-5711.patch | 0
.../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 0
6 files changed, 56 deletions(-)
delete mode 100644
meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
rename meta-oe/recipes-devtools/php/{php-5.6.33 =>
php}/0001-Add-lpthread-to-link.patch (100%)
rename meta-oe/recipes-devtools/php/{php-7.1.9 =>
php}/0001-Specify-tag-with-libtool.patch (100%)
rename meta-oe/recipes-devtools/php/{php-7.1.9 => php}/CVE-2017-16642.patch
(100%)
rename meta-oe/recipes-devtools/php/{php-7.1.9 => php}/CVE-2018-5711.patch
(100%)
rename meta-oe/recipes-devtools/php/{php-7.1.9 =>
php}/change-AC_TRY_RUN-to-AC_TRY_LINK.patch (100%)
diff --git
a/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
b/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
deleted file mode 100644
index 39c334f..000
---
a/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK
-
-Upstream-Status: Pending
-
-AC_TRY_RUN is not suitable for cross-compile
-
-Signed-off-by: Roy Li
- ext/fileinfo/config.m4 | 31 ++-
- 1 file changed, 6 insertions(+), 25 deletions(-)
-
-diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
-index 7e98d62..8a8ea0e 100644
a/ext/fileinfo/config.m4
-+++ b/ext/fileinfo/config.m4
-@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then
- libmagic/readcdf.c libmagic/softmagic.c"
-
- AC_MSG_CHECKING([for strcasestr])
-- AC_TRY_RUN([
--#include
--#include
--#include
--
--int main(void)
--{
--char *s0, *s1, *ret;
--
--s0 = (char *) malloc(42);
--s1 = (char *) malloc(8);
--
--memset(s0, 'X', 42);
--s0[24] = 'Y';
--s0[26] = 'Z';
--s0[41] = '\0';
--memset(s1, 'x', 8);
--s1[0] = 'y';
--s1[2] = 'Z';
--s1[7] = '\0';
--
--ret = strcasestr(s0, s1);
--
--return !(NULL != ret);
--}
-+ AC_TRY_COMPILE([
-+ #include
-+ #include
-+ #include
-+ ],[
-+ strcasestr(NULL, NULL);
- ],[
- dnl using the platform implementation
- AC_MSG_RESULT(yes)
---
-1.9.1
-
diff --git
a/meta-oe/recipes-devtools/php/php-5.6.33/0001-Add-lpthread-to-link.patch
b/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch
similarity index 100%
rename from
meta-oe/recipes-devtools/php/php-5.6.33/0001-Add-lpthread-to-link.patch
rename to meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch
diff --git
a/meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch
b/meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch
similarity index 100%
rename from
meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch
rename to meta-oe/recipes-devtools/php/php/0001-Specify-tag-with-libtool.patch
diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch
b/meta-oe/recipes-devtools/php/php/CVE-2017-16642.patch
similarity index 100%
rename from meta-oe/recipes-devtools/php/php-7.1.9/CVE-2017-16642.patch
rename to meta-oe/recipes-devtools/php/php/CVE-2017-16642.patch
diff --git a/meta-oe/recipes-devtools/php/php-7.1.9/CVE-2018-5711.patch
b/meta-oe/recipes-devtools/php/php/CVE-2018-5711.patch
similarity index 100%
rename from meta-oe/recipes-devtools/php/php-7.1.9/CVE-2018-5711.patch
rename to meta-oe/recipes-devtools/php/php/CVE-2018-5711.patch
diff --git
a/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
b/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
similarity index 100%
rename from
meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
rename to
meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 5/5] php: enable opcache by default
Signed-off-by: Anuj Mittal
---
meta-oe/recipes-devtools/php/php.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index 8ba218c..066b97c 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -67,7 +67,7 @@ EXTRA_OECONF_class-native = " \
${COMMON_EXTRA_OECONF} \
"
-PACKAGECONFIG ??= "mysql sqlite3 imap \
+PACKAGECONFIG ??= "mysql sqlite3 imap opcache \
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \
"
PACKAGECONFIG_class-native = ""
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] wireshark: 2.2.11 -> 2.4.5
On 04/03/2018 12:30 AM, Huang Qiyu wrote:
> 1.Upgrade wireshark from 2.2.11 to 2.4.5.
> 2.Delete one configure option "--with-gcrypt", since it has been not
> supported in 2.4.5.
> 3.Add 0001-use-pkgconfig-to-check-libgcrypt.patch, since libgcrypt does no
> longer provide
> libgcrypt-config, and provide *.pc, so we should use pkgconfig to check.
>
> Signed-off-by: Huang Qiyu
thanks for the patch. This update it sitting in master-next
http://cgit.openembedded.org/meta-openembedded/commit/?h=master-next&id=2442326943253afe678b1653316b8453ed7ca865
> ---
> .../0001-use-pkgconfig-to-check-libgcrypt.patch| 29
> ++
> .../{wireshark_2.2.11.bb => wireshark_2.4.5.bb}| 11
> 2 files changed, 35 insertions(+), 5 deletions(-)
> create mode 100644
> meta-networking/recipes-support/wireshark/wireshark/0001-use-pkgconfig-to-check-libgcrypt.patch
> rename meta-networking/recipes-support/wireshark/{wireshark_2.2.11.bb =>
> wireshark_2.4.5.bb} (91%)
>
> diff --git
> a/meta-networking/recipes-support/wireshark/wireshark/0001-use-pkgconfig-to-check-libgcrypt.patch
>
> b/meta-networking/recipes-support/wireshark/wireshark/0001-use-pkgconfig-to-check-libgcrypt.patch
> new file mode 100644
> index 000..c2cb078
> --- /dev/null
> +++
> b/meta-networking/recipes-support/wireshark/wireshark/0001-use-pkgconfig-to-check-libgcrypt.patch
> @@ -0,0 +1,29 @@
> +Subject: [PATCH] use pkgconfig to check libgcrypt
> +
> +Upstream-status: Inappropriate [configuration]
> +
> +libgcrypt does no longer provide libgcrypt-config, and provide
> +*.pc, so we should use pkgconfig to check
> +
> +Signed-off-by: Zheng Ruoqin
> +---
> + configure.ac | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 4b8654a..4182875 100644
> +--- a/configure.ac
> b/configure.ac
> +@@ -303,8 +303,8 @@ if test "x$with_gnutls" = "xyes"; then
> + fi
> +
> + # libgrypt (for decryption, MAC, etc. functionality).
> +-AM_PATH_LIBGCRYPT(1.4.2, [ ] , [
> +- AC_MSG_ERROR([[libgcrypt not installed for development; install
> libgcrypt, including any development package, for your system]])
> ++PKG_CHECK_MODULES([LIBGCRYPT], [libgcrypt >= 1.4.2], [ ],
> ++[AC_MSG_ERROR([libgcrypt not installed for development; install libgcrypt,
> including any development package, for your system])
> + ])
> +
> + AC_ARG_WITH(libnl,
> +--
> +2.7.4
> diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb
> b/meta-networking/recipes-support/wireshark/wireshark_2.4.5.bb
> similarity index 91%
> rename from meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb
> rename to meta-networking/recipes-support/wireshark/wireshark_2.4.5.bb
> index 5eb372e..d6669b7 100644
> --- a/meta-networking/recipes-support/wireshark/wireshark_2.2.11.bb
> +++ b/meta-networking/recipes-support/wireshark/wireshark_2.4.5.bb
> @@ -4,14 +4,16 @@ SECTION = "net"
> LICENSE = "GPL-2.0"
> LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77"
>
> -DEPENDS = "pcre expat glib-2.0 glib-2.0-native"
> +DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt"
>
> -SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2";
> +SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.xz \
> +file://0001-use-pkgconfig-to-check-libgcrypt.patch \
> +"
>
> PE = "1"
>
> -SRC_URI[md5sum] = "a79ba6cda83be2a91bde4110fe194788"
> -SRC_URI[sha256sum] =
> "a9f11621e85d7e1d72259157edd94825e72af3fd72e184b8474459f92ad5fc40"
> +SRC_URI[md5sum] = "2b6f1f37c72fa15a0a1863016a0abcc0"
> +SRC_URI[sha256sum] =
> "b3b2ec29fba0f4a3a590438abe4054e56f19108d440fc2d61492db9d8ff16fd7"
>
> inherit autotools pkgconfig perlnative
>
> @@ -30,7 +32,6 @@ PACKAGECONFIG[gtk2] = "--with-gtk=2, , gtk+"
> PACKAGECONFIG[gtk3] = "--with-gtk=3, , gtk+3"
> PACKAGECONFIG[graphics] = "--enable-wireshark, --with-gtk=no
> --disable-wireshark,"
> PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
> -PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
> PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl"
> PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5"
> PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua"
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] rarpd, sblim-sfcb, openct: inherit systemd unconditionally
* the inherit was controlled by VIRTUAL-RUNTIME_init_manager and the
installation
of .service files by DISTRO_FEATURES and systemd was in DISTRO_FEATURES but
not
in VIRTUAL-RUNTIME_init_manager it was causing QA issues about unpackaged
.service files
ERROR: rarpd-ss981107-r0 do_package: QA Issue: rarpd: Files/directories
were installed but not shipped in any package:
/lib
/lib/systemd
/lib/systemd/system
/lib/systemd/system/rarpd.service
ERROR: sblim-sfcb-1.4.9-r0 do_package: QA Issue: sblim-sfcb:
Files/directories were installed but not shipped in any package:
/lib
/lib/systemd
/lib/systemd/system
/lib/systemd/system/sblim-sfcb.service
ERROR: sblim-sfcb-1.4.9-r0 do_package: QA Issue: sblim-sfcb:
Files/directories were installed but not shipped in any package:
/lib
/lib/systemd
/lib/systemd/system
/lib/systemd/system/sblim-sfcb.service
* systemd.bbclass will take care of removing /lib/systemd when systemd
isn't in DISTRO_FEATURES, so we can remove both conditions
Signed-off-by: Martin Jansa
---
meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb| 8 +++-
meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb | 8 +++-
meta-oe/recipes-support/openct/openct_0.6.20.bb | 8 +++-
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
index 4025b8087e..7c9f2df9db 100644
--- a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
+++ b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
@@ -38,13 +38,11 @@ do_install() {
install -m 644 rarpd.8 ${D}${mandir}/man8/rarpd.8
install -m 644 ${WORKDIR}/ethers.sample ${D}${sysconfdir}/ethers
-if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
-install -d ${D}${systemd_unitdir}/system
-install -m 0644 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/
-fi
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/
}
-inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)}
+inherit systemd
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "rarpd.service"
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
index 152ae22902..10ffaaa31b 100644
--- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
@@ -31,7 +31,7 @@ SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30"
SRC_URI[sha256sum] =
"634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd"
inherit autotools
-inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)}
+inherit systemd
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "sblim-sfcb.service"
@@ -56,10 +56,8 @@ do_install() {
oe_runmake DESTDIR=${D} install
-if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
-install -d ${D}${systemd_unitdir}/system
-install -m 0644 ${WORKDIR}/sfcb.service
${D}${systemd_unitdir}/system/sblim-sfcb.service
-fi
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sfcb.service
${D}${systemd_unitdir}/system/sblim-sfcb.service
install -d ${D}${sysconfdir}/init.d
mv ${D}${sysconfdir}/init.d/sfcb ${D}${sysconfdir}/init.d/sblim-sfcb
diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb
b/meta-oe/recipes-support/openct/openct_0.6.20.bb
index c7d7203eda..913290cd97 100644
--- a/meta-oe/recipes-support/openct/openct_0.6.20.bb
+++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb
@@ -25,7 +25,7 @@ SRC_URI[sha256sum] =
"6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d
LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
-inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)}
+inherit systemd
SYSTEMD_SERVICE_${PN} += "openct.service "
SYSTEMD_AUTO_ENABLE = "enable"
@@ -77,10 +77,8 @@ do_install () {
install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct
install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct
-if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
-install -d ${D}/${systemd_unitdir}/system
-install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system
-fi
+install -d ${D}/${systemd_unitdir}/system
+install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system
so=$(find ${D} -name \*.so | sed "s|^${D}||")
sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf
--
2.15.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] iperf3: refresh local patches to avoid fuzz warnings
From: Denys Dmytriyenko Signed-off-by: Denys Dmytriyenko --- ...nclude-stdint.h-for-various-std-c99-int-types.patch | 16 +++- .../iperf3/0002-Remove-pg-from-profile_CFLAGS.patch| 12 +--- .../iperf3/iperf3/automake-foreign.patch | 18 ++ 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch index ae36208..3db188f 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch +++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch @@ -1,21 +1,22 @@ -From be653711fb92d2430b3ecc546b4e3ad927d19ec5 Mon Sep 17 00:00:00 2001 +From b26687cfe958c6be009717a6267da403cb802197 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 14 Jul 2017 12:59:42 -0700 -Subject: [PATCH 1/2] include stdint.h for various std c99 int types +Subject: [PATCH] include stdint.h for various std c99 int types Signed-off-by: Khem Raj + --- src/cjson.h | 2 ++ src/timer.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/cjson.h b/src/cjson.h -index fb8cd3b..69cd272 100644 +index fa7cb73..41a41dd 100644 --- a/src/cjson.h +++ b/src/cjson.h -@@ -23,6 +23,8 @@ - #ifndef cJSON__h - #define cJSON__h +@@ -28,6 +28,8 @@ + #include + #endif +#include + @@ -34,6 +35,3 @@ index 0f9c5eb..0b195be 100644 /* TimerClientData is an opaque value that tags along with a timer. The ** client can use it for whatever, and it gets passed to the callback when --- -2.13.3 - diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch index 06eb41a..056e7cc 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch +++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch @@ -1,20 +1,21 @@ -From 6db0e28f906bc3784019dfb5bb011237a8034fda Mon Sep 17 00:00:00 2001 +From 4ce0f33b25b02b9079d7d9470b6d2d0749255f52 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 14 Jul 2017 13:00:16 -0700 -Subject: [PATCH 2/2] Remove -pg from profile_CFLAGS +Subject: [PATCH] Remove -pg from profile_CFLAGS musl fails to link with missing gcrt1.o Signed-off-by: Khem Raj + --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 23b0c72..6268145 100644 +index 11d763d..c394bef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -49,9 +49,9 @@ iperf3_LDFLAGS = -g +@@ -52,9 +52,9 @@ iperf3_LDFLAGS = -g iperf3_profile_SOURCES = main.c \ $(libiperf_la_SOURCES) @@ -26,6 +27,3 @@ index 23b0c72..6268145 100644 # Specify the sources and various flags for the test cases t_timer_SOURCES = t_timer.c --- -2.13.3 - diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch index 06c394e..03f68c9 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch +++ b/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch @@ -1,12 +1,22 @@ -Pass the 'foreign' option to automake to enable iperf3 to build. +From 7135d946ab3da77109dae731ac0e70bff02d3719 Mon Sep 17 00:00:00 2001 +From: Chunrong Guo +Date: Mon, 5 Jan 2015 11:39:45 -0600 +Subject: [PATCH] Pass the 'foreign' option to automake to enable iperf3 to + build. Upstream-Status: Inappropriate [configuration] Signed-off-by: Chunrong Guo a/configure.ac 2015-10-19 02:49:30.471867352 -0500 -+++ b/configure.ac 2015-10-19 02:46:36.207873572 -0500 -@@ -33,7 +33,7 @@ +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b988322..a554fcf 100644 +--- a/configure.ac b/configure.ac +@@ -34,7 +34,7 @@ AC_CONFIG_AUX_DIR(config) # Initialize the automake system -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] tcpdump: refresh local patches to avoid fuzz warnings
From: Denys Dmytriyenko Signed-off-by: Denys Dmytriyenko --- .../recipes-support/tcpdump/tcpdump/add-ptest.patch | 13 +++-- .../tcpdump/unnecessary-to-check-libpcap.patch| 19 ++- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch index 196cec7..7a02155 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch @@ -1,4 +1,4 @@ -From 7b259580800e259d232229dc89f97058b56e2fe8 Mon Sep 17 00:00:00 2001 +From 09c310b48f73b62dc6673ce0bdfc638d9ae4bbda Mon Sep 17 00:00:00 2001 From: "Hongjun.Yang" Date: Wed, 22 Oct 2014 10:02:48 +0800 Subject: [PATCH] Add ptest for tcpdump @@ -6,15 +6,16 @@ Subject: [PATCH] Add ptest for tcpdump Upstream-Status: Pending Signed-off-by: Hongjun.Yang + --- Makefile.in | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) -Index: tcpdump-4.9.0/Makefile.in -=== tcpdump-4.9.0.orig/Makefile.in -+++ tcpdump-4.9.0/Makefile.in -@@ -436,9 +436,17 @@ distclean: +diff --git a/Makefile.in b/Makefile.in +index 0941f0e..3ce40c6 100644 +--- a/Makefile.in b/Makefile.in +@@ -437,9 +437,17 @@ distclean: tests/failure-outputs.txt rm -rf autom4te.cache tests/DIFF tests/NEW diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch index d7a3ac2..c70404c 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch @@ -1,4 +1,7 @@ -unnecessary to check libpcap +From 66ee5c0d49c3e4a67cd9a691c1313e4a02eafa59 Mon Sep 17 00:00:00 2001 +From: Roy Li +Date: Tue, 8 Jul 2014 13:20:47 +0800 +Subject: [PATCH] unnecessary to check libpcap Upstream-Status: Pending @@ -11,23 +14,21 @@ In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to check if libpcap existed. Signed-off-by: Roy Li + --- - configure.in |2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index 06fade1..9125de7 100644 +index b2305a5..b3b5dbf 100644 --- a/configure.in +++ b/configure.in -@@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl, - dnl AC_CHECK_LIB(z, uncompress) - dnl AC_CHECK_HEADERS(zlib.h) +@@ -418,7 +418,7 @@ dnl Some platforms may need -lnsl for getrpcbynumber. + AC_SEARCH_LIBS(getrpcbynumber, nsl, + AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have getrpcbynumber()])) -AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) +#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) # # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate --- -1.7.9.5 - -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/2] poppler: Rework patch fixing do_configure
Turn the patch from a workaround into a proper fix. It was submitted to poppler
bugzilla - but after endless discussions I won't follow this further.
Signed-off-by: Andreas Müller
---
...0001-Do-not-overwrite-all-our-build-flags.patch | 36 --
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git
a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch
b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch
index 5b66a8a9c..18f508519 100644
---
a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch
+++
b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch
@@ -10,27 +10,29 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller
---
- cmake/modules/PopplerMacros.cmake | 2 ++
- 1 file changed, 2 insertions(+)
+ cmake/modules/PopplerMacros.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/modules/PopplerMacros.cmake
b/cmake/modules/PopplerMacros.cmake
-index ccb2790..f29481e 100644
+index ccb2790..0f392cb 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
-@@ -98,6 +98,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-
-+if(false)
- if(CMAKE_COMPILER_IS_GNUCXX)
- # set the default compile warnings
- set(_warn "-Wall -Wextra -Wpedantic")
-@@ -159,4 +160,5 @@ if(CMAKE_C_COMPILER MATCHES "icc")
- set(CMAKE_C_FLAGS_DEBUG"-O2 -g -Ob0 -noalign ${_save_cflags}")
- set(CMAKE_C_FLAGS_DEBUGFULL"-g -Ob0 -noalign ${_save_cflags}")
- endif(CMAKE_C_COMPILER MATCHES "icc")
-+endif(false)
+@@ -125,14 +125,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+ set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+- set(CMAKE_CXX_FLAGS"-fno-exceptions -fno-check-new
-fno-common -D_DEFAULT_SOURCE")
++ set(CMAKE_CXX_FLAGS"-fno-exceptions -fno-check-new
-fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+ set(CMAKE_CXX_FLAGS_RELEASE"-O2 -DNDEBUG ${_save_cxxflags}")
+ set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks
-fno-schedule-insns -fno-inline ${_save_cxxflags}")
+ set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
+ set(CMAKE_CXX_FLAGS_PROFILE"-g3 -fno-inline -ftest-coverage
-fprofile-arcs ${_save_cxxflags}")
+ set(_save_cflags "${CMAKE_C_FLAGS}")
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
++ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE
${_save_cflags}")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
+ set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
+ set(CMAKE_C_FLAGS_DEBUG"-g -O2 -fno-reorder-blocks
-fno-schedule-insns -fno-inline ${_save_cflags}")
--
2.14.3
-
--
2.14.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/2] poppler: update 0.62.0- > 0.63.0
Signed-off-by: Andreas Müller
---
.../recipes-support/poppler/{poppler_0.62.0.bb => poppler_0.63.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-support/poppler/{poppler_0.62.0.bb =>
poppler_0.63.0.bb} (93%)
diff --git a/meta-oe/recipes-support/poppler/poppler_0.62.0.bb
b/meta-oe/recipes-support/poppler/poppler_0.63.0.bb
similarity index 93%
rename from meta-oe/recipes-support/poppler/poppler_0.62.0.bb
rename to meta-oe/recipes-support/poppler/poppler_0.63.0.bb
index 696621938..143df3f73 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.62.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.63.0.bb
@@ -6,8 +6,8 @@ SRC_URI = " \
http://poppler.freedesktop.org/${BP}.tar.xz \
file://0001-Do-not-overwrite-all-our-build-flags.patch \
"
-SRC_URI[md5sum] = "42b801f2defaccb6b6cf1bf783ee1552"
-SRC_URI[sha256sum] =
"5b9a73dfd4d6f61d165ada1e4f0abd2d420494bf9d0b1c15d0db3f7b83a729c6"
+SRC_URI[md5sum] = "66a54da4896b1408611699feda5c1821"
+SRC_URI[sha256sum] =
"27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111"
DEPENDS = "fontconfig zlib cairo lcms"
--
2.14.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 0/2] poppler nightmare
Not convinced that I'll get support at poppler project. Let's see what
autobuilder says. If it fails, please unroll back to 0.57.0 - I am sure
that disable glib causes trouble for evince.
Andreas Müller (2):
poppler: Rework patch fixing do_configure
poppler: update 0.62.0- > 0.63.0
...0001-Do-not-overwrite-all-our-build-flags.patch | 36 --
.../{poppler_0.62.0.bb => poppler_0.63.0.bb} | 4 +--
2 files changed, 21 insertions(+), 19 deletions(-)
rename meta-oe/recipes-support/poppler/{poppler_0.62.0.bb =>
poppler_0.63.0.bb} (93%)
--
2.14.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] iperf3: refresh local patches to avoid fuzz warnings
On 04/04/2018 07:00 AM, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko > > Signed-off-by: Denys Dmytriyenko > --- > ...nclude-stdint.h-for-various-std-c99-int-types.patch | 16 +++- > .../iperf3/0002-Remove-pg-from-profile_CFLAGS.patch| 12 +--- > .../iperf3/iperf3/automake-foreign.patch | 18 > ++ > 3 files changed, 26 insertions(+), 20 deletions(-) > > diff --git > a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch > > b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch > index ae36208..3db188f 100644 > --- > a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch > +++ > b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-include-stdint.h-for-various-std-c99-int-types.patch > @@ -1,21 +1,22 @@ > -From be653711fb92d2430b3ecc546b4e3ad927d19ec5 Mon Sep 17 00:00:00 2001 > +From b26687cfe958c6be009717a6267da403cb802197 Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Fri, 14 Jul 2017 12:59:42 -0700 > -Subject: [PATCH 1/2] include stdint.h for various std c99 int types > +Subject: [PATCH] include stdint.h for various std c99 int types > > Signed-off-by: Khem Raj > + > --- > src/cjson.h | 2 ++ > src/timer.h | 1 + > 2 files changed, 3 insertions(+) > > diff --git a/src/cjson.h b/src/cjson.h > -index fb8cd3b..69cd272 100644 > +index fa7cb73..41a41dd 100644 > --- a/src/cjson.h > +++ b/src/cjson.h > -@@ -23,6 +23,8 @@ > - #ifndef cJSON__h > - #define cJSON__h > +@@ -28,6 +28,8 @@ > + #include > + #endif > > +#include > + This patch should probably be removed now since it's now just adding stdint.h twice. Upstream has fixed this. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] tcpdump: refresh local patches to avoid fuzz warnings
On 04/03/2018 04:03 PM, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko > > Signed-off-by: Denys Dmytriyenko > --- at fix like this is in master-next already. - armin > .../recipes-support/tcpdump/tcpdump/add-ptest.patch | 13 +++-- > .../tcpdump/unnecessary-to-check-libpcap.patch| 19 > ++- > 2 files changed, 17 insertions(+), 15 deletions(-) > > diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch > b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch > index 196cec7..7a02155 100644 > --- a/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch > +++ b/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch > @@ -1,4 +1,4 @@ > -From 7b259580800e259d232229dc89f97058b56e2fe8 Mon Sep 17 00:00:00 2001 > +From 09c310b48f73b62dc6673ce0bdfc638d9ae4bbda Mon Sep 17 00:00:00 2001 > From: "Hongjun.Yang" > Date: Wed, 22 Oct 2014 10:02:48 +0800 > Subject: [PATCH] Add ptest for tcpdump > @@ -6,15 +6,16 @@ Subject: [PATCH] Add ptest for tcpdump > Upstream-Status: Pending > > Signed-off-by: Hongjun.Yang > + > --- > Makefile.in | 10 +- > 1 file changed, 9 insertions(+), 1 deletion(-) > > -Index: tcpdump-4.9.0/Makefile.in > -=== > tcpdump-4.9.0.orig/Makefile.in > -+++ tcpdump-4.9.0/Makefile.in > -@@ -436,9 +436,17 @@ distclean: > +diff --git a/Makefile.in b/Makefile.in > +index 0941f0e..3ce40c6 100644 > +--- a/Makefile.in > b/Makefile.in > +@@ -437,9 +437,17 @@ distclean: > tests/failure-outputs.txt > rm -rf autom4te.cache tests/DIFF tests/NEW > > diff --git > a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch > > b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch > index d7a3ac2..c70404c 100644 > --- > a/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch > +++ > b/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch > @@ -1,4 +1,7 @@ > -unnecessary to check libpcap > +From 66ee5c0d49c3e4a67cd9a691c1313e4a02eafa59 Mon Sep 17 00:00:00 2001 > +From: Roy Li > +Date: Tue, 8 Jul 2014 13:20:47 +0800 > +Subject: [PATCH] unnecessary to check libpcap > > Upstream-Status: Pending > > @@ -11,23 +14,21 @@ In fact, the libpcap has been added into the tcpdump's > DEPENDS, not need to > check if libpcap existed. > > Signed-off-by: Roy Li > + > --- > - configure.in |2 +- > + configure.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure.in b/configure.in > -index 06fade1..9125de7 100644 > +index b2305a5..b3b5dbf 100644 > --- a/configure.in > +++ b/configure.in > -@@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl, > - dnl AC_CHECK_LIB(z, uncompress) > - dnl AC_CHECK_HEADERS(zlib.h) > +@@ -418,7 +418,7 @@ dnl Some platforms may need -lnsl for getrpcbynumber. > + AC_SEARCH_LIBS(getrpcbynumber, nsl, > + AC_DEFINE(HAVE_GETRPCBYNUMBER, 1, [define if you have > getrpcbynumber()])) > > -AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) > +#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) > > # > # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate > --- > -1.7.9.5 > - -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 0/2] poppler nightmare
Andreas,
On 04/03/2018 04:15 PM, Andreas Müller wrote:
> Not convinced that I'll get support at poppler project. Let's see what
> autobuilder says. If it fails, please unroll back to 0.57.0 - I am sure
> that disable glib causes trouble for evince.
this didn't make it into the current world build. I built it @ home a
getting the same errors:
|
/build/build_artifacts/master/tmp-glibc/work/core2-64-oe-linux/poppler/0.63.0-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/7.3.0/ld:
warning: libpoppler.so.74, needed by ./libpoppler-glib.so, not found
(try using -rpath or -rpath-link)
- armin
>
> Andreas Müller (2):
> poppler: Rework patch fixing do_configure
> poppler: update 0.62.0- > 0.63.0
>
> ...0001-Do-not-overwrite-all-our-build-flags.patch | 36
> --
> .../{poppler_0.62.0.bb => poppler_0.63.0.bb} | 4 +--
> 2 files changed, 21 insertions(+), 19 deletions(-)
> rename meta-oe/recipes-support/poppler/{poppler_0.62.0.bb =>
> poppler_0.63.0.bb} (93%)
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 0/2] poppler nightmare
On Wed, Apr 4, 2018 at 3:32 AM, akuster808 wrote: > Andreas, > > > > On 04/03/2018 04:15 PM, Andreas Müller wrote: >> Not convinced that I'll get support at poppler project. Let's see what >> autobuilder says. If it fails, please unroll back to 0.57.0 - I am sure >> that disable glib causes trouble for evince. > > this didn't make it into the current world build. I built it @ home a > getting the same errors: > > | > /build/build_artifacts/master/tmp-glibc/work/core2-64-oe-linux/poppler/0.63.0-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/7.3.0/ld: > warning: libpoppler.so.74, needed by ./libpoppler-glib.so, not found > (try using -rpath or -rpath-link) > > - armin Thanks Armin for quick response. As written - I suggest to keep poppler at 0.57.0 and forget the updates for a while. Sigh - from the moment I saw the announcement that poppler changes from autotools to cmake I thought there might be trouble is ahead. Now I know. Andreas -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 0/2] poppler nightmare
I recently tried to cross build the current version of poppler for an embedded ARM system. This was not under the Yocto/OE build environment, but I never could get quite the right cmake config file to get the thing to build. Since I just needed it for the pdftoraster cups filter, I punted and built ghostscript instead. cmake may be fine for native builds, but at least in this case, it was a pain to use for cross-compilation. -Bill On Tue, Apr 3, 2018 at 8:28 PM, Andreas Müller wrote: > On Wed, Apr 4, 2018 at 3:32 AM, akuster808 wrote: >> Andreas, >> >> >> >> On 04/03/2018 04:15 PM, Andreas Müller wrote: >>> Not convinced that I'll get support at poppler project. Let's see what >>> autobuilder says. If it fails, please unroll back to 0.57.0 - I am sure >>> that disable glib causes trouble for evince. >> >> this didn't make it into the current world build. I built it @ home a >> getting the same errors: >> >> | >> /build/build_artifacts/master/tmp-glibc/work/core2-64-oe-linux/poppler/0.63.0-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/7.3.0/ld: >> warning: libpoppler.so.74, needed by ./libpoppler-glib.so, not found >> (try using -rpath or -rpath-link) >> >> - armin > Thanks Armin for quick response. As written - I suggest to keep > poppler at 0.57.0 and forget the updates for a while. > > Sigh - from the moment I saw the announcement that poppler changes > from autotools to cmake I thought there might be trouble is ahead. Now > I know. > > Andreas > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
