Re: [ptxdist] [PATCHv2 1/2] apache2: version bump to 2.4.12

[Michael Olbrich <m.olbrich@pengutronix.de>]

Hi,

Please send on patch that contains the rules changes and the patches.
This applies to your other patches as well.

Michael

On Wed, Feb 18, 2015 at 12:00:48PM +0100, Oliver Graute wrote:
> apache2 version bump to 2.4.12
> apr-1.5.1 and apr-utils-1.5.4 is necessary 
> 
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
>  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

Check the old patches. This is used to build some helper tools, so we don't
need to ship the generated files.

>  	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 <mkl@pengutronix.de>
> +#               2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany,  Oliver Graute <oliver.graute@neuhaus.de>
>  #
>  # 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 \

Again, I don't think this is in PTXDIST_SYSROOT_CROSS. This might be the
cause of your other problem, because it picks the wrong apr?

Michael

> +	--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
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de