diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-06-09 23:11:42 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-06-09 23:11:42 +0000 |
| commit | e7e42350a5f83f426ca3986a9ec90fb2ce796ea8 (patch) | |
| tree | 41b65e9a29ebea8af2485ee25588b9c2539b6da8 /rules/php5.make | |
| parent | 7595a886825031bc18750e9f3bcda9138164c361 (diff) | |
| download | ptxdist-e7e42350a5f83f426ca3986a9ec90fb2ce796ea8.tar.gz ptxdist-e7e42350a5f83f426ca3986a9ec90fb2ce796ea8.tar.xz | |
iconv: rework iconv handling in ptxdist
libiconv provides functionality that is already provided by glibc. So we
consolidate ptxdist to use native glibc iconv instead of libiconv
support.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10681 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/php5.make')
| -rw-r--r-- | rules/php5.make | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/rules/php5.make b/rules/php5.make index 450f488d3..520101cc0 100644 --- a/rules/php5.make +++ b/rules/php5.make @@ -50,7 +50,11 @@ PHP5_ENV := $(CROSS_ENV) PHP5_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --with-config-file-path=/etc/php5 \ - --without-pdo-sqlite + --without-pdo-sqlite \ + --without-iconv + + +# FIXME: configure is broken beyond repair for glibc-libiconv # FIXME: PHP Data Objects -> sqlite doesn't link correctly @@ -241,12 +245,6 @@ else PHP5_AUTOCONF += --disable-simplexml endif -ifdef PTXCONF_PHP5_EXT_ICONV -PHP5_AUTOCONF += --with-iconv=$(SYSROOT)/usr -else -PHP5_AUTOCONF += --without-iconv -endif - ifdef PTXCONF_PHP5_EXT_MYSQL PHP5_AUTOCONF += \ --with-mysql=$(SYSROOT)/usr \ |