diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-05-03 21:23:19 +0200 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-05-08 16:20:40 +0200 |
commit | adb250148d979c2dd58b41ff8151f9c577b76572 (patch) | |
tree | 553ae821e6b3e4f959cf0db92577522ab949c2a6 /rules | |
parent | 3a1295b8d32eedee969e76778303b37e73228ea8 (diff) | |
download | ptxdist-adb250148d979c2dd58b41ff8151f9c577b76572.tar.gz ptxdist-adb250148d979c2dd58b41ff8151f9c577b76572.tar.xz |
apache2: update to 2.0.64 + use external apr + apr-util
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r-- | rules/apache2.in | 6 | ||||
-rw-r--r-- | rules/apache2.make | 89 | ||||
-rw-r--r-- | rules/host-apache2.in | 2 | ||||
-rw-r--r-- | rules/host-apache2.make | 36 |
4 files changed, 30 insertions, 103 deletions
diff --git a/rules/apache2.in b/rules/apache2.in index d820be8bd..f7643155e 100644 --- a/rules/apache2.in +++ b/rules/apache2.in @@ -1,17 +1,17 @@ ## SECTION=networking -# Apache 2 configuration menuconfig APACHE2 tristate prompt "apache 2 http server " - select EXPAT + select APR + select APR_UTIL + select HOST_APACHE2 select LIBC_M select LIBC_RT select LIBC_DL select LIBC_NSL select LIBC_CRYPT select GCCLIBS_GCC_S - select HOST_APACHE2 help Apache v2 is the next generation of the Apache web server. This version - a total rewrite - introduces many new diff --git a/rules/apache2.make b/rules/apache2.make index 8b3d9e82a..819886ef5 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -1,7 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2005 by Robert Schwebel -# 2009 by Marc Kleine-Budde <mkl@pengutronix.de> +# 2009, 2012 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -17,41 +17,29 @@ PACKAGES-$(PTXCONF_APACHE2) += apache2 # # Paths and names # -APACHE2_VERSION := 2.0.58 -APACHE2_MD5 := ac732a8b3ec5760baa582888f5dbad66 +APACHE2_VERSION := 2.0.64 +APACHE2_MD5 := 762e250a3b981ce666bc10e6748a1ac1 APACHE2 := httpd-$(APACHE2_VERSION) APACHE2_SUFFIX := tar.bz2 APACHE2_URL := http://archive.apache.org/dist/httpd/$(APACHE2).$(APACHE2_SUFFIX) APACHE2_SOURCE := $(SRCDIR)/$(APACHE2).$(APACHE2_SUFFIX) APACHE2_DIR := $(BUILDDIR)/$(APACHE2) +APACHE2_LICENSE := APLv2 # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -# FIXME: find a real patch for ac_* apr_* (fix configure script) -APACHE2_CONF_ENV := \ - $(CROSS_ENV) \ - ac_cv_sizeof_ssize_t=4 \ - ac_cv_sizeof_size_t=4 \ - apr_cv_process_shared_works=yes \ - apr_cv_mutex_robust_shared=no \ - ac_cv_func_setpgrp_void=yes - -APACHE2_BINCONFIG_GLOB := "" - # # autoconf # -# - if we don't specify expat here, apache2 finds the internal one and -# installs it into sysroot, which overwrites our installed version -# APACHE2_CONF_TOOL := autoconf APACHE2_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --includedir=/usr/include/apache2 \ --enable-so \ - --with-expat=$(SYSROOT)/usr + --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \ + --with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-config ifdef PTXCONF_APACHE2_MPM_PREFORK APACHE2_CONF_OPT += --with-mpm=prefork @@ -65,56 +53,6 @@ ifdef PTXCONF_APACHE2_MPM_WORKER APACHE2_CONF_OPT += --with-mpm=worker endif -# FIXME -# --without-apxs $(CROSS_AUTOCONF_USR) -# --with-python \ -# --with-python-src=$(PYTHON24_DIR) \ - -$(STATEDIR)/apache2.prepare: - @$(call targetinfo) - @$(call world/prepare, APACHE2) -# # -# # Tweak, Tweak ... -# # -# # The original object files are also used for other binaries, so -# # we generate a dummy dependency here -# # - sed -i -e "s/^gen_test_char_OBJECTS =.*$$/gen_test_char_OBJECTS = dummy.lo/g" $(APACHE2_DIR)/server/Makefile - - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/apache2.compile: - @$(call targetinfo) - -# # -# # Tweak, tweak... -# # -# # These files are run during compilation, so they have to be -# # compiled for the host, not for the target -# # - touch $(APACHE2_DIR)/srclib/apr-util/uri/gen_uri_delims.lo - cp $(PTXCONF_SYSROOT_HOST)/bin/apache2/gen_uri_delims \ - $(APACHE2_DIR)/srclib/apr-util/uri/gen_uri_delims - touch $(APACHE2_DIR)/srclib/apr-util/uri/gen_uri_delims - - touch $(APACHE2_DIR)/srclib/pcre/dftables.lo - cp $(PTXCONF_SYSROOT_HOST)/bin/apache2/dftables \ - $(APACHE2_DIR)/srclib/pcre/dftables - touch $(APACHE2_DIR)/srclib/pcre/dftables - - touch $(APACHE2_DIR)/server/dummy.lo - cp $(PTXCONF_SYSROOT_HOST)/bin/apache2/gen_test_char \ - $(APACHE2_DIR)/server/gen_test_char - touch $(APACHE2_DIR)/server/gen_test_char - - @$(call compile, APACHE2) - - @$(call touch) - # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- @@ -122,16 +60,13 @@ $(STATEDIR)/apache2.compile: $(STATEDIR)/apache2.install.post: @$(call targetinfo) @$(call world/install.post, APACHE2) - sed -i -e "s~\([ =\"]\)\(/usr\)~\1$(SYSROOT)\2~g" \ - $(SYSROOT)/usr/build/apr_rules.mk \ - $(SYSROOT)/usr/build/config.nice \ - $(SYSROOT)/usr/bin/apr-config \ - $(SYSROOT)/usr/bin/apu-config \ - $(SYSROOT)/usr/bin/apxs + sed -i -e "s~\([ =\"]\)\(/usr\)~\1$(PTXDIST_SYSROOT_TARGET)\2~g" \ + $(PTXDIST_SYSROOT_TARGET)/usr/build/config.nice \ + $(PTXDIST_SYSROOT_TARGET)/usr/bin/apxs sed -i \ - -e "/AP._BINDIR/s~\([ =\"]\)\(/usr\)~\1$(SYSROOT)\2~g" \ - -e "/^includedir/s~= \(.*\)~= $(SYSROOT)\1~g" \ - $(SYSROOT)/usr/build/config_vars.mk + -e "/AP._BINDIR/s~\([ =\"]\)\(/usr\)~\1$(PTXDIST_SYSROOT_TARGET)\2~g" \ + -e "/^includedir/s~= \(.*\)~= $(PTXDIST_SYSROOT_TARGET)\1~g" \ + $(PTXDIST_SYSROOT_TARGET)/usr/build/config_vars.mk @$(call touch) # ---------------------------------------------------------------------------- diff --git a/rules/host-apache2.in b/rules/host-apache2.in index 1903ecf52..b6362fbab 100644 --- a/rules/host-apache2.in +++ b/rules/host-apache2.in @@ -3,3 +3,5 @@ config HOST_APACHE2 tristate default ALLYES + select HOST_APR + select HOST_APR_UTIL diff --git a/rules/host-apache2.make b/rules/host-apache2.make index a58662d68..a9b39d0f6 100644 --- a/rules/host-apache2.make +++ b/rules/host-apache2.make @@ -1,8 +1,8 @@ # -*-makefile-*- # # Copyright (C) 2005 by Robert Schwebel -# 2009 by Marc Kleine-Budde <mkl@pengutronix.de> -# +# 2009, 2012 by Marc Kleine-Budde <mkl@pengutronix.de> +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -14,22 +14,15 @@ # HOST_PACKAGES-$(PTXCONF_HOST_APACHE2) += host-apache2 -# -# Paths and names -# -HOST_APACHE2 = $(APACHE2) -HOST_APACHE2_DIR = $(HOST_BUILDDIR)/$(HOST_APACHE2) - # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -HOST_APACHE2_ENV := $(HOST_ENV) - -# -# autoconf -# -HOST_APACHE2_AUTOCONF := --prefix=/ +HOST_APACHE2_CONF_TOOL := autoconf +HOST_APACHE2_CONF_OPT := \ + --prefix=/ \ + --with-apr=$(PTXDIST_SYSROOT_HOST)/bin/apr-config \ + --with-apr-util=$(PTXDIST_SYSROOT_HOST)/bin/apu-config # ---------------------------------------------------------------------------- # Compile @@ -37,9 +30,8 @@ HOST_APACHE2_AUTOCONF := --prefix=/ $(STATEDIR)/host-apache2.compile: @$(call targetinfo) - cd $(HOST_APACHE2_DIR)/srclib/apr-util/uri && $(HOST_APACHE2_ENV) $(MAKE) - cd $(HOST_APACHE2_DIR)/srclib/pcre && $(HOST_APACHE2_ENV) $(MAKE) dftables - cd $(HOST_APACHE2_DIR)/server && $(HOST_APACHE2_ENV) $(MAKE) gen_test_char + @make -C $(HOST_APACHE2_DIR)/server gen_test_char + @make -C $(HOST_APACHE2_DIR)/srclib/pcre dftables @$(call touch) # ---------------------------------------------------------------------------- @@ -48,12 +40,10 @@ $(STATEDIR)/host-apache2.compile: $(STATEDIR)/host-apache2.install: @$(call targetinfo) - install -D -m 755 "$(HOST_APACHE2_DIR)/srclib/apr-util/uri/gen_uri_delims" \ - "$(HOST_APACHE2_PKGDIR)/bin/apache2/gen_uri_delims" - install -D -m 755 "$(HOST_APACHE2_DIR)/srclib/pcre/dftables" \ - "$(HOST_APACHE2_PKGDIR)/bin/apache2/dftables" - install -D -m 755 "$(HOST_APACHE2_DIR)/server/gen_test_char" \ - "$(HOST_APACHE2_PKGDIR)/bin/apache2/gen_test_char" + @install -D -m 755 ${HOST_APACHE2_DIR}/server/gen_test_char \ + ${HOST_APACHE2_PKGDIR}/bin/gen_test_char + @install -D -m 755 ${HOST_APACHE2_DIR}/srclib/pcre/dftables \ + ${HOST_APACHE2_PKGDIR}/bin/dftables @$(call touch) # vim: syntax=make |