mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-04 23:26:11 +00:00
2768c1deb3
* 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 <anuj.mittal@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
23 lines
953 B
Diff
23 lines
953 B
Diff
From edd575a546d56bb5683aff19782b16963d61fd0b Mon Sep 17 00:00:00 2001
|
|
From: Koen Kooi <koen@dominion.thruhere.net>
|
|
Date: Wed, 2 Nov 2011 16:54:57 +0100
|
|
Subject: [PATCH] Upstream-status: Unknown
|
|
|
|
---
|
|
pear/Makefile.frag | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/pear/Makefile.frag b/pear/Makefile.frag
|
|
index bbe8ec3..16f43e2 100644
|
|
--- a/pear/Makefile.frag
|
|
+++ b/pear/Makefile.frag
|
|
@@ -12,7 +12,7 @@ PEAR_SUFFIX = -ds a$(program_suffix)
|
|
PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
|
|
|
|
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)/"
|