| Message ID | 20191025182217.13682-2-nicolas.carrier@orolia.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v4,1/2] package: use variables defined by autoconf.mk | expand |
Hi Nicolas, Le 25/10/2019 à 20:22, Nicolas Carrier a écrit : > Extension for PHP to assist with debugging and development. > > Signed-off-by: Nicolas Carrier <nicolas.carrier@orolia.com> Reviewed-by: Romain Naour <romain.naour@smile.fr> Best regards, Romain > --- > > Changes v3 -> v4: > - add myself to the DEVELOPERS file > > Changes v2 -> v3: > - sorted correctly the new entry in the top level Config.in > - use the AUTOCONF and AUTOHEADER variables from automake.mk > > Changes v1 -> v2: > - move xdebug to php extensions submenu, with the following two consequences: > - makes it dependent on php > - makes it wrapped inside !STATIC test > - removed empty line in Config.in > - removed Web page: prefix in help string > - one option per line in PHP_XDEBUG_CONF_OPTS > - renamed to php-xdebug > - changed license to `Xdebug License (PHP-3.0-like)` > > --- > > DEVELOPERS | 3 +++ > package/Config.in | 1 + > package/php-xdebug/Config.in | 6 ++++++ > package/php-xdebug/php-xdebug.hash | 3 +++ > package/php-xdebug/php-xdebug.mk | 28 ++++++++++++++++++++++++++++ > 5 files changed, 41 insertions(+) > create mode 100644 package/php-xdebug/Config.in > create mode 100644 package/php-xdebug/php-xdebug.hash > create mode 100644 package/php-xdebug/php-xdebug.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index ec4f50a79e..322d7f59c7 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1724,6 +1724,9 @@ F: package/libevdev/ > N: Nicola Di Lieto <nicola.dilieto@gmail.com> > F: package/uacme/ > > +N: Nicolas Carrier <nicolas.carrier@orolia.com> > +F: package/php-xdebug/ > + > N: Nicolas Cavallari <nicolas.cavallari@green-communications.fr> > F: package/libgit2/ > > diff --git a/package/Config.in b/package/Config.in > index d78b4c444b..4f1b80a8e4 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -801,6 +801,7 @@ menu "External php extensions" > source "package/php-imagick/Config.in" > source "package/php-memcached/Config.in" > source "package/php-ssh2/Config.in" > + source "package/php-xdebug/Config.in" > source "package/php-yaml/Config.in" > source "package/php-zmq/Config.in" > endmenu > diff --git a/package/php-xdebug/Config.in b/package/php-xdebug/Config.in > new file mode 100644 > index 0000000000..b5919e06cd > --- /dev/null > +++ b/package/php-xdebug/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_PHP_XDEBUG > + bool "php-xdebug" > + help > + Extension for PHP to assist with debugging and development. > + > + http://xdebug.org > diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash > new file mode 100644 > index 0000000000..d645142efc > --- /dev/null > +++ b/package/php-xdebug/php-xdebug.hash > @@ -0,0 +1,3 @@ > +# Locally computed > +sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE > +sha256 b2aeb55335c5649034fe936abb90f61df175c4f0a0f0b97a219b3559541edfbd php-xdebug-2.7.2.tar.gz > diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk > new file mode 100644 > index 0000000000..a77bbeee90 > --- /dev/null > +++ b/package/php-xdebug/php-xdebug.mk > @@ -0,0 +1,28 @@ > +################################################################################ > +# > +# php-xdebug > +# > +################################################################################ > + > +PHP_XDEBUG_VERSION = 2.7.2 > +PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION)) > +PHP_XDEBUG_INSTALL_STAGING = YES > +PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like) > +PHP_XDEBUG_LICENSE_FILES = LICENSE > +# phpize does the autoconf magic > +PHP_XDEBUG_DEPENDENCIES = php host-autoconf > +PHP_XDEBUG_CONF_OPTS = \ > + --enable-xdebug \ > + --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ > + --with-xdebug=$(STAGING_DIR)/usr > + > +define PHP_XDEBUG_PHPIZE > + (cd $(@D); \ > + PHP_AUTOCONF=$(AUTOCONF) \ > + PHP_AUTOHEADER=$(AUTOHEADER) \ > + $(STAGING_DIR)/usr/bin/phpize) > +endef > + > +PHP_XDEBUG_PRE_CONFIGURE_HOOKS += PHP_XDEBUG_PHPIZE > + > +$(eval $(autotools-package)) >
Le 25/10/2019 à 21:14, Romain Naour a écrit : > Hi Nicolas, > > Le 25/10/2019 à 20:22, Nicolas Carrier a écrit : >> Extension for PHP to assist with debugging and development. >> >> Signed-off-by: Nicolas Carrier <nicolas.carrier@orolia.com> > > Reviewed-by: Romain Naour <romain.naour@smile.fr> > > Best regards, > Romain > >> --- >> >> Changes v3 -> v4: >> - add myself to the DEVELOPERS file >> >> Changes v2 -> v3: >> - sorted correctly the new entry in the top level Config.in >> - use the AUTOCONF and AUTOHEADER variables from automake.mk >> >> Changes v1 -> v2: >> - move xdebug to php extensions submenu, with the following two consequences: >> - makes it dependent on php >> - makes it wrapped inside !STATIC test >> - removed empty line in Config.in >> - removed Web page: prefix in help string >> - one option per line in PHP_XDEBUG_CONF_OPTS >> - renamed to php-xdebug >> - changed license to `Xdebug License (PHP-3.0-like)` >> >> --- >> >> DEVELOPERS | 3 +++ >> package/Config.in | 1 + >> package/php-xdebug/Config.in | 6 ++++++ >> package/php-xdebug/php-xdebug.hash | 3 +++ >> package/php-xdebug/php-xdebug.mk | 28 ++++++++++++++++++++++++++++ >> 5 files changed, 41 insertions(+) >> create mode 100644 package/php-xdebug/Config.in >> create mode 100644 package/php-xdebug/php-xdebug.hash >> create mode 100644 package/php-xdebug/php-xdebug.mk >> >> diff --git a/DEVELOPERS b/DEVELOPERS >> index ec4f50a79e..322d7f59c7 100644 >> --- a/DEVELOPERS >> +++ b/DEVELOPERS >> @@ -1724,6 +1724,9 @@ F: package/libevdev/ >> N: Nicola Di Lieto <nicola.dilieto@gmail.com> >> F: package/uacme/ >> >> +N: Nicolas Carrier <nicolas.carrier@orolia.com> >> +F: package/php-xdebug/ >> + >> N: Nicolas Cavallari <nicolas.cavallari@green-communications.fr> >> F: package/libgit2/ >> >> diff --git a/package/Config.in b/package/Config.in >> index d78b4c444b..4f1b80a8e4 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -801,6 +801,7 @@ menu "External php extensions" >> source "package/php-imagick/Config.in" >> source "package/php-memcached/Config.in" >> source "package/php-ssh2/Config.in" >> + source "package/php-xdebug/Config.in" >> source "package/php-yaml/Config.in" >> source "package/php-zmq/Config.in" >> endmenu >> diff --git a/package/php-xdebug/Config.in b/package/php-xdebug/Config.in >> new file mode 100644 >> index 0000000000..b5919e06cd >> --- /dev/null >> +++ b/package/php-xdebug/Config.in >> @@ -0,0 +1,6 @@ >> +config BR2_PACKAGE_PHP_XDEBUG >> + bool "php-xdebug" Other php modules add a dependency on php package here depends on BR2_PACKAGE_PHP even if all php modules are guarded by a if BR2_PACKAGE_PHP [1] For example, we don't add a depends on BR2_PACKAGE_PYTHON to python modules. So you're right it's not necessary to add the "depends on BR2_PACKAGE_PHP, maybe we should remove them. [1] https://git.buildroot.net/buildroot/tree/package/Config.in?id=0b056944f5878304f51af3e9edb6d596f24fc370#n559 Best regards, Romain >> + help >> + Extension for PHP to assist with debugging and development. >> + >> + http://xdebug.org >> diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash >> new file mode 100644 >> index 0000000000..d645142efc >> --- /dev/null >> +++ b/package/php-xdebug/php-xdebug.hash >> @@ -0,0 +1,3 @@ >> +# Locally computed >> +sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE >> +sha256 b2aeb55335c5649034fe936abb90f61df175c4f0a0f0b97a219b3559541edfbd php-xdebug-2.7.2.tar.gz >> diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk >> new file mode 100644 >> index 0000000000..a77bbeee90 >> --- /dev/null >> +++ b/package/php-xdebug/php-xdebug.mk >> @@ -0,0 +1,28 @@ >> +################################################################################ >> +# >> +# php-xdebug >> +# >> +################################################################################ >> + >> +PHP_XDEBUG_VERSION = 2.7.2 >> +PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION)) >> +PHP_XDEBUG_INSTALL_STAGING = YES >> +PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like) >> +PHP_XDEBUG_LICENSE_FILES = LICENSE >> +# phpize does the autoconf magic >> +PHP_XDEBUG_DEPENDENCIES = php host-autoconf >> +PHP_XDEBUG_CONF_OPTS = \ >> + --enable-xdebug \ >> + --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ >> + --with-xdebug=$(STAGING_DIR)/usr >> + >> +define PHP_XDEBUG_PHPIZE >> + (cd $(@D); \ >> + PHP_AUTOCONF=$(AUTOCONF) \ >> + PHP_AUTOHEADER=$(AUTOHEADER) \ >> + $(STAGING_DIR)/usr/bin/phpize) >> +endef >> + >> +PHP_XDEBUG_PRE_CONFIGURE_HOOKS += PHP_XDEBUG_PHPIZE >> + >> +$(eval $(autotools-package)) >> >
On Fri, 25 Oct 2019 18:22:49 +0000 Nicolas Carrier <nicolas.carrier@orolia.com> wrote: > Extension for PHP to assist with debugging and development. > > Signed-off-by: Nicolas Carrier <nicolas.carrier@orolia.com> > --- Thanks, I've finally applied! I updated to a newer version of php-xdebug to make it compatible with the newer version of PHP we have, and fixed a small issue caused by other changes in the autoconf variables in Buildroot. Thomas
diff --git a/DEVELOPERS b/DEVELOPERS index ec4f50a79e..322d7f59c7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1724,6 +1724,9 @@ F: package/libevdev/ N: Nicola Di Lieto <nicola.dilieto@gmail.com> F: package/uacme/ +N: Nicolas Carrier <nicolas.carrier@orolia.com> +F: package/php-xdebug/ + N: Nicolas Cavallari <nicolas.cavallari@green-communications.fr> F: package/libgit2/ diff --git a/package/Config.in b/package/Config.in index d78b4c444b..4f1b80a8e4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -801,6 +801,7 @@ menu "External php extensions" source "package/php-imagick/Config.in" source "package/php-memcached/Config.in" source "package/php-ssh2/Config.in" + source "package/php-xdebug/Config.in" source "package/php-yaml/Config.in" source "package/php-zmq/Config.in" endmenu diff --git a/package/php-xdebug/Config.in b/package/php-xdebug/Config.in new file mode 100644 index 0000000000..b5919e06cd --- /dev/null +++ b/package/php-xdebug/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PHP_XDEBUG + bool "php-xdebug" + help + Extension for PHP to assist with debugging and development. + + http://xdebug.org diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash new file mode 100644 index 0000000000..d645142efc --- /dev/null +++ b/package/php-xdebug/php-xdebug.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE +sha256 b2aeb55335c5649034fe936abb90f61df175c4f0a0f0b97a219b3559541edfbd php-xdebug-2.7.2.tar.gz diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk new file mode 100644 index 0000000000..a77bbeee90 --- /dev/null +++ b/package/php-xdebug/php-xdebug.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# php-xdebug +# +################################################################################ + +PHP_XDEBUG_VERSION = 2.7.2 +PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION)) +PHP_XDEBUG_INSTALL_STAGING = YES +PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like) +PHP_XDEBUG_LICENSE_FILES = LICENSE +# phpize does the autoconf magic +PHP_XDEBUG_DEPENDENCIES = php host-autoconf +PHP_XDEBUG_CONF_OPTS = \ + --enable-xdebug \ + --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ + --with-xdebug=$(STAGING_DIR)/usr + +define PHP_XDEBUG_PHPIZE + (cd $(@D); \ + PHP_AUTOCONF=$(AUTOCONF) \ + PHP_AUTOHEADER=$(AUTOHEADER) \ + $(STAGING_DIR)/usr/bin/phpize) +endef + +PHP_XDEBUG_PRE_CONFIGURE_HOOKS += PHP_XDEBUG_PHPIZE + +$(eval $(autotools-package))
Extension for PHP to assist with debugging and development. Signed-off-by: Nicolas Carrier <nicolas.carrier@orolia.com> --- Changes v3 -> v4: - add myself to the DEVELOPERS file Changes v2 -> v3: - sorted correctly the new entry in the top level Config.in - use the AUTOCONF and AUTOHEADER variables from automake.mk Changes v1 -> v2: - move xdebug to php extensions submenu, with the following two consequences: - makes it dependent on php - makes it wrapped inside !STATIC test - removed empty line in Config.in - removed Web page: prefix in help string - one option per line in PHP_XDEBUG_CONF_OPTS - renamed to php-xdebug - changed license to `Xdebug License (PHP-3.0-like)` --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/php-xdebug/Config.in | 6 ++++++ package/php-xdebug/php-xdebug.hash | 3 +++ package/php-xdebug/php-xdebug.mk | 28 ++++++++++++++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 package/php-xdebug/Config.in create mode 100644 package/php-xdebug/php-xdebug.hash create mode 100644 package/php-xdebug/php-xdebug.mk