projects
/
m6w6
/
travis-pecl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
dfce343
)
build ext in CURDIR
author
Michael Wallner
<mike@php.net>
Fri, 22 Jan 2016 12:59:32 +0000
(13:59 +0100)
committer
Michael Wallner
<mike@php.net>
Fri, 22 Jan 2016 12:59:32 +0000
(13:59 +0100)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 6d3c70b860e7159115ec0d68dab3d386c2d5b607..19584a01103efaa2c9ec7e9c1388d66c59b2eb87 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-26,6
+26,7
@@
PECL_EXTENSION ?= $(shell echo $(PECL) | cut -d: -f1)
PECL_SONAME ?= $(if $(shell echo $(PECL) | cut -d: -f2),$(shell echo $(PECL) | cut -d: -f2),$(PECL_EXTENSION))
PECL_VERSION ?= $(shell echo $(PECL) | cut -d: -f3 -s)
PECL_INI = $(with_config_file_scan_dir)/pecl.ini
PECL_SONAME ?= $(if $(shell echo $(PECL) | cut -d: -f2),$(shell echo $(PECL) | cut -d: -f2),$(PECL_EXTENSION))
PECL_VERSION ?= $(shell echo $(PECL) | cut -d: -f3 -s)
PECL_INI = $(with_config_file_scan_dir)/pecl.ini
+PECL_DIR ?= $(srcdir)/pecl-$(PECL_EXTENSION)
PHP_VERSION_MAJOR = $(firstword $(subst ., ,$(PHP)))
PHP_VERSIONS_JSON = $(srcdir)/php-versions$(PHP_VERSION_MAJOR).json
PHP_VERSION_MAJOR = $(firstword $(subst ., ,$(PHP)))
PHP_VERSIONS_JSON = $(srcdir)/php-versions$(PHP_VERSION_MAJOR).json
@@
-83,7
+84,7
@@
pecl-check:
.PHONY: pecl-clean
pecl-clean:
.PHONY: pecl-clean
pecl-clean:
- @if test -d $(
srcdir)/pecl-$(PECL_EXTENSION); then cd $(srcdir)/pecl-$(PECL_EXTENSION
); make distclean || true; fi
+ @if test -d $(
PECL_DIR); then cd $(PECL_DIR
); make distclean || true; fi
.PHONY: pecl-rm
pecl-rm:
.PHONY: pecl-rm
pecl-rm:
@@
-92,24
+93,21
@@
pecl-rm:
$(PECL_INI): | $(with_config_file_scan_dir)
touch $@
$(PECL_INI): | $(with_config_file_scan_dir)
touch $@
-$(srcdir)/pecl-$(PECL_EXTENSION):
- test -e $@ || ln -s $(CURDIR) $@
+$(PECL_DIR)/config.m4:
+ mkdir -p $(PECL_DIR)
+ curl -Ss $(PECL_MIRROR)/$(PECL_EXTENSION)$(if $(PECL_VERSION),/$(PECL_VERSION)) | tar xz --strip-components 1 -C $(PECL_DIR)
-$(srcdir)/pecl-$(PECL_EXTENSION)/config.m4:
- mkdir -p $(srcdir)/pecl-$(PECL_EXTENSION)
- curl -Ss $(PECL_MIRROR)/$(PECL_EXTENSION)$(if $(PECL_VERSION),/$(PECL_VERSION)) | tar xz --strip-components 1 -C $(srcdir)/pecl-$(PECL_EXTENSION)
+$(PECL_DIR)/configure: $(PECL_DIR)/config.m4
+ cd $(PECL_DIR) && $(bindir)/phpize
-$(
srcdir)/pecl-$(PECL_EXTENSION)/configure: $(srcdir)/pecl-$(PECL_EXTENSION)/config.m4
- cd $(
srcdir)/pecl-$(PECL_EXTENSION) && $(bindir)/phpize
+$(
PECL_DIR)/Makefile: $(PECL_DIR)/configure
+ cd $(
PECL_DIR) && ./configure -C
-$(
srcdir)/pecl-$(PECL_EXTENSION)/Makefile: $(srcdir)/pecl-$(PECL_EXTENSION)/configur
e
- cd $(
srcdir)/pecl-$(PECL_EXTENSION) && ./configure -C
+$(
PECL_DIR)/.libs/$(PECL_SONAME).so: $(PECL_DIR)/Makefil
e
+ cd $(
PECL_DIR) && make -j $(JOBS) || make
-$(srcdir)/pecl-$(PECL_EXTENSION)/.libs/$(PECL_SONAME).so: $(srcdir)/pecl-$(PECL_EXTENSION)/Makefile
- cd $(srcdir)/pecl-$(PECL_EXTENSION) && make -j $(JOBS) || make
-
-$(extdir)/$(PECL_SONAME).so: $(srcdir)/pecl-$(PECL_EXTENSION)/.libs/$(PECL_SONAME).so
- cd $(srcdir)/pecl-$(PECL_EXTENSION) && make install
+$(extdir)/$(PECL_SONAME).so: $(PECL_DIR)/.libs/$(PECL_SONAME).so
+ cd $(PECL_DIR) && make install
.PHONY: pecl
pecl: pecl-check php $(extdir)/$(PECL_SONAME).so | $(PECL_INI)
.PHONY: pecl
pecl: pecl-check php $(extdir)/$(PECL_SONAME).so | $(PECL_INI)
@@
-119,13
+117,16
@@
pecl: pecl-check php $(extdir)/$(PECL_SONAME).so | $(PECL_INI)
ext-clean: pecl-clean
.PHONY: ext-rm
ext-clean: pecl-clean
.PHONY: ext-rm
+ext-rm: PECL_DIR:=$(CURDIR)
ext-rm: pecl-rm
.PHONY: ext
ext-rm: pecl-rm
.PHONY: ext
-ext: pecl-check $(srcdir)/pecl-$(PECL_EXTENSION) pecl
+ext: PECL_DIR:=$(CURDIR)
+ext: pecl-check pecl
$(srcdir)/check-packagexml.php package.xml
.PHONY: php
$(srcdir)/check-packagexml.php package.xml
.PHONY: php
+test: PECL_DIR:=$(CURDIR)
test: php
REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff tests
test: php
REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff tests