jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 05:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/php: bump version to 7.3.0

Browse Source 
Other changes:

 - Update patches so they cleanly apply.

 - Remove patch 5, as it no longer applies.

 - Remove conf env option ac_cv_func_strcasestr=yes because of the
   above.

 - libzip is no longer bundled with php, because of this, libzip must
   now be selected and depended on if the zip extension is selected.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Adam Duskett 2018-12-27 12:49:03 -05:00 committed by Thomas Petazzoni
parent 24a13885d6
commit cd6c2f41ef
9 changed files with 34 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/php/0001-acinclude.m4-don-t-unset-variables.patch
View File

@ -8,7 +8,7 @@ Terminate them with extreme prejudice.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Adam Duskett <aduskett@gmail.com>
[aduskett@gmail.com: Update for 7.2.2] [aduskett@gmail.com: Update for 7.3.0]
--- ---
acinclude.m4 | 4 ---- acinclude.m4 | 4 ----
1 file changed, 4 deletions(-) 1 file changed, 4 deletions(-)
@ -17,7 +17,7 @@ diff --git a/acinclude.m4 b/acinclude.m4
index 28506b6..af4aa06 100644 index 28506b6..af4aa06 100644
--- a/acinclude.m4 --- a/acinclude.m4
+++ b/acinclude.m4 +++ b/acinclude.m4
@@ -1890,8 +1890,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,])) @@ -1921,8 +1921,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,]))
dnl dnl
AC_DEFUN([PHP_CHECK_FUNC_LIB],[ AC_DEFUN([PHP_CHECK_FUNC_LIB],[
ifelse($2,,:,[ ifelse($2,,:,[
@ -26,7 +26,7 @@ index 28506b6..af4aa06 100644
unset found unset found
AC_CHECK_LIB($2, $1, [found=yes], [ AC_CHECK_LIB($2, $1, [found=yes], [
AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
@@ -1923,8 +1921,6 @@ dnl in the default libraries and as a fall back in the specified library. @@ -1954,8 +1952,6 @@ dnl in the default libraries and as a fall back in the specified library.
dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS. dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS.
dnl dnl
AC_DEFUN([PHP_CHECK_FUNC],[ AC_DEFUN([PHP_CHECK_FUNC],[

10
package/php/0002-iconv-tweak-iconv-detection.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
[Gustavo: convert to nice m4 instead of patching configure] [Gustavo: convert to nice m4 instead of patching configure]
[Gustavo: update for 5.6.10] [Gustavo: update for 5.6.10]
Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Adam Duskett <aduskett@gmail.com>
[aduskett@gmail.com: Update for 7.2.2] [aduskett@gmail.com: Update for 7.3.0]
--- ---
acinclude.m4 | 2 +- acinclude.m4 | 2 +-
ext/iconv/config.m4 | 22 ---------------------- ext/iconv/config.m4 | 22 ----------------------
@ -24,7 +24,7 @@ diff --git a/acinclude.m4 b/acinclude.m4
index af4aa06..1bd2652 100644 index af4aa06..1bd2652 100644
--- a/acinclude.m4 --- a/acinclude.m4
+++ b/acinclude.m4 +++ b/acinclude.m4
@@ -2463,7 +2463,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ @@ -2444,7 +2444,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
dnl dnl
if test "$found_iconv" = "no"; then if test "$found_iconv" = "no"; then
@ -34,10 +34,10 @@ index af4aa06..1bd2652 100644
AC_DEFINE(HAVE_GICONV_H, 1, [ ]) AC_DEFINE(HAVE_GICONV_H, 1, [ ])
ICONV_DIR=$i ICONV_DIR=$i
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index 6a05697..694fcb8 100644 index 72334f79..29c358ad 100644
--- a/ext/iconv/config.m4 --- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4 +++ b/ext/iconv/config.m4
@@ -14,28 +14,6 @@ if test "$PHP_ICONV" != "no"; then @@ -12,28 +12,6 @@ if test "$PHP_ICONV" != "no"; then
]) ])
if test "$iconv_avail" != "no"; then if test "$iconv_avail" != "no"; then
@ -65,7 +65,7 @@ index 6a05697..694fcb8 100644
- fi - fi
AC_MSG_CHECKING([if iconv is glibc's]) AC_MSG_CHECKING([if iconv is glibc's])
AC_TRY_LINK([#include <gnu/libc-version.h>],[gnu_get_libc_version();], AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnu/libc-version.h>]], [[gnu_get_libc_version();]])],[
-- --
2.7.4 2.7.4

4
package/php/0003-configure-disable-the-phar-tool.patch
View File

@ -11,7 +11,7 @@ on the target.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
[Gustavo: update for autoreconf/configure.in] [Gustavo: update for autoreconf/configure.in]
Signed-off-by: Adam Duskett <Adamduskett@outlook.com> Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
[Aduskett: update for 7.2.2] [Aduskett: update for 7.3.0]
--- ---
configure.ac | 9 ++------- configure.ac | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-) 1 file changed, 2 insertions(+), 7 deletions(-)
@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
index d20af76..7f02f1a 100644 index d20af76..7f02f1a 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1420,13 +1420,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" @@ -1472,13 +1472,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"

18
package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch
View File

@ -6,6 +6,8 @@ Subject: [PATCH] OPcache: flock mechanism is obviously linux so force it.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Bernd: update for 7.2.12] [Bernd: update for 7.2.12]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
[aduskett@gmail.com: Update for 7.3.0]
--- ---
ext/opcache/config.m4 | 34 ++-------------------------------- ext/opcache/config.m4 | 34 ++--------------------------------
1 file changed, 2 insertions(+), 32 deletions(-) 1 file changed, 2 insertions(+), 32 deletions(-)
@ -14,13 +16,13 @@ diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index fbb9b21..ffddc8e 100644 index fbb9b21..ffddc8e 100644
--- a/ext/opcache/config.m4 --- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4 +++ b/ext/opcache/config.m4
@@ -343,38 +343,8 @@ int main() { @@ -341,38 +341,8 @@ int main() {
msg=yes,msg=no,msg=no) msg=yes],[msg=no],[msg=no])
AC_MSG_RESULT([$msg]) AC_MSG_RESULT([$msg])
-flock_type=unknown -flock_type=unknown
-AC_MSG_CHECKING("whether flock struct is linux ordered") -AC_MSG_CHECKING("whether flock struct is linux ordered")
-AC_TRY_RUN([ -AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <fcntl.h> - #include <fcntl.h>
- struct flock lock = { 1, 2, 3, 4, 5 }; - struct flock lock = { 1, 2, 3, 4, 5 };
- int main() { - int main() {
@ -29,14 +31,14 @@ index fbb9b21..ffddc8e 100644
- } - }
- return 1; - return 1;
- } - }
-], [ -]])], [
- flock_type=linux - flock_type=linux
- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) - AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
- AC_MSG_RESULT("yes") - AC_MSG_RESULT("yes")
-], AC_MSG_RESULT("no") ) -], [AC_MSG_RESULT("no")], [AC_MSG_RESULT([no])])
- -
-AC_MSG_CHECKING("whether flock struct is BSD ordered") -AC_MSG_CHECKING("whether flock struct is BSD ordered")
-AC_TRY_RUN([ -AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <fcntl.h> - #include <fcntl.h>
- struct flock lock = { 1, 2, 3, 4, 5 }; - struct flock lock = { 1, 2, 3, 4, 5 };
- int main() { - int main() {
@ -45,11 +47,11 @@ index fbb9b21..ffddc8e 100644
- } - }
- return 1; - return 1;
- } - }
-], [ -]])], [
- flock_type=bsd - flock_type=bsd
- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) - AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
- AC_MSG_RESULT("yes") - AC_MSG_RESULT("yes")
-], AC_MSG_RESULT("no") ) -], [AC_MSG_RESULT("no")], [AC_MSG_RESULT([no])])
+flock_type=linux +flock_type=linux
+AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) +AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])

6
package/php/0006-Call-apxs-with-correct-prefix.patch → package/php/0005-Call-apxs-with-correct-prefix.patch
View File

@ -16,7 +16,7 @@ To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure
Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com> Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Adam Duskett <aduskett@gmail.com>
[aduskett@gmail.com: Update for 7.2.2] [aduskett@gmail.com: Update for 7.3.0]
--- ---
sapi/apache2handler/config.m4 | 3 +++ sapi/apache2handler/config.m4 | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
@ -25,7 +25,7 @@ diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index 2e64b21..f5bf002 100644 index 2e64b21..f5bf002 100644
--- a/sapi/apache2handler/config.m4 --- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4
@@ -66,10 +66,12 @@ if test "$PHP_APXS2" != "no"; then @@ -64,10 +64,12 @@ if test "$PHP_APXS2" != "no"; then
AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
fi fi
@ -38,7 +38,7 @@ index 2e64b21..f5bf002 100644
-i -n php7" -i -n php7"
else else
APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
@@ -77,6 +79,7 @@ if test "$PHP_APXS2" != "no"; then @@ -75,6 +77,7 @@ if test "$PHP_APXS2" != "no"; then
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \ -S SYSCONFDIR='$APXS_SYSCONFDIR' \

37
package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
View File

@ -1,37 +0,0 @@
From a874ba472151c6811018de322a5787d0ca6148c9 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 9 Aug 2016 11:52:51 +0200
Subject: [PATCH] ext/fileinfo/config.m4: allow cache answer for strcasestr
discovery
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
[aduskett@gmail.com: Update for 7.2.2]
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
ext/fileinfo/config.m4 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index 7e98d62..8561962 100644
--- a/ext/fileinfo/config.m4
+++ b/ext/fileinfo/config.m4
@@ -15,6 +15,7 @@ libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c"
AC_MSG_CHECKING([for strcasestr])
+ AC_CACHE_VAL(ac_cv_func_strcasestr,
AC_TRY_RUN([
#include <string.h>
#include <strings.h>
#include <stdlib.h>
@@ -46,7 +47,7 @@ int main(void)
AC_MSG_RESULT(no)
AC_MSG_NOTICE(using libmagic strcasestr implementation)
libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
- ])
+ ]))
PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
--
2.7.4

5
package/php/Config.ext
View File

@ -45,9 +45,14 @@ config BR2_PACKAGE_PHP_EXT_PHAR
help help
PHP Archive support PHP Archive support
comment "zip needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
config BR2_PACKAGE_PHP_EXT_ZIP config BR2_PACKAGE_PHP_EXT_ZIP
bool "zip" bool "zip"
depends on !BR2_STATIC_LIBS # libzip
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LIBZIP
help help
Zip read/write support Zip read/write support

2
package/php/php.hash
View File

@ -1,5 +1,5 @@
# From http://php.net/downloads.php # From http://php.net/downloads.php
sha256 14b0429abdb46b65c843e5882c9a8c46b31dfbf279c747293b8ab950c2644a4b php-7.2.13.tar.xz sha256 7d195cad55af8b288c3919c67023a14ff870a73e3acc2165a6d17a4850a560b5 php-7.3.0.tar.xz
# License file # License file
sha256 f689b8fa63bea7950ce6a21bf52ed88ea0d77673ee76e6de12f51191174d91b8 LICENSE sha256 f689b8fa63bea7950ce6a21bf52ed88ea0d77673ee76e6de12f51191174d91b8 LICENSE

7
package/php/php.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
PHP_VERSION = 7.2.13 PHP_VERSION = 7.3.0
PHP_SITE = http://www.php.net/distributions PHP_SITE = http://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES PHP_INSTALL_STAGING = YES
@ -22,7 +22,6 @@ PHP_CONF_OPTS = \
--disable-phpdbg \ --disable-phpdbg \
--disable-rpath --disable-rpath
PHP_CONF_ENV = \ PHP_CONF_ENV = \
ac_cv_func_strcasestr=yes \
EXTRA_LIBS="$(PHP_EXTRA_LIBS)" EXTRA_LIBS="$(PHP_EXTRA_LIBS)"
ifeq ($(BR2_STATIC_LIBS),y) ifeq ($(BR2_STATIC_LIBS),y)
@ -153,6 +152,10 @@ PHP_CONF_OPTS += \
PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
endif endif
ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y)
PHP_DEPENDENCIES += libzip
endif
ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),) ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),)
PHP_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr PHP_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += zlib PHP_DEPENDENCIES += zlib