12 Commits

Author SHA1 Message Date
Marcin Juszkiewicz
6cbeee1537 modphp: update to 5.4.14
Only build tested.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
2013-04-30 21:25:05 +02:00
Martin Jansa
a45830a39b recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
  tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
  tabs is the need to update a lot of recipes). Lately this advice
  was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
  error prone when someone is not sure if e.g.
  do_generate_toolchain_file() is Python or shell task and also allows
  to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
  potentially bad (shouldn't be used for indenting of multiline
  variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
  we're quite inconsistent wheater it's first character on line
  under opening quote or under first non-whitespace character in
  previous line.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
2013-04-15 16:23:17 +02:00
Jackie Huang
29fa7f9ea7 modphp: enable mysql option in PACKAGECONFIG
* enable mysql option in PACKAGECONFIG
* add patch to support autoconf 2.59+ so we can use
  autotools do_configure to fix a libtool cross-compile issue

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2013-04-15 10:56:19 +01:00
Jackie Huang
12b72e1eaf modphp: revert pthread-check.patch and add one against threads.m4
revert pthread-check.patch which hacks the old configure,
instead, add one against threads.m4 to enable pthread support
when cross-compiling.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2013-04-15 10:56:19 +01:00
Jackie Huang
8bfd395b06 modphp: use libdir instead of baselib to load module
When we change the apache2 files layout to debian style,
the ServerRoot in httpd.conf was changed to "/" from "/usr",
then the relative path to libphp5 module in 70_mod_php5.conf
will be invalid so it fails to load the module, use libdir
(absolute path) instead so it will always find the module.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2013-04-03 18:07:50 +01:00
Jackie Huang
6c9ac38e8b modphp5: use ${baselib} instead of hardcoded "lib"
The hardcoded lib path will cause apache2 fail to start on
the target with other baselib like lib64.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2013-03-07 11:44:11 +00:00
Eric Bénard
9439d8132a modphp: enable bz2, zip and mbstring
- bz2 and zip remove warnings in phpmyadmin
- mbstring is usefull for multibyte strings

Signed-off-by: Eric Bénard <eric@eukrea.com>
2012-11-27 10:48:23 +00:00
Paul Eggleton
6fe4073a26 modphp: call gnu-configize in do_configure
Since we override do_configure, gnu-configize doesn't get called and
using the old gnu-config files distributed with the PHP source can cause
problems for some people e.g. building for AArch64; so add a call to it
explicitly here.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-18 11:44:56 +01:00
Paul Eggleton
a660f4a028 modphp: make LICENSE more accurate
PHP 5 is distributed under the PHP 3.01 license (which we identify as
PHP-3.0 as far as common license files go).

Fixes the following warning:

WARNING: modphp: No generic license file exists for: PHP in any provider

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-15 11:02:22 +01:00
Paul Eggleton
13338589e5 modphp: fix rpath QA issue
Fixes the following QA issue:

ERROR: QA Issue: package modphp contains bad RPATH ${STAGING_DIR_TARGET}/usr/lib in file ${WORKDIR}/packages-split/modphp/usr/lib/apache2/modules/libphp5.so

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-15 11:02:22 +01:00
Paul Eggleton
0cd6b15d72 modphp: fix default php.ini & add PACKAGECONFIG
* Add "mysql" PACKAGECONFIG option
* Add "pgsql" PACKAGECONFIG option (untested)
* Use the correct template php.ini filename so that we actually get
  some content in the default file

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-09 11:09:23 +02:00
Paul Eggleton
418650c55d modphp: add from OE-Classic, update to 5.3.14 and fix
* Use working SRC_URI
* Fix to use correct headers and apxs script for cross-compiling
* Enable threading
* Install headers and scripts for building extension modules
* Use proper variables instead of /etc, /usr/lib etc.
* Fix rpath QA issues
* Add LIC_FILES_CHKSUM
* Put apache config file into SRC_URI instead of referring to it using
  FILESDIR

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-03 14:36:40 +01:00