diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2016-06-12 12:48:24 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-06-12 18:38:39 +0200 |
| commit | 30e572df3142f7c149befa9f49730c4d8d4479ba (patch) | |
| tree | 9b04bc04ed76986a6c269807b2482d5f535a6374 | |
| parent | c2d8af430d6ed9b52117e2546d7a4ae8a51d2f87 (diff) | |
| download | buildroot-30e572df3142f7c149befa9f49730c4d8d4479ba.tar.gz buildroot-30e572df3142f7c149befa9f49730c4d8d4479ba.zip | |
package/php: fix date.timezone
In 5f37843a (php.ini: set date.timezone), the configured timezone was
used as the default for PHP.
However, BR2_TARGET_LOCALTIME is a string, so is quoted, so it is never
empty, so the check for emptynessnever matches.
Fix that by q-stripping the value before testing it. Note however that
we do not q-strip it before storing it in the php.ini file, because it
has to be q-stripped in there.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Floris Bos <bos@je-eigen-domein.nl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/php/php.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package/php/php.mk b/package/php/php.mk index 2997b1b7d1..8dc70f091c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -32,9 +32,10 @@ ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy) PHP_STATIC_LIBS += -lpthread endif -ifeq ($(BR2_TARGET_LOCALTIME),) +ifeq ($(call qstrip,$(BR2_TARGET_LOCALTIME)),) PHP_LOCALTIME = UTC else +# Not q-stripping this value, as we need quotes in the php.ini file PHP_LOCALTIME = $(BR2_TARGET_LOCALTIME) endif |
