On Wed, Feb 18, 2015 at 11:45:18AM +0100, Oliver Graute wrote:
>
> Signed-off-by: Oliver Graute <[email protected]>
> ---
> 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
> [email protected]
>
--
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
[email protected]
