summaryrefslogtreecommitdiffstats
path: root/package/php/php.mk
Commit message (Collapse)AuthorAgeFilesLines
...
* package/php: Always link with libpthread for static buildsBernd Kuhls2015-12-171-3/+4
| | | | | | | | | | | | | | | Fixes http://autobuild.buildroot.net/results/c9f/c9fb2b4a25817d6455472767819018a62281d5f9/ http://autobuild.buildroot.net/results/a75/a757edcfce00d3e52c6787f28dc31cbaf8d2d2ab/ http://autobuild.buildroot.net/results/8df/8df836b6c241954449544c7b4c74a1cb19e7ff7b/ http://autobuild.buildroot.net/results/1b6/1b6e571e307c2b190116601bade382c43e8d3858/ http://autobuild.buildroot.net/results/aa3/aa34b2326a0702093162eb1f9d7bdf9c7cf45311/ http://autobuild.buildroot.net/results/74a/74ae21d78f7ea9d71407accd3e43900af6766e68/ http://autobuild.buildroot.net/results/7ec/7ec28c23b3f12e5b7e2376c7913329d2a38dd232/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/php: bump version to 5.6.16Bernd Kuhls2015-11-281-1/+1
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: bump to version 5.6.15Gustavo Zacarias2015-10-311-1/+1
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* php: bump to version 5.6.14Gustavo Zacarias2015-10-021-1/+1
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/php: security bump to version 5.6.13Bernd Kuhls2015-09-061-1/+1
| | | | | | | | Link to release announcement: http://php.net/archive/2015.php#id2015-09-04-2 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/php: security bump to version 5.6.12Bernd Kuhls2015-08-101-1/+1
| | | | | | http://www.php.net/ChangeLog-5.php#5.6.12 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: remove redundant --static flag to pkg-configThomas De Schampheleire2015-07-261-2/+2
| | | | | | | | | | The pkg-config tool is automatically passing --static when BR2_STATIC_LIBS is set (see package/pkgconf/pkgconf.mk), so no need to pass it explicitly from package .mk files. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: use backtick instead of $(shell ...) make functionArnout Vandecappelle2015-07-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is often difficult to know exactly when make will expand the variable, and usually it can only be expanded after the dependencies have been built (e.g. pkg-config or the .pc file). Using a backtick instead makes it very clear that it will be expanded only while executing the command. This change is useful for two cases: 1. The per-package staging (and host) directory will be created as part of the configure step, so any $(shell ...) variable that is used in the configure step will fail because the directory doesn't exist yet. 2. 'make printvars' evaluates the variables it prints. It will therefore trigger a lot of errors from missing .pc files and others. The backticks, on the other hand, are not expanded, so with this change the output of 'make printvars' becomes clean again. This commit contains only the easy changes: replace $(shell ...) with `...`, and also replace ' with " where needed. Follow-up commits will tackle the more complicated cases that need additional explanation. After this change, the following instances of $(shell ...) will remain: - All assignments that use := - All variables that are used in make conditionals (which don't expand the backticks). - All variables that only refer to system executables and make variables that don't change. - The calls to check-host-* in dependencies.mk, because it is eval'ed. [Original patch by Fabio Porcedda, but extended quite a bit by Arnout.] Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: security bump to version 5.6.11Gustavo Zacarias2015-07-111-1/+1
| | | | | | | | | | | | | | Fixes: CVE-2015-3152 - mysqlnd is vulnerable to BACKRONYM And other security bugs with no CVE assigned yet: Bug #69972 - Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk() Bug # 69970 - Use-after-free vulnerability in spl_recursive_it_move_forward_ex() Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: security bump to version 5.6.10Gustavo Zacarias2015-06-121-1/+1
| | | | | | | | | | Fixes: CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 (via bundled sqlite upgrade). CVE-2015-2325, CVE-2015-2326 (via bundled pcre upgrade). Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/php: Fix static linking by reworking static libs handlingBernd Kuhls2015-05-311-3/+9
| | | | | | | | | | | Fixes http://autobuild.buildroot.net/results/157/157749f8b44bc02fbed0232a2b33137aba495134/ http://autobuild.buildroot.net/results/df4/df4e2ea098b0126867455af1891837c6d7d99a92/ http://autobuild.buildroot.net/results/e69/e6993d66aeebbe994063a60871412b2235ce5455/ [Peter: unixodbc only needs -lpthread if toolchain has threads support] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/php: Disable jit in bundled pcre libraryBernd Kuhls2015-05-311-0/+8
| | | | | | | | | | | | | | | | | | | | Quote from ext/pcre/pcrelib/doc/pcre.txt "This support is available only for certain hardware architectures. If this option is set for an unsupported architecture, a compile time error occurs." Disable jit support on unsupported archs by updating ext/pcre/pcrelib/config.h Fixes http://autobuild.buildroot.net/results/966/966d6c47d1ed13a90c2846d96fb3d193df4b2aaa/ (bfin) http://autobuild.buildroot.net/results/3f5/3f53751b192078714860e64d3f6d8d7398433d5a/ (xtensa) http://autobuild.buildroot.net/results/de1/de12474d2b5cce251b1ab10f7d7e28c90545a1f0/ (arcle) http://autobuild.buildroot.net/results/358/358b54245bb48f653ce209be070bd5fe6b17afc4/ (microblazeel) http://autobuild.buildroot.net/results/a7c/a7c161ca0b424ae35634c9f2d8a8111cedec8181/ (nios2) http://autobuild.buildroot.net/results/dad/dad1128f58fc601bf96da5fa0635b9b9c6c8f0b8/ (sh) Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/php: fix build without threads and pcreYann E. MORIN2015-05-251-0/+7
| | | | | | | | | | | | | | | | | | | The pcre library bundled in php is not configurable through the usual --enable/disable options, but wants to be thread-safe by default, so it wants to use pthreads (uncludes pthread.h and uses pthread_* functions). So, just override the default configuration to explicitly require the bundled pcre library be single-threaded when we have no thread and are not using the external pcre library. Fixes: http://autobuild.buildroot.org/results/f50/f50f4e569466ad74e49a3eac9ea2e6cfc4dd30e3/ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Floris Bos <bos@je-eigen-domein.nl> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* php: bump version to 5.6.9Floris Bos2015-05-201-1/+1
| | | | | | Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* php: add PHP_VERSION_MAJOR variableFloris Bos2015-05-201-1/+2
| | | | | | | | | Add PHP_VERSION_MAJOR variable to php.mk for use by other packages. E.g. to install the Ioncube loader binary, it is necessary to know the PHP major version. Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* php: fpm: remove sample status pageFloris Bos2015-05-191-0/+2
| | | | | | | | | php-fpm installs a sample status page to $datadir/fpm/status.html It is not of any use in that directory, so remove it from target. If someone wants to use it, he can copy it to webroot manually. Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* php: enable opcache extension in php.ini if selectedFloris Bos2015-05-191-0/+3
| | | | | | | | Add a line to load the opcache extension in php.ini, at the bottom of the "dynamic extensions" section. Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* php: delete /usr/lib/php/build instead of /usr/lib/phpFloris Bos2015-05-191-1/+1
| | | | | | | | | | Fixes #8121 External PHP modules like the OPcache may live in /usr/lib/php/extensions, so only delete /usr/lib/php/build Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* php: openssl support needs to link against zlib for static linkingPeter Korsgaard2015-05-111-0/+5
| | | | | | | | | | Fixes: http://autobuild.buildroot.net/results/490/490a9558635c90bf510b6f80cd0891fe322c3f46/ http://autobuild.buildroot.net/results/bf1/bf12eb189ab35ce00a2212695d2dbf8b8a126529/ Otherwise the configure script fails to detect openssl and bails out. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* php.ini: set date.timezoneFloris Bos2015-05-021-0/+8
| | | | | | | | | | Set date.timezone in php.ini to match time zone settings. Prevents a warning being logged about it not being set each time a PHP date/time method is used. Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: fpm sapi: install php-fpm.confFloris Bos2015-05-021-0/+8
| | | | | | | | | | | | | Install a custom php-fpm.conf instead of the stock one. - Listening on /var/run/php-fpm.sock instead of TCP port so we can restrict access to webserver user www-data. - Using ondemand pm, so PHP children are only started after a PHP request, instead of kept resident all the time. Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: fpm sapi: install startup scriptFloris Bos2015-05-021-0/+15
| | | | | | | | Install the startup script if using the FastCGI Process Manager. Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: remove non-IPv6 dependencies and tweaksGustavo Zacarias2015-04-221-7/+0
| | | | | | | | Now that IPv6 is mandatory remove package dependencies and conditionals for it. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: security bump to version 5.6.8Gustavo Zacarias2015-04-171-1/+1
| | | | | | | | | | | Fixes: CVE-2015-1351 - OPCache: Use After Free CVE-2015-1352 - Postgres: Null pointer dereference And others with no CVE assigned yet. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: allow cache for strcasestr testGustavo Zacarias2015-04-091-1/+3
| | | | | | | | | Fileinfo does an AC_TRY_RUN to test for strcasestr without allowing a canned response, hence breaking cross-compiles. Use AC_CACHE_VAL. Fixes: http://autobuild.buildroot.net/results/10a/10ae44cbc7c0c8e6f1ac54dae4c9d94c703aa3dd/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: use TARGET_MAKE_ENV for buildconfGustavo Zacarias2015-04-091-1/+1
| | | | | | | | Otherwise we miss the PATH for hosts that lack autotools. Fixes: http://autobuild.buildroot.net/results/368/368da962f657801817a4b962415e55606915c871/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: add opcache optionGustavo Zacarias2015-04-081-0/+13
| | | | | | | | | | | Add a Zend OPcache option and tweak the build system into being cross-compile friendly. The OPcache extension allows for a neat intermediate bytecode cache in memory to avoid reinterpreting/recompiling php scripts on multiple runs. Make it an option since this takes up valuable RAM. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: cleanup patchesGustavo Zacarias2015-04-081-0/+7
| | | | | | | | | Convert patches from pure configure ones to *.m4/configure.in cleanness. This allows us to AUTORECONF (well, not quite, but close). Even though upstream will probably not accept them it's the right way. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: bump to version 5.6.7Gustavo Zacarias2015-04-081-1/+1
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/php: add unixodbc supportBernd Kuhls2015-04-051-0/+4
| | | | | | | [Thomas: fix indentation.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: remove (non-)lfs dependencies and tweaksGustavo Zacarias2015-04-011-3/+0
| | | | | | | | Now that largefile is mandatory removes package dependencies and conditionals. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: indentation cleanupJerzy Grzegorek2015-03-311-66/+69
| | | | | | | This commit doesn't touch infra packages. Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: security bump to version 5.5.23Gustavo Zacarias2015-03-201-1/+1
| | | | | | | | | | Fixes: CVE-2015-0231 - Use After Free Vulnerability in unserialize() CVE-2015-2305 - heap overflow vulnerability in regcomp.c CVE-2015-2331 - ZIP Integer Overflow leads to writing past heap boundary Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* Added support for PHP/SQLite3 (non PDO).Mauro Condarelli2015-03-091-0/+4
| | | | | | Signed-off-by: Mauro Condarelli <mc5686@mclink.it> Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: security bump to version 5.5.22Gustavo Zacarias2015-02-191-1/+1
| | | | | | | | | | | Fixes: CVE-2015-0273 - Use after free vulnerability in unserialize() with DateTimeZone. CVE-2015-0235 - Mitigation for GHOST: glibc gethostbyname buffer overflow. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: security bump to version 5.5.21Gustavo Zacarias2015-01-231-1/+1
| | | | | | | | | | Fixes: CVE-2015-0231 - Use After Free Vulnerability in PHP's unserialize() CVE-2014-9427 - Out of bounds read crashes php-cgi CVE-2015-0232 - Free called on unitialized pointer Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package: indentation cleanupJerzy Grzegorek2014-12-241-33/+35
| | | | | Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: security bump to version 5.5.20Gustavo Zacarias2014-12-181-1/+1
| | | | | | | | Fixes: CVE-2014-8142 - Use after free vulnerability in unserialize() Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBSThomas Petazzoni2014-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed from "prefer static libraries when possible" to "use only static libraries". The former semantic didn't make much sense, since the user had absolutely no control/idea of which package would use static libraries, and which packages would not. Therefore, for quite some time, we have been starting to enforce that BR2_PREFER_STATIC_LIB should really build everything with static libraries. As a consequence, this patch renames BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS, and adjust the Config.in option accordingly. This also helps preparing the addition of other options to select shared, shared+static or just static. Note that we have verified that this commit can be reproduced by simply doing a global rename of BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* php: install configuration file unconditionallyThomas Petazzoni2014-12-021-4/+2
| | | | | | | | | | | | As discussed, users should use a rootfs overlay or a post-build script instead of a custom skeleton to override files installed by Buildroot, so there is no point in having conditions when installing init scripts or configuration files. [Peter: use install -D] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* php: security bump to version 5.5.19Gustavo Zacarias2014-11-141-1/+1
| | | | | | | | | | Fixes: CVE-2014-3710 - fileinfo: out-of-bounds read in elf note headers. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/php: Add support for mbstring moduleBernd Kuhls2014-10-261-0/+1
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/php: Add support for mcrypt moduleBernd Kuhls2014-10-261-0/+5
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/php: Add support for GD moduleBernd Kuhls2014-10-261-0/+8
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/.mk files: remove --localstatedir=/var from autotools packagesJörg Krause2014-10-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Remove --localstatedir=/var from all autotools packages where it is no longer needed. Also remove --localstatedir=/var/lib/dhcp from package dhcp. localstatedir is used by dhcp to set the default directory for the leases files. This can also be done by setting --with-*-lease-file=/var/lib/dhcp/*, which is done in dhcp.mk. A custom --localstatedir is left in: * proftpd.mk * mysql.mk This is safe to do: One of the good thing with autoconf is that if you pass: --localstatedir=/var ... --localstatedir=/var/something Then /var/something will be used. So, we can set --localstatedir=/var by default in the infrastructure, and still have certain packages doing weird things override it. [Thanks to Thomas Petazzoni] Signed-off-by: Jörg Krause <jkrause@posteo.de> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* php: security bump to version 5.5.18Gustavo Zacarias2014-10-171-1/+1
| | | | | | | | | | | Fixes: CVE-2014-3669 - Integer overflow in unserialize() (32-bits only) CVE-2014-3670 - Heap corruption in exif_thumbnail() CVE-2014-3668 - Global buffer overflow in mkgmtime() function Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* .mk files: bulk aligment and whitespace cleanup of assignmentsThomas De Schampheleire2014-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* packages: rename FOO_CONF_OPT into FOO_CONF_OPTSThomas De Schampheleire2014-10-041-32/+32
| | | | | | | | | | | | To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTSThomas De Schampheleire2014-10-041-1/+1
| | | | | | | | | | | | To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_STAGING_OPT. Sed command used: find * -type f | xargs sed -i 's#_INSTALL_STAGING_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTSThomas De Schampheleire2014-10-041-1/+1
| | | | | | | | | | | | To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_TARGET_OPT. Sed command used: find * -type f | xargs sed -i 's#_INSTALL_TARGET_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
OpenPOWER on IntegriCloud