--- .../0001-Fix-dl-cross-compiling-issue.patch | 80 ++++++++++++++++++++++ patches/php-5.6.31/autogen.sh | 12 ++++ patches/php-5.6.31/series | 5 ++ rules/php5.make | 13 ++-- 4 files changed, 104 insertions(+), 6 deletions(-) create mode 100644 patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.patch create mode 100755 patches/php-5.6.31/autogen.sh create mode 100755 patches/php-5.6.31/series diff --git a/patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.patch b/patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.patch new file mode 100644 index 000000000..83cf48529 --- /dev/null +++ b/patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.patch @@ -0,0 +1,80 @@ +From 28826829da147d93918bb9a7e5c7a28429bf04eb Mon Sep 17 00:00:00 2001 +From: Thorsten Liepert > +Date: Mon, 25 Sep 2017 16:46:45 +0200 +Subject: [PATCH] Fix dl cross compiling issue + +ATTN: After patching rerun autogen.sh to regenerate configure +--- + configure.in | 5 ++++- + ext/fileinfo/config.m4 | 4 ++++ + ext/opcache/config.m4 | 16 ++++++++++++++-- + 3 files changed, 22 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index 3f4a5d5c5517..06200cccd77b 100644 +--- a/configure.in ++++ b/configure.in +@@ -453,7 +453,10 @@ PHP_CHECK_FUNC(gethostname, nsl) + PHP_CHECK_FUNC(gethostbyaddr, nsl) + PHP_CHECK_FUNC(yp_get_default_domain, nsl) + +-PHP_CHECK_FUNC(dlopen, dl) ++PHP_ADD_LIBRARY(dl) ++PHP_DEF_HAVE(dlopen) ++PHP_DEF_HAVE(libdl) ++ac_cv_func_dlopen=yes + if test "$ac_cv_func_dlopen" = "yes"; then + AC_DEFINE(HAVE_LIBDL, 1, [ ]) + fi +diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 +index 7e98d62d8b2e..c033e26b4c89 100644 +--- a/ext/fileinfo/config.m4 ++++ b/ext/fileinfo/config.m4 +@@ -46,6 +46,10 @@ int main(void) + AC_MSG_RESULT(no) + AC_MSG_NOTICE(using libmagic strcasestr implementation) + libmagic_sources="$libmagic_sources libmagic/strcasestr.c" ++ ],[ ++ dnl cross-compiling; assume not present ++ 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) +diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 +index 5a8b86c14884..a83330fdbdc1 100644 +--- a/ext/opcache/config.m4 ++++ b/ext/opcache/config.m4 +@@ -341,7 +341,14 @@ AC_TRY_RUN([ + flock_type=linux + AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) + AC_MSG_RESULT("yes") +-], AC_MSG_RESULT("no") ) ++], [ ++ AC_MSG_RESULT("no") ++], [ ++ dnl cross-compiling; assume Linux ++ flock_type=linux ++ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) ++ AC_MSG_RESULT("yes") ++]) + + AC_MSG_CHECKING("whether flock struct is BSD ordered") + AC_TRY_RUN([ +@@ -357,7 +364,12 @@ AC_TRY_RUN([ + flock_type=bsd + AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) + AC_MSG_RESULT("yes") +-], AC_MSG_RESULT("no") ) ++], [ ++ AC_MSG_RESULT("no") ++], [ ++ dnl cross-compiling; assume Linux ++ AC_MSG_RESULT("no") ++]) + + if test "$flock_type" = "unknown"; then + AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) +-- +2.14.1 + diff --git a/patches/php-5.6.31/autogen.sh b/patches/php-5.6.31/autogen.sh new file mode 100755 index 000000000..f146de5ee --- /dev/null +++ b/patches/php-5.6.31/autogen.sh @@ -0,0 +1,12 @@ +#!/bin/bash +aclocal $ACLOCAL_FLAGS +libtoolize \ +--force \ +--copy +autoreconf \ +--force \ +--install \ +--warnings=cross \ +--warnings=syntax \ +--warnings=obsolete \ +--warnings=unsupported diff --git a/patches/php-5.6.31/series b/patches/php-5.6.31/series new file mode 100755 index 000000000..6578e212b --- /dev/null +++ b/patches/php-5.6.31/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +#tag:debian --start-number 1 +0001-Fix-dl-cross-compiling-issue.patch +# 47bad7181a14104ba3ccd05bdf62ba7e - git-ptx-patches magic diff --git a/rules/php5.make b/rules/php5.make index cc9dc8e10..8525ec777 100644 --- a/rules/php5.make +++ b/rules/php5.make @@ -18,12 +18,13 @@ PACKAGES-$(PTXCONF_PHP5) += php5 # # Paths and names # -PHP5_VERSION := 5.5.30 -PHP5_MD5 := ef6d848756ea9d19b7a7e1a9d824d7c1 -PHP5 := php-$(PHP5_VERSION) -PHP5_SUFFIX := tar.xz -PHP5_SOURCE := $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX) -PHP5_DIR := $(BUILDDIR)/$(PHP5) +PHP5_VERSION := 5.6.31 +PHP5_MD5 := b3e6f548a7a47e9917279d50889b9a4a +PHP5 := php-$(PHP5_VERSION) +PHP5_SUFFIX := tar.xz +PHP5_SOURCE := $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX) +PHP5_DIR := $(BUILDDIR)/$(PHP5) +PHP5_LICENSE := PHP License # # Note: older releases are moved to the 'museum', but the 'de.php.net' -- 2.14.2 Thorsten Liepert Development Software Phone +49 911 97479 839 | thorsten.liepert@diehl.com Diehl Connectivity Solutions GmbH Stephanstraße 49 90478 Nürnberg Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu Bereichsvorstand: Dr.-Ing. Michael Siedentop (Sprecher), Josef Fellner (Mitglied) Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 – Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier ___________________________________________________________________________________________________ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.