mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/2] apr: version update to 1.5.1
@ 2015-02-18 10:45 Oliver Graute
  2015-02-18 10:45 ` [ptxdist] [PATCH 2/2] added 0001-apr-gen-test-char.patch Oliver Graute
  2015-02-18 10:57 ` [ptxdist] [PATCH 1/2] apr: version update to 1.5.1 Marc Kleine-Budde
  0 siblings, 2 replies; 6+ messages in thread
From: Oliver Graute @ 2015-02-18 10:45 UTC (permalink / raw)
  To: ptxdist; +Cc: Oliver Graute

This is a version bump from 0.9.20 to 1.5.1

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

diff --git a/rules/apr.make b/rules/apr.make
index 9c3b11d..557ff83 100644
--- a/rules/apr.make
+++ b/rules/apr.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) += apr
 #
 # Paths and names
 #
-APR_VERSION	:= 0.9.20
-APR_MD5		:= 6dd59a88ee75b8cdf719a90b5a2f2485
+APR_VERSION	:= 1.5.1
+APR_MD5		:= d3538d67e6455f48cc935d8f0a50a1c3
 APR		:= apr-$(APR_VERSION)
 APR_SUFFIX	:= tar.bz2
 APR_URL		:= http://archive.apache.org/dist/apr/$(APR).$(APR_SUFFIX)
@@ -37,8 +38,11 @@ APR_CONF_ENV := \
 	ac_cv_struct_rlimit=yes \
 	apr_cv_mutex_robust_shared=no \
 	apr_cv_process_shared_works=yes \
+	ac_cv_func_setpgrp_void="yes" \
+	apr_cv_tcp_nodelay_with_cork="yes" \
+	ac_cv_sizeof_struct_iovec="8" \
+	apr_cv_mutex_recursive="yes" \
 	apr_cv_pthreads_lib="-lpthread"
-
 #
 # autoconf
 #
@@ -55,7 +59,7 @@ $(STATEDIR)/apr.install.post:
 	@$(call targetinfo)
 	@$(call world/install.post, APR)
 	sed -i -e "s~@SYSROOT@~${PTXDIST_SYSROOT_TARGET}~g" \
-		$(PTXDIST_SYSROOT_TARGET)/usr/build/apr_rules.mk
+		$(PTXDIST_SYSROOT_TARGET)/usr/build-1/apr_rules.mk
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -71,7 +75,7 @@ $(STATEDIR)/apr.targetinstall:
 	@$(call install_fixup, apr,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, apr,DESCRIPTION,missing)
 
-	@$(call install_lib, apr, 0, 0, 0644, libapr-0)
+	@$(call install_lib, apr, 0, 0, 0644, libapr-1)
 
 	@$(call install_finish, apr)
 
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [ptxdist] [PATCH 2/2] added 0001-apr-gen-test-char.patch
  2015-02-18 10:45 [ptxdist] [PATCH 1/2] apr: version update to 1.5.1 Oliver Graute
@ 2015-02-18 10:45 ` Oliver Graute
  2015-02-19 16:12   ` Michael Olbrich
  2015-02-18 10:57 ` [ptxdist] [PATCH 1/2] apr: version update to 1.5.1 Marc Kleine-Budde
  1 sibling, 1 reply; 6+ messages in thread
From: Oliver Graute @ 2015-02-18 10:45 UTC (permalink / raw)
  To: ptxdist; +Cc: Oliver Graute


Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
 patches/apr-1.5.1/0001-apr-gen-test-char.patch |   69 ++++++++++++++++++++++++
 patches/apr-1.5.1/series                       |    1 +
 2 files changed, 70 insertions(+)
 create mode 100644 patches/apr-1.5.1/0001-apr-gen-test-char.patch
 create mode 100644 patches/apr-1.5.1/series

diff --git a/patches/apr-1.5.1/0001-apr-gen-test-char.patch b/patches/apr-1.5.1/0001-apr-gen-test-char.patch
new file mode 100644
index 0000000..12d47f6
--- /dev/null
+++ b/patches/apr-1.5.1/0001-apr-gen-test-char.patch
@@ -0,0 +1,69 @@
+diff -rupN AK/apr-config.in AL/apr-config.in
+--- AK/apr-config.in	2015-02-12 11:36:28.000000000 +0100
++++ AL/apr-config.in	2015-02-12 11:44:24.515350580 +0100
+@@ -200,7 +200,7 @@ while test $# -gt 0; do
+         ### avoid using -L if libdir is a "standard" location like /usr/lib
+         # Since the user is specifying they are linking with libtool, we
+         # *know* that -R will be recognized by libtool.
+-        flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
++        flags="$flags -L@SYSROOT@$libdir -l${APR_LIBNAME}"
+     else
+         flags="$flags $LA_FILE"
+     fi
+diff -rupN AK/include/private/apr_escape_test_char.h AL/include/private/apr_escape_test_char.h
+--- AK/include/private/apr_escape_test_char.h	1970-01-01 01:00:00.000000000 +0100
++++ AL/include/private/apr_escape_test_char.h	2015-02-12 13:53:10.195232200 +0100
+@@ -0,0 +1,23 @@
++/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
++#define T_ESCAPE_SHELL_CMD     (1)
++#define T_ESCAPE_PATH_SEGMENT  (2)
++#define T_OS_ESCAPE_PATH       (4)
++#define T_ESCAPE_ECHO          (8)
++#define T_ESCAPE_URLENCODED    (16)
++#define T_ESCAPE_XML           (32)
++
++static const unsigned char test_char_table[256] = {
++    32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30,
++    30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
++    17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
++    55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++    0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
++    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++    0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30 
++};
+diff -rupN AK/Makefile.in AL/Makefile.in
+--- AK/Makefile.in	2014-03-17 16:10:26.000000000 +0100
++++ AL/Makefile.in	2015-02-12 15:42:23.506233505 +0100
+@@ -71,7 +71,7 @@ apr-config.out: $(APR_CONFIG)
+ 
+ # Create apr_rules.mk suitable for the install tree
+ build/apr_rules.out: build/apr_rules.mk
+-	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
++	sed 's,^\(apr_build.*=\).*$$,\1@SYSROOT@$(installbuilddir),' < build/apr_rules.mk > $@
+ 
+ install: $(TARGETS)
+ 	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
+@@ -132,14 +132,9 @@ etags:
+ make_tools_dir:
+ 	$(APR_MKDIR) tools
+ 
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+-	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+-
+-include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+-	$(APR_MKDIR) include/private
+-	tools/gen_test_char@EXEEXT@ > $@
++#include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
++#	$(APR_MKDIR) include/private
++#	tools/gen_test_char@EXEEXT@ > $@
+ 
+ LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
+ 	    @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
diff --git a/patches/apr-1.5.1/series b/patches/apr-1.5.1/series
new file mode 100644
index 0000000..9b5a323
--- /dev/null
+++ b/patches/apr-1.5.1/series
@@ -0,0 +1 @@
+0001-apr-gen-test-char.patch
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 1/2] apr: version update to 1.5.1
  2015-02-18 10:45 [ptxdist] [PATCH 1/2] apr: version update to 1.5.1 Oliver Graute
  2015-02-18 10:45 ` [ptxdist] [PATCH 2/2] added 0001-apr-gen-test-char.patch Oliver Graute
@ 2015-02-18 10:57 ` Marc Kleine-Budde
  2015-02-18 11:48   ` [ptxdist] Antwort: " Oliver.Graute
  1 sibling, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2015-02-18 10:57 UTC (permalink / raw)
  To: ptxdist; +Cc: Oliver Graute


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

On 02/18/2015 11:45 AM, Oliver Graute wrote:
> This is a version bump from 0.9.20 to 1.5.1
> 
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
>  rules/apr.make |   14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/rules/apr.make b/rules/apr.make
> index 9c3b11d..557ff83 100644
> --- a/rules/apr.make
> +++ b/rules/apr.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>
                                                                            ^^
one space should be enough

>  #
>  # See CREDITS for details about who has contributed to this project.
>  #
> @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_APR) += apr
>  #
>  # Paths and names
>  #
> -APR_VERSION	:= 0.9.20
> -APR_MD5		:= 6dd59a88ee75b8cdf719a90b5a2f2485
> +APR_VERSION	:= 1.5.1
> +APR_MD5		:= d3538d67e6455f48cc935d8f0a50a1c3
>  APR		:= apr-$(APR_VERSION)
>  APR_SUFFIX	:= tar.bz2
>  APR_URL		:= http://archive.apache.org/dist/apr/$(APR).$(APR_SUFFIX)
> @@ -37,8 +38,11 @@ APR_CONF_ENV := \
>  	ac_cv_struct_rlimit=yes \
>  	apr_cv_mutex_robust_shared=no \
>  	apr_cv_process_shared_works=yes \
> +	ac_cv_func_setpgrp_void="yes" \
> +	apr_cv_tcp_nodelay_with_cork="yes" \
> +	ac_cv_sizeof_struct_iovec="8" \

I doubt this is true for 64 bit archs. You can either add a proper
autoconf test or make use of PTXCONF_ARCH_LP64

> +	apr_cv_mutex_recursive="yes" \
>  	apr_cv_pthreads_lib="-lpthread"
> -
^^^

please don't remove that line

>  #
>  # autoconf
>  #
> @@ -55,7 +59,7 @@ $(STATEDIR)/apr.install.post:
>  	@$(call targetinfo)
>  	@$(call world/install.post, APR)
>  	sed -i -e "s~@SYSROOT@~${PTXDIST_SYSROOT_TARGET}~g" \
> -		$(PTXDIST_SYSROOT_TARGET)/usr/build/apr_rules.mk
> +		$(PTXDIST_SYSROOT_TARGET)/usr/build-1/apr_rules.mk
>  	@$(call touch)
>  
>  # ----------------------------------------------------------------------------
> @@ -71,7 +75,7 @@ $(STATEDIR)/apr.targetinstall:
>  	@$(call install_fixup, apr,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
>  	@$(call install_fixup, apr,DESCRIPTION,missing)
>  
> -	@$(call install_lib, apr, 0, 0, 0644, libapr-0)
> +	@$(call install_lib, apr, 0, 0, 0644, libapr-1)
>  
>  	@$(call install_finish, apr)

regards,
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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [ptxdist] Antwort: Re:  [PATCH 1/2] apr: version update to 1.5.1
  2015-02-18 10:57 ` [ptxdist] [PATCH 1/2] apr: version update to 1.5.1 Marc Kleine-Budde
@ 2015-02-18 11:48   ` Oliver.Graute
  2015-02-18 12:14     ` Marc Kleine-Budde
  0 siblings, 1 reply; 6+ messages in thread
From: Oliver.Graute @ 2015-02-18 11:48 UTC (permalink / raw)
  To: Marc Kleine-Budde


[-- Attachment #1.1.1: Type: text/plain, Size: 495 bytes --]


> > @@ -37,8 +38,11 @@ APR_CONF_ENV := \
> >     ac_cv_struct_rlimit=yes \
> >     apr_cv_mutex_robust_shared=no \
> >     apr_cv_process_shared_works=yes \
> > +   ac_cv_func_setpgrp_void="yes" \
> > +   apr_cv_tcp_nodelay_with_cork="yes" \
> > +   ac_cv_sizeof_struct_iovec="8" \
>
> I doubt this is true for 64 bit archs. You can either add a proper
> autoconf test or make use of PTXCONF_ARCH_LP64

i don't know how to do that. Which autoconf file need to be adapted?

Best Regards,

Oliver

[-- Attachment #1.1.2: Type: text/html, Size: 761 bytes --]

[-- Attachment #1.2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 2446 bytes --]

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

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] Antwort: Re: [PATCH 1/2] apr: version update to 1.5.1
  2015-02-18 11:48   ` [ptxdist] Antwort: " Oliver.Graute
@ 2015-02-18 12:14     ` Marc Kleine-Budde
  0 siblings, 0 replies; 6+ messages in thread
From: Marc Kleine-Budde @ 2015-02-18 12:14 UTC (permalink / raw)
  To: ptxdist


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

Please keep the list on Cc.

On 02/18/2015 12:48 PM, Oliver.Graute@neuhaus.de wrote:
>> > @@ -37,8 +38,11 @@ APR_CONF_ENV := \
>> >     ac_cv_struct_rlimit=yes \
>> >     apr_cv_mutex_robust_shared=no \
>> >     apr_cv_process_shared_works=yes \
>> > +   ac_cv_func_setpgrp_void="yes" \
>> > +   apr_cv_tcp_nodelay_with_cork="yes" \
>> > +   ac_cv_sizeof_struct_iovec="8" \
>>
>> I doubt this is true for 64 bit archs. You can either add a proper
>> autoconf test or make use of PTXCONF_ARCH_LP64
> 
> i don't know how to do that. Which autoconf file need to be adapted?

You have to replace the following in configure.in:

> APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>                                
> #include <sys/uio.h>],struct iovec,0)                                            

with the proper call to:

> AC_CHECK_SIZEOF

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [ptxdist] [PATCH 2/2] added 0001-apr-gen-test-char.patch
  2015-02-18 10:45 ` [ptxdist] [PATCH 2/2] added 0001-apr-gen-test-char.patch Oliver Graute
@ 2015-02-19 16:12   ` Michael Olbrich
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2015-02-19 16:12 UTC (permalink / raw)
  To: ptxdist

On Wed, Feb 18, 2015 at 11:45:18AM +0100, Oliver Graute wrote:
> 
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
>  patches/apr-1.5.1/0001-apr-gen-test-char.patch |   69 ++++++++++++++++++++++++
>  patches/apr-1.5.1/series                       |    1 +
>  2 files changed, 70 insertions(+)
>  create mode 100644 patches/apr-1.5.1/0001-apr-gen-test-char.patch
>  create mode 100644 patches/apr-1.5.1/series
> 
> diff --git a/patches/apr-1.5.1/0001-apr-gen-test-char.patch b/patches/apr-1.5.1/0001-apr-gen-test-char.patch
> new file mode 100644
> index 0000000..12d47f6
> --- /dev/null
> +++ b/patches/apr-1.5.1/0001-apr-gen-test-char.patch

Proper patch header please.

> @@ -0,0 +1,69 @@
> +diff -rupN AK/apr-config.in AL/apr-config.in
> +--- AK/apr-config.in	2015-02-12 11:36:28.000000000 +0100
> ++++ AL/apr-config.in	2015-02-12 11:44:24.515350580 +0100
> +@@ -200,7 +200,7 @@ while test $# -gt 0; do
> +         ### avoid using -L if libdir is a "standard" location like /usr/lib
> +         # Since the user is specifying they are linking with libtool, we
> +         # *know* that -R will be recognized by libtool.
> +-        flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
> ++        flags="$flags -L@SYSROOT@$libdir -l${APR_LIBNAME}"
> +     else
> +         flags="$flags $LA_FILE"
> +     fi
> +diff -rupN AK/include/private/apr_escape_test_char.h AL/include/private/apr_escape_test_char.h
> +--- AK/include/private/apr_escape_test_char.h	1970-01-01 01:00:00.000000000 +0100
> ++++ AL/include/private/apr_escape_test_char.h	2015-02-12 13:53:10.195232200 +0100

No. This should be generated.

Copy the tool from host-apr. See e.g. host-mesalib/mesalib for an example how to do this.

Michael

> +@@ -0,0 +1,23 @@
> ++/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
> ++#define T_ESCAPE_SHELL_CMD     (1)
> ++#define T_ESCAPE_PATH_SEGMENT  (2)
> ++#define T_OS_ESCAPE_PATH       (4)
> ++#define T_ESCAPE_ECHO          (8)
> ++#define T_ESCAPE_URLENCODED    (16)
> ++#define T_ESCAPE_XML           (32)
> ++
> ++static const unsigned char test_char_table[256] = {
> ++    32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30,
> ++    30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
> ++    17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
> ++    55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> ++    0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
> ++    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> ++    0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
> ++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
> ++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
> ++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
> ++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
> ++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
> ++    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30 
> ++};
> +diff -rupN AK/Makefile.in AL/Makefile.in
> +--- AK/Makefile.in	2014-03-17 16:10:26.000000000 +0100
> ++++ AL/Makefile.in	2015-02-12 15:42:23.506233505 +0100
> +@@ -71,7 +71,7 @@ apr-config.out: $(APR_CONFIG)
> + 
> + # Create apr_rules.mk suitable for the install tree
> + build/apr_rules.out: build/apr_rules.mk
> +-	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
> ++	sed 's,^\(apr_build.*=\).*$$,\1@SYSROOT@$(installbuilddir),' < build/apr_rules.mk > $@
> + 
> + install: $(TARGETS)
> + 	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
> +@@ -132,14 +132,9 @@ etags:
> + make_tools_dir:
> + 	$(APR_MKDIR) tools
> + 
> +-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
> +-tools/gen_test_char.lo: make_tools_dir
> +-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
> +-	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
> +-
> +-include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
> +-	$(APR_MKDIR) include/private
> +-	tools/gen_test_char@EXEEXT@ > $@
> ++#include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
> ++#	$(APR_MKDIR) include/private
> ++#	tools/gen_test_char@EXEEXT@ > $@
> + 
> + LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
> + 	    @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
> diff --git a/patches/apr-1.5.1/series b/patches/apr-1.5.1/series
> new file mode 100644
> index 0000000..9b5a323
> --- /dev/null
> +++ b/patches/apr-1.5.1/series
> @@ -0,0 +1 @@
> +0001-apr-gen-test-char.patch
> -- 
> 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-02-19 16:12 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-18 10:45 [ptxdist] [PATCH 1/2] apr: version update to 1.5.1 Oliver Graute
2015-02-18 10:45 ` [ptxdist] [PATCH 2/2] added 0001-apr-gen-test-char.patch Oliver Graute
2015-02-19 16:12   ` Michael Olbrich
2015-02-18 10:57 ` [ptxdist] [PATCH 1/2] apr: version update to 1.5.1 Marc Kleine-Budde
2015-02-18 11:48   ` [ptxdist] Antwort: " Oliver.Graute
2015-02-18 12:14     ` Marc Kleine-Budde

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox