mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-23 18:26:34 +00:00
Paul Eggleton
4aafeeecef
Fix several issues with how the phar package is installed and packaged: * The symlink was pointing to an absolute path on the host, which naturally does not work on the target * The script itself had a shebang pointing to a path on the host * A file-rdeps warning was occurring due to rpmdeps detecting that the script requires the php binary; in order to prevent the main php package depending on php-cli which provides the php binary, move the phar script to its own package (I suspect most people won't need it anyway). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
45 lines
2.0 KiB
Diff
45 lines
2.0 KiB
Diff
Fix phar packaging
|
|
|
|
Inherited from OE-Classic, with some additions to fix host paths leaking
|
|
into the target package.
|
|
|
|
Upstream-Status: Inappropriate [config]
|
|
|
|
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
|
|
index 6516ddf..36e6cf4 100644
|
|
--- a/ext/phar/Makefile.frag
|
|
+++ b/ext/phar/Makefile.frag
|
|
@@ -5,20 +5,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
|
|
|
|
PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0'
|
|
PHP_PHARCMD_EXECUTABLE = ` \
|
|
- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
|
|
- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
|
|
- if test "x$(PHP_MODULES)" != "x"; then \
|
|
- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
|
|
- for i in bz2 zlib phar; do \
|
|
- if test -f "$(top_builddir)/modules/$$i.la"; then \
|
|
- . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
|
|
- fi; \
|
|
- done; \
|
|
- fi; \
|
|
- else \
|
|
- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
|
|
- fi;`
|
|
-PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
|
|
+ $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; `
|
|
+
|
|
+PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
|
|
|
|
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
|
|
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
|
|
@@ -39,7 +28,7 @@ install-pharcmd: pharcmd
|
|
-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
|
|
$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
|
|
-@rm -f $(INSTALL_ROOT)$(bindir)/phar
|
|
- $(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
|
|
+ $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
|
|
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
|
|
@$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1
|
|
@$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1
|