All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/4] phoronix-test-suite: upgrade to 8.0.1
@ 2018-07-03  9:20 Ross Burton
  2018-07-03  9:20 ` [PATCH 2/4] php: disable non-deterministic valgrind Ross Burton
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Ross Burton @ 2018-07-03  9:20 UTC (permalink / raw)
  To: openembedded-devel

Add a dependency on lscpu as the processor information needs it, and os-release
as that is used to identify the distribution.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../{phoronix-test-suite_7.8.0.bb => phoronix-test-suite_8.0.1.bb}  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-benchmark/phoronix-test-suite/{phoronix-test-suite_7.8.0.bb => phoronix-test-suite_8.0.1.bb} (86%)

diff --git a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.0.1.bb
similarity index 86%
rename from meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb
rename to meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.0.1.bb
index 1f90a71256..b9401f2790 100644
--- a/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb
+++ b/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.0.1.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "console/tests"
 
 SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz"
-SRC_URI[md5sum] = "850843bd9252823e7e24bc0849773000"
-SRC_URI[sha256sum] = "cd6c869841f28e4ac1e8a5e4cda05fafce9a523a6b4f0f3a47805efd30494d88"
+SRC_URI[md5sum] = "3dc3a0e490e909f188379a9e05fd4780"
+SRC_URI[sha256sum] = "6306549109c7254baf31edb385265b19557b5692217d2dfcf96f6fb17de8e842"
 
 S = "${WORKDIR}/phoronix-test-suite"
 
@@ -29,7 +29,7 @@ do_install() {
 SYSTEMD_AUTO_ENABLE = "disable"
 SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service"
 
-RDEPENDS_${PN} += "bash python php-cli"
+RDEPENDS_${PN} += "bash python php-cli util-linux-lscpu os-release"
 
 FILES_${PN} += " \
     ${datadir}/phoronix-test-suite \
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/4] php: disable non-deterministic valgrind
  2018-07-03  9:20 [PATCH 1/4] phoronix-test-suite: upgrade to 8.0.1 Ross Burton
@ 2018-07-03  9:20 ` Ross Burton
  2018-07-04 13:08   ` Khem Raj
  2018-07-03  9:20 ` [PATCH 3/4] php: actually enable openssl Ross Burton
  2018-07-03  9:20 ` [PATCH 4/4] p7zip: simplify recipe Ross Burton
  2 siblings, 1 reply; 8+ messages in thread
From: Ross Burton @ 2018-07-03  9:20 UTC (permalink / raw)
  To: openembedded-devel

Valgrind support in PHP looks on the host for Valgrind headers, backport a patch
from upstream so that Valgrind support is disabled by default.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-oe/recipes-devtools/php/php.inc            |   1 +
 meta-oe/recipes-devtools/php/php/valgrind.patch | 115 ++++++++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/php/php/valgrind.patch

diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 066b97cd26..f262d60d15 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -24,6 +24,7 @@ SRC_URI_append_class-target = " \
             file://0001-acinclude.m4-don-t-unset-cache-variables.patch \
             file://70_mod_php${PHP_MAJOR_VERSION}.conf \
             file://php-fpm.service \
+            file://valgrind.patch \
           "
 S = "${WORKDIR}/php-${PV}"
 
diff --git a/meta-oe/recipes-devtools/php/php/valgrind.patch b/meta-oe/recipes-devtools/php/php/valgrind.patch
new file mode 100644
index 0000000000..c3e232ba23
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php/valgrind.patch
@@ -0,0 +1,115 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From 25ba60b1479eb332a7388732f3ee5467000fbe73 Mon Sep 17 00:00:00 2001
+From: Michael Heimpold <mhei@heimpold.de>
+Date: Wed, 14 Feb 2018 14:46:17 +0100
+Subject: [PATCH] Fixed bug #75722: Rework valgrind detection
+
+As described in bug report #75722, the configure script (acinclude.m4)
+currently searches for the valgrind header file and enables valgrind
+support if found.
+
+When cross-compiling the searched paths are invalid for the target
+platform because they belong to the host system. At the moment, there is
+no way to tell the build system a dedicated path where to look for the
+header file.
+
+This leads to the issue, that when cross-compiling eg. for ARMv5 platform,
+that valgrind header file is detected - e.g. because host system is amd64 -
+and support is enabled - but target platform will never support valgrind
+(valgrind requires e.g. at least ARMv7).
+
+This change reworks the detection so that user could manually opt-in
+valgrind support and optionally specify a directory where the build system
+should look for the header file using the --with-valgrind option.
+---
+ NEWS         |  4 ++++
+ acinclude.m4 | 20 --------------------
+ configure.ac | 30 +++++++++++++++++++++++++++++-
+ 3 files changed, 33 insertions(+), 21 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 1faf13831ebd..5d65fd083357 100644
+--- a/NEWS
++++ b/NEWS
+@@ -2,6 +2,10 @@ PHP                                                                        NEWS
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+ ?? ??? 2018, PHP 7.2.5
+ 
++- Core:
++  . Fixed bug #75722 (Convert valgrind detection to configure option).
++    (Michael Heimpold)
++
+ - Mbstring:
+   . Fixed bug #75944 (Wrong cp1251 detection). (dmk001)
+   . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1).
+diff --git a/acinclude.m4 b/acinclude.m4
+index d42d70853515..eb06cb7e363f 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -3249,23 +3249,3 @@ AC_DEFUN([PHP_CHECK_BUILTIN_SSUBLL_OVERFLOW], [
+ 
+ dnl Load the AX_CHECK_COMPILE_FLAG macro from the autoconf archive.
+ m4_include([build/ax_check_compile_flag.m4])
+-
+-dnl PHP_CHECK_VALGRIND
+-AC_DEFUN([PHP_CHECK_VALGRIND], [
+-  AC_MSG_CHECKING([for valgrind])
+-
+-  SEARCH_PATH="/usr/local /usr"
+-  SEARCH_FOR="/include/valgrind/valgrind.h"
+-  for i in $SEARCH_PATH ; do
+-    if test -r $i/$SEARCH_FOR; then
+-      VALGRIND_DIR=$i
+-    fi
+-  done
+-
+-  if test -z "$VALGRIND_DIR"; then
+-    AC_MSG_RESULT([not found])
+-  else
+-    AC_MSG_RESULT(found in $VALGRIND_DIR)
+-    AC_DEFINE(HAVE_VALGRIND, 1, [ ])
+-  fi
+-])
+diff --git a/configure.ac b/configure.ac
+index 05f94f08a9c8..c5d9be978bda 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -753,7 +753,35 @@ if test "x$php_crypt_r" = "x1"; then
+   PHP_CRYPT_R_STYLE
+ fi
+ 
+-PHP_CHECK_VALGRIND
++dnl Check valgrind support
++PHP_ARG_WITH(valgrind, [whether to enable valgrind support],
++[  --with-valgrind=DIR     Enable valgrind support], yes, no)
++
++if test "$PHP_VALGRIND" != "no"; then
++
++  AC_MSG_CHECKING([for valgrind header])
++
++  if test "$PHP_VALGRIND" = "yes"; then
++    SEARCH_PATH="/usr/local /usr"
++  else
++    SEARCH_PATH="$PHP_VALGRIND"
++  fi
++
++  SEARCH_FOR="/include/valgrind/valgrind.h"
++  for i in $SEARCH_PATH ; do
++    if test -r $i/$SEARCH_FOR; then
++      VALGRIND_DIR=$i
++    fi
++  done
++
++  if test -z "$VALGRIND_DIR"; then
++    AC_MSG_RESULT([not found])
++  else
++    AC_MSG_RESULT(found in $VALGRIND_DIR)
++    AC_DEFINE(HAVE_VALGRIND, 1, [ ])
++  fi
++
++fi
+ 
+ dnl General settings.
+ dnl -------------------------------------------------------------------------
\ No newline at end of file
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 3/4] php: actually enable openssl
  2018-07-03  9:20 [PATCH 1/4] phoronix-test-suite: upgrade to 8.0.1 Ross Burton
  2018-07-03  9:20 ` [PATCH 2/4] php: disable non-deterministic valgrind Ross Burton
@ 2018-07-03  9:20 ` Ross Burton
  2018-07-03 21:17   ` Khem Raj
  2018-07-03  9:20 ` [PATCH 4/4] p7zip: simplify recipe Ross Burton
  2 siblings, 1 reply; 8+ messages in thread
From: Ross Burton @ 2018-07-03  9:20 UTC (permalink / raw)
  To: openembedded-devel

The PHP recipe depends on OpenSSL but support is disabled unless you pass
--with-openssl.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 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 f262d60d15..258b20e68c 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -57,7 +57,7 @@ EXTRA_OECONF = "--enable-mbstring \
                 --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)} \
                 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \
-                ${COMMON_EXTRA_OECONF} \
+                ${COMMON_EXTRA_OECONF} --with-openssl \
 "
 
 CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes"
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 4/4] p7zip: simplify recipe
  2018-07-03  9:20 [PATCH 1/4] phoronix-test-suite: upgrade to 8.0.1 Ross Burton
  2018-07-03  9:20 ` [PATCH 2/4] php: disable non-deterministic valgrind Ross Burton
  2018-07-03  9:20 ` [PATCH 3/4] php: actually enable openssl Ross Burton
@ 2018-07-03  9:20 ` Ross Burton
  2 siblings, 0 replies; 8+ messages in thread
From: Ross Burton @ 2018-07-03  9:20 UTC (permalink / raw)
  To: openembedded-devel

The plugin-based 7z binary is mostly useless because it can't find the
libraries.  Simply just install 7za, and install a compatibility symlink for 7z.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-oe/recipes-extended/p7zip/p7zip_16.02.bb | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
index d986da9043..13479a90fe 100644
--- a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
+++ b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
@@ -17,26 +17,9 @@ SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6
 S = "${WORKDIR}/${BPN}_${PV}"
 
 do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 ${S}/bin/* ${D}${bindir}
-}
-
-# all3: to build bin/7za, bin/7z (with its plugins), bin/7zr and bin/7zCon.sfx
-EXTRA_OEMAKE_class-native = "all3"
-
-do_install_class-native() {
-    install -d ${D}${bindir}
-    install -d ${D}${bindir}/Codecs
-    install -m 0755 ${S}/bin/7* ${D}${bindir}
-    install -m 0755 ${S}/bin/Codecs/* ${D}${bindir}/Codecs
-
-    # Create a shell script wrapper to execute next to 7z.so
-    mv ${D}${bindir}/7z ${D}${bindir}/7z.bin
-    cat > ${D}${bindir}/7z << 'EOF'
-#!/bin/sh
-exec "$(dirname "$0")"/7z.bin "$@"
-EOF
-    chmod 0755 ${D}${bindir}/7z
+	install -d ${D}${bindir}
+	install -m 0755 ${S}/bin/* ${D}${bindir}
+	ln -s 7za ${D}${bindir}/7z
 }
 
 BBCLASSEXTEND = "native"
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/4] php: actually enable openssl
  2018-07-03  9:20 ` [PATCH 3/4] php: actually enable openssl Ross Burton
@ 2018-07-03 21:17   ` Khem Raj
  2018-09-04 21:13     ` Andre McCurdy
  0 siblings, 1 reply; 8+ messages in thread
From: Khem Raj @ 2018-07-03 21:17 UTC (permalink / raw)
  To: openembedded-devel


[-- Attachment #1.1: Type: text/plain, Size: 1203 bytes --]

On 7/3/18 2:20 AM, Ross Burton wrote:
> The PHP recipe depends on OpenSSL but support is disabled unless you pass
> --with-openssl.

perhaps its better to turn it into a PACKAGECONFIG option while you are
at it

> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  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 f262d60d15..258b20e68c 100644
> --- a/meta-oe/recipes-devtools/php/php.inc
> +++ b/meta-oe/recipes-devtools/php/php.inc
> @@ -57,7 +57,7 @@ EXTRA_OECONF = "--enable-mbstring \
>                  --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)} \
>                  ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \
> -                ${COMMON_EXTRA_OECONF} \
> +                ${COMMON_EXTRA_OECONF} --with-openssl \
>  "
>  
>  CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes"
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/4] php: disable non-deterministic valgrind
  2018-07-03  9:20 ` [PATCH 2/4] php: disable non-deterministic valgrind Ross Burton
@ 2018-07-04 13:08   ` Khem Raj
  0 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2018-07-04 13:08 UTC (permalink / raw)
  To: Burton, Ross; +Cc: openembeded-devel

On Tue, Jul 3, 2018 at 2:42 AM Ross Burton <ross.burton@intel.com> wrote:
>
> Valgrind support in PHP looks on the host for Valgrind headers, backport a patch
> from upstream so that Valgrind support is disabled by default.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta-oe/recipes-devtools/php/php.inc            |   1 +
>  meta-oe/recipes-devtools/php/php/valgrind.patch | 115 ++++++++++++++++++++++++
>  2 files changed, 116 insertions(+)
>  create mode 100644 meta-oe/recipes-devtools/php/php/valgrind.patch
>

Fails to apply

Applying patch valgrind.patch
patching file NEWS
Hunk #1 succeeded at 133 with fuzz 2 (offset 131 lines).
patching file acinclude.m4
Hunk #1 FAILED at 3249.
1 out of 1 hunk FAILED -- rejects in file acinclude.m4
patching file configure.ac
patch unexpectedly ends in middle of line
Hunk #1 FAILED at 753.
1 out of 1 hunk FAILED -- rejects in file configure.ac
Patch valgrind.patch does not apply (enforce with -f)



> diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
> index 066b97cd26..f262d60d15 100644
> --- a/meta-oe/recipes-devtools/php/php.inc
> +++ b/meta-oe/recipes-devtools/php/php.inc
> @@ -24,6 +24,7 @@ SRC_URI_append_class-target = " \
>              file://0001-acinclude.m4-don-t-unset-cache-variables.patch \
>              file://70_mod_php${PHP_MAJOR_VERSION}.conf \
>              file://php-fpm.service \
> +            file://valgrind.patch \
>            "
>  S = "${WORKDIR}/php-${PV}"
>
> diff --git a/meta-oe/recipes-devtools/php/php/valgrind.patch b/meta-oe/recipes-devtools/php/php/valgrind.patch
> new file mode 100644
> index 0000000000..c3e232ba23
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/php/php/valgrind.patch
> @@ -0,0 +1,115 @@
> +Upstream-Status: Backport
> +Signed-off-by: Ross Burton <ross.burton@intel.com>
> +
> +From 25ba60b1479eb332a7388732f3ee5467000fbe73 Mon Sep 17 00:00:00 2001
> +From: Michael Heimpold <mhei@heimpold.de>
> +Date: Wed, 14 Feb 2018 14:46:17 +0100
> +Subject: [PATCH] Fixed bug #75722: Rework valgrind detection
> +
> +As described in bug report #75722, the configure script (acinclude.m4)
> +currently searches for the valgrind header file and enables valgrind
> +support if found.
> +
> +When cross-compiling the searched paths are invalid for the target
> +platform because they belong to the host system. At the moment, there is
> +no way to tell the build system a dedicated path where to look for the
> +header file.
> +
> +This leads to the issue, that when cross-compiling eg. for ARMv5 platform,
> +that valgrind header file is detected - e.g. because host system is amd64 -
> +and support is enabled - but target platform will never support valgrind
> +(valgrind requires e.g. at least ARMv7).
> +
> +This change reworks the detection so that user could manually opt-in
> +valgrind support and optionally specify a directory where the build system
> +should look for the header file using the --with-valgrind option.
> +---
> + NEWS         |  4 ++++
> + acinclude.m4 | 20 --------------------
> + configure.ac | 30 +++++++++++++++++++++++++++++-
> + 3 files changed, 33 insertions(+), 21 deletions(-)
> +
> +diff --git a/NEWS b/NEWS
> +index 1faf13831ebd..5d65fd083357 100644
> +--- a/NEWS
> ++++ b/NEWS
> +@@ -2,6 +2,10 @@ PHP                                                                        NEWS
> + |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
> + ?? ??? 2018, PHP 7.2.5
> +
> ++- Core:
> ++  . Fixed bug #75722 (Convert valgrind detection to configure option).
> ++    (Michael Heimpold)
> ++
> + - Mbstring:
> +   . Fixed bug #75944 (Wrong cp1251 detection). (dmk001)
> +   . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1).
> +diff --git a/acinclude.m4 b/acinclude.m4
> +index d42d70853515..eb06cb7e363f 100644
> +--- a/acinclude.m4
> ++++ b/acinclude.m4
> +@@ -3249,23 +3249,3 @@ AC_DEFUN([PHP_CHECK_BUILTIN_SSUBLL_OVERFLOW], [
> +
> + dnl Load the AX_CHECK_COMPILE_FLAG macro from the autoconf archive.
> + m4_include([build/ax_check_compile_flag.m4])
> +-
> +-dnl PHP_CHECK_VALGRIND
> +-AC_DEFUN([PHP_CHECK_VALGRIND], [
> +-  AC_MSG_CHECKING([for valgrind])
> +-
> +-  SEARCH_PATH="/usr/local /usr"
> +-  SEARCH_FOR="/include/valgrind/valgrind.h"
> +-  for i in $SEARCH_PATH ; do
> +-    if test -r $i/$SEARCH_FOR; then
> +-      VALGRIND_DIR=$i
> +-    fi
> +-  done
> +-
> +-  if test -z "$VALGRIND_DIR"; then
> +-    AC_MSG_RESULT([not found])
> +-  else
> +-    AC_MSG_RESULT(found in $VALGRIND_DIR)
> +-    AC_DEFINE(HAVE_VALGRIND, 1, [ ])
> +-  fi
> +-])
> +diff --git a/configure.ac b/configure.ac
> +index 05f94f08a9c8..c5d9be978bda 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -753,7 +753,35 @@ if test "x$php_crypt_r" = "x1"; then
> +   PHP_CRYPT_R_STYLE
> + fi
> +
> +-PHP_CHECK_VALGRIND
> ++dnl Check valgrind support
> ++PHP_ARG_WITH(valgrind, [whether to enable valgrind support],
> ++[  --with-valgrind=DIR     Enable valgrind support], yes, no)
> ++
> ++if test "$PHP_VALGRIND" != "no"; then
> ++
> ++  AC_MSG_CHECKING([for valgrind header])
> ++
> ++  if test "$PHP_VALGRIND" = "yes"; then
> ++    SEARCH_PATH="/usr/local /usr"
> ++  else
> ++    SEARCH_PATH="$PHP_VALGRIND"
> ++  fi
> ++
> ++  SEARCH_FOR="/include/valgrind/valgrind.h"
> ++  for i in $SEARCH_PATH ; do
> ++    if test -r $i/$SEARCH_FOR; then
> ++      VALGRIND_DIR=$i
> ++    fi
> ++  done
> ++
> ++  if test -z "$VALGRIND_DIR"; then
> ++    AC_MSG_RESULT([not found])
> ++  else
> ++    AC_MSG_RESULT(found in $VALGRIND_DIR)
> ++    AC_DEFINE(HAVE_VALGRIND, 1, [ ])
> ++  fi
> ++
> ++fi
> +
> + dnl General settings.
> + dnl -------------------------------------------------------------------------
> \ No newline at end of file
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/4] php: actually enable openssl
  2018-07-03 21:17   ` Khem Raj
@ 2018-09-04 21:13     ` Andre McCurdy
  2018-09-04 23:52       ` Khem Raj
  0 siblings, 1 reply; 8+ messages in thread
From: Andre McCurdy @ 2018-09-04 21:13 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel

On Tue, Jul 3, 2018 at 2:17 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On 7/3/18 2:20 AM, Ross Burton wrote:
>> The PHP recipe depends on OpenSSL but support is disabled unless you pass
>> --with-openssl.
>
> perhaps its better to turn it into a PACKAGECONFIG option while you are
> at it

It looks like both versions of this patch got merged... so there's
currently an unconditional --with-openssl in EXTRA_OECONF and a
PACKAGECONFIG option too.

>>
>> Signed-off-by: Ross Burton <ross.burton@intel.com>
>> ---
>>  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 f262d60d15..258b20e68c 100644
>> --- a/meta-oe/recipes-devtools/php/php.inc
>> +++ b/meta-oe/recipes-devtools/php/php.inc
>> @@ -57,7 +57,7 @@ EXTRA_OECONF = "--enable-mbstring \
>>                  --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)} \
>>                  ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \
>> -                ${COMMON_EXTRA_OECONF} \
>> +                ${COMMON_EXTRA_OECONF} --with-openssl \
>>  "
>>
>>  CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes"
>>
>
>
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/4] php: actually enable openssl
  2018-09-04 21:13     ` Andre McCurdy
@ 2018-09-04 23:52       ` Khem Raj
  0 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2018-09-04 23:52 UTC (permalink / raw)
  To: Andre McCurdy; +Cc: openembeded-devel

On Tue, Sep 4, 2018 at 2:13 PM Andre McCurdy <armccurdy@gmail.com> wrote:
>
> On Tue, Jul 3, 2018 at 2:17 PM, Khem Raj <raj.khem@gmail.com> wrote:
> > On 7/3/18 2:20 AM, Ross Burton wrote:
> >> The PHP recipe depends on OpenSSL but support is disabled unless you pass
> >> --with-openssl.
> >
> > perhaps its better to turn it into a PACKAGECONFIG option while you are
> > at it
>
> It looks like both versions of this patch got merged... so there's
> currently an unconditional --with-openssl in EXTRA_OECONF and a
> PACKAGECONFIG option too.

yikes. got lost in v1 and v2, thanks for pointing out. I have reverted it
in kraj/master

>
> >>
> >> Signed-off-by: Ross Burton <ross.burton@intel.com>
> >> ---
> >>  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 f262d60d15..258b20e68c 100644
> >> --- a/meta-oe/recipes-devtools/php/php.inc
> >> +++ b/meta-oe/recipes-devtools/php/php.inc
> >> @@ -57,7 +57,7 @@ EXTRA_OECONF = "--enable-mbstring \
> >>                  --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)} \
> >>                  ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \
> >> -                ${COMMON_EXTRA_OECONF} \
> >> +                ${COMMON_EXTRA_OECONF} --with-openssl \
> >>  "
> >>
> >>  CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes"
> >>
> >
> >
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2018-09-04 23:52 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-03  9:20 [PATCH 1/4] phoronix-test-suite: upgrade to 8.0.1 Ross Burton
2018-07-03  9:20 ` [PATCH 2/4] php: disable non-deterministic valgrind Ross Burton
2018-07-04 13:08   ` Khem Raj
2018-07-03  9:20 ` [PATCH 3/4] php: actually enable openssl Ross Burton
2018-07-03 21:17   ` Khem Raj
2018-09-04 21:13     ` Andre McCurdy
2018-09-04 23:52       ` Khem Raj
2018-07-03  9:20 ` [PATCH 4/4] p7zip: simplify recipe Ross Burton

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.