From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wg0-x234.google.com ([2a00:1450:400c:c00::234]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YO2NF-00013P-UF for ptxdist@pengutronix.de; Wed, 18 Feb 2015 12:00:58 +0100 Received: by mail-wg0-f52.google.com with SMTP id x12so339716wgg.11 for ; Wed, 18 Feb 2015 03:00:52 -0800 (PST) From: Oliver Graute Date: Wed, 18 Feb 2015 12:00:48 +0100 Message-Id: <1424257249-19944-1-git-send-email-oliver.graute@neuhaus.de> Subject: [ptxdist] [PATCHv2 1/2] apache2: version bump to 2.4.12 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Oliver Graute apache2 version bump to 2.4.12 apr-1.5.1 and apr-utils-1.5.4 is necessary Signed-off-by: Oliver Graute --- rules/apache2.in | 1 - rules/apache2.make | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/rules/apache2.in b/rules/apache2.in index 653f9cd..7441486 100644 --- a/rules/apache2.in +++ b/rules/apache2.in @@ -5,7 +5,6 @@ menuconfig APACHE2 prompt "apache 2 http server " select APR select APR_UTIL - select HOST_APACHE2 select LIBC_M select LIBC_RT select LIBC_DL diff --git a/rules/apache2.make b/rules/apache2.make index 98b628e..ba82592 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -2,6 +2,7 @@ # # Copyright (C) 2005 by Robert Schwebel # 2009, 2012 by Marc Kleine-Budde +# 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute # # See CREDITS for details about who has contributed to this project. # @@ -17,8 +18,8 @@ PACKAGES-$(PTXCONF_APACHE2) += apache2 # # Paths and names # -APACHE2_VERSION := 2.0.64 -APACHE2_MD5 := 762e250a3b981ce666bc10e6748a1ac1 +APACHE2_VERSION := 2.4.12 +APACHE2_MD5 := b8dc8367a57a8d548a9b4ce16d264a13 APACHE2 := httpd-$(APACHE2_VERSION) APACHE2_SUFFIX := tar.bz2 APACHE2_URL := http://archive.apache.org/dist/httpd/$(APACHE2).$(APACHE2_SUFFIX) @@ -36,10 +37,13 @@ APACHE2_LICENSE := APLv2 APACHE2_CONF_TOOL := autoconf APACHE2_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + ap_cv_void_ptr_lt_long=4 \ --includedir=/usr/include/apache2 \ --enable-so \ - --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \ - --with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-config + --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-1-config \ + --with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-1-config \ + --with-ssl=$(PTXDIST_SYSROOT_TARGET)/usr/lib/ssl \ + --enable-ssl=shared ifdef PTXCONF_APACHE2_MPM_PREFORK APACHE2_CONF_OPT += --with-mpm=prefork @@ -129,6 +133,8 @@ endif $(PTXCONF_APACHE2_SERVERROOT)/conf/magic) @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/etc/mime.types, \ $(PTXCONF_APACHE2_SERVERROOT)/conf/mime.types) + @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_ssl.so, \ + $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_ssl.so) endif -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de