diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-10-08 06:17:08 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-10-08 06:17:08 +0000 |
| commit | e6343ced59f5a187fce2514f6ec4083a98dc0614 (patch) | |
| tree | 18e976f0da3fe1b3065a83c5fb385d06d70acb7b /rules/apache2.make | |
| parent | c8280f5c53f0133fe81d5848a5c3bf3756b8d23a (diff) | |
| download | ptxdist-e6343ced59f5a187fce2514f6ec4083a98dc0614.tar.gz ptxdist-e6343ced59f5a187fce2514f6ec4083a98dc0614.tar.xz | |
* apache2: if we don't specify expat here, apache2 finds the
internal one and installs it into sysroot, which overwrites our
installed version.
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7354 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/apache2.make')
| -rw-r--r-- | rules/apache2.make | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/rules/apache2.make b/rules/apache2.make index 3bb9d3540..4f9a4674d 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -20,7 +20,6 @@ PACKAGES-$(PTXCONF_APACHE2) += apache2 APACHE2_VERSION := 2.0.58 APACHE2 := httpd-$(APACHE2_VERSION) APACHE2_SUFFIX := tar.bz2 -#APACHE2_URL := http://ftp.uni-erlangen.de/pub/mirrors/apache/httpd/$(APACHE2).$(APACHE2_SUFFIX) APACHE2_URL := http://archive.apache.org/dist/httpd/$(APACHE2).$(APACHE2_SUFFIX) APACHE2_SOURCE := $(SRCDIR)/$(APACHE2).$(APACHE2_SUFFIX) APACHE2_DIR := $(BUILDDIR)/$(APACHE2) @@ -71,9 +70,13 @@ APACHE2_ENV := $(CROSS_ENV) \ # # autoconf # +# - if we don't specify expat here, apache2 finds the internal one and +# installs it into sysroot, which overwrites our installed version +# APACHE2_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --enable-so + --enable-so \ + --with-expat=$(SYSROOT)/usr ifdef PTXCONF_APACHE2_MPM_PREFORK APACHE2_AUTOCONF += --with-mpm=prefork |