[ptxdist] [PATCHv2 1/2] apr-util: version update to 1.5.4

[ptxdist] [PATCHv2 1/2] apr-util: version update to 1.5.4

[Oliver Graute]

This patch update apr-util to version 1.5.4
this version is required by apache 2.4 

Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
 rules/apr-util.in   |    1 -
 rules/apr-util.make |   14 +++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/rules/apr-util.in b/rules/apr-util.in
index aaacfad..6e53726 100644
--- a/rules/apr-util.in
+++ b/rules/apr-util.in
@@ -3,7 +3,6 @@
 config APR_UTIL
 	tristate
 	select APR
-	select HOST_APR_UTIL
 	select EXPAT
 	prompt "apr-util"
 	help
diff --git a/rules/apr-util.make b/rules/apr-util.make
index 821a838..cce9385 100644
--- a/rules/apr-util.make
+++ b/rules/apr-util.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2012 by Marc Kleine-Budde <mkl@pengutronix.de>
+# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute <oliver.graute@neuhaus.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_APR_UTIL) += apr-util
 #
 # Paths and names
 #
-APR_UTIL_VERSION	:= 0.9.19
-APR_UTIL_MD5		:= 927a200513018a579cc9936c05d35206
+APR_UTIL_VERSION	:= 1.5.4
+APR_UTIL_MD5		:= 866825c04da827c6e5f53daff5569f42
 APR_UTIL		:= apr-util-$(APR_UTIL_VERSION)
 APR_UTIL_SUFFIX		:= tar.bz2
 APR_UTIL_URL		:= http://archive.apache.org/dist/apr/$(APR_UTIL).$(APR_UTIL_SUFFIX)
@@ -29,14 +30,17 @@ APR_UTIL_LICENSE	:= APLv2
 # Prepare
 # ----------------------------------------------------------------------------
 
+APR_UTIL_CONF_ENV	:= $(CROSS_ENV)
+
 #
 # autoconf
 #
 APR_UTIL_CONF_TOOL := autoconf
 APR_UTIL_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
-	--with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \
-	--with-expat=$(PTXDIST_SYSROOT_TARGET)/usr
+	--with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-1-config \
+	--with-expat=$(PTXDIST_SYSROOT_TARGET)/usr/include/apr-1
+
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -51,7 +55,7 @@ $(STATEDIR)/apr-util.targetinstall:
 	@$(call install_fixup, apr-util,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, apr-util,DESCRIPTION,missing)
 
-	@$(call install_lib, apr-util, 0, 0, 0644, libaprutil-0)
+	@$(call install_lib, apr-util, 0, 0, 0644, libaprutil-1)
 
 	@$(call install_finish, apr-util)
 
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCHv2 2/2] apr-util: added patches for apr-util 1.5.4

[Oliver Graute]

Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
 .../0001-apu-config-add-SYSROOT.patch              |   39 ++++++++++++++++++++
 patches/apr-util-1.5.4/series                      |    1 +
 2 files changed, 40 insertions(+)
 create mode 100644 patches/apr-util-1.5.4/0001-apu-config-add-SYSROOT.patch
 create mode 100644 patches/apr-util-1.5.4/series

diff --git a/patches/apr-util-1.5.4/0001-apu-config-add-SYSROOT.patch b/patches/apr-util-1.5.4/0001-apu-config-add-SYSROOT.patch
new file mode 100644
index 0000000..d8a594c
--- /dev/null
+++ b/patches/apr-util-1.5.4/0001-apu-config-add-SYSROOT.patch
@@ -0,0 +1,39 @@
+diff -rupN AM/apu-config.in AN/apu-config.in
+--- AM/apu-config.in	2010-09-29 16:21:25.000000000 +0200
++++ AN/apu-config.in	2015-02-13 12:58:30.942178404 +0100
+@@ -84,7 +84,7 @@ if test $# -eq 0; then
+ fi
+ 
+ if test "$location" = "installed"; then
+-    LA_FILE="$libdir/lib${APRUTIL_LIBNAME}.la"
++    LA_FILE="${SYSROOT}$libdir/lib${APRUTIL_LIBNAME}.la"
+ 
+     LIBS=`echo "$LIBS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s $prefix/libexpat.la -lexpat g"`
+     LDFLAGS=`echo "$LDFLAGS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g"`
+@@ -132,7 +132,7 @@ while test $# -gt 0; do
+     ;;
+     --includedir)
+     if test "$location" = "installed"; then
+-        flags="$includedir"
++        flags="${SYSROOT}$includedir"
+     elif test "$location" = "source"; then
+         flags="$APU_SOURCE_DIR/include"
+     else
+@@ -144,7 +144,7 @@ while test $# -gt 0; do
+     ;;
+     --includes)
+     if test "$location" = "installed"; then
+-        flags="$flags -I$includedir $INCLUDES"
++        flags="$flags -I${SYSROOT}$includedir $INCLUDES"
+     elif test "$location" = "source"; then
+         flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
+     else
+@@ -166,7 +166,7 @@ while test $# -gt 0; do
+     --link-ld)
+     if test "$location" = "installed"; then
+         ### avoid using -L if libdir is a "standard" location like /usr/lib
+-        flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
++        flags="$flags -L${SYSROOT}$libdir -l$APRUTIL_LIBNAME"
+     else
+         flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
+     fi
diff --git a/patches/apr-util-1.5.4/series b/patches/apr-util-1.5.4/series
new file mode 100644
index 0000000..4773caa
--- /dev/null
+++ b/patches/apr-util-1.5.4/series
@@ -0,0 +1 @@
+0001-apu-config-add-SYSROOT.patch
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCHv2 1/2] apr-util: version update to 1.5.4

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 2507 bytes --]

On 03/04/2015 11:00 AM, Oliver Graute wrote:
> This patch update apr-util to version 1.5.4
> this version is required by apache 2.4 
> 
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
>  rules/apr-util.in   |    1 -
>  rules/apr-util.make |   14 +++++++++-----
>  2 files changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/rules/apr-util.in b/rules/apr-util.in
> index aaacfad..6e53726 100644
> --- a/rules/apr-util.in
> +++ b/rules/apr-util.in
> @@ -3,7 +3,6 @@
>  config APR_UTIL
>  	tristate
>  	select APR
> -	select HOST_APR_UTIL
>  	select EXPAT
>  	prompt "apr-util"
>  	help
> diff --git a/rules/apr-util.make b/rules/apr-util.make
> index 821a838..cce9385 100644
> --- a/rules/apr-util.make
> +++ b/rules/apr-util.make
> @@ -1,6 +1,7 @@
>  # -*-makefile-*-
>  #
>  # Copyright (C) 2012 by Marc Kleine-Budde <mkl@pengutronix.de>
> +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute <oliver.graute@neuhaus.de>
>  #
>  # See CREDITS for details about who has contributed to this project.
>  #
> @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_APR_UTIL) += apr-util
>  #
>  # Paths and names
>  #
> -APR_UTIL_VERSION	:= 0.9.19
> -APR_UTIL_MD5		:= 927a200513018a579cc9936c05d35206
> +APR_UTIL_VERSION	:= 1.5.4
> +APR_UTIL_MD5		:= 866825c04da827c6e5f53daff5569f42
>  APR_UTIL		:= apr-util-$(APR_UTIL_VERSION)
>  APR_UTIL_SUFFIX		:= tar.bz2
>  APR_UTIL_URL		:= http://archive.apache.org/dist/apr/$(APR_UTIL).$(APR_UTIL_SUFFIX)
> @@ -29,14 +30,17 @@ APR_UTIL_LICENSE	:= APLv2
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> +APR_UTIL_CONF_ENV	:= $(CROSS_ENV)

why do you add this?

> +
>  #
>  # autoconf
>  #
>  APR_UTIL_CONF_TOOL := autoconf
>  APR_UTIL_CONF_OPT := \
>  	$(CROSS_AUTOCONF_USR) \
> -	--with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \
> -	--with-expat=$(PTXDIST_SYSROOT_TARGET)/usr
> +	--with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-1-config \
> +	--with-expat=$(PTXDIST_SYSROOT_TARGET)/usr/include/apr-1

why pointing expat to /usr/include/apr-1?

Please fix the errors discussed in the previous mails before reposting
you patch.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de