mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-08-24 14:51:52 +00:00
4deb828fff
One patch was a backport and can be dropped, add Upstream-status to the others. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 lines
685 B
Diff
19 lines
685 B
Diff
Upstream-status: Unknown
|
|
|
|
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)/"
|
|
--
|
|
1.9.3
|
|
|