* [ptxdist] [PATCHv2 1/2] apr: version updated to 1.5.1
@ 2015-03-04 9:59 Oliver Graute
2015-03-04 9:59 ` [ptxdist] [PATCHv2 2/2] apr: added patches for apr-1.5.1 Oliver Graute
2015-03-04 10:02 ` [ptxdist] [PATCHv2 1/2] apr: version updated to 1.5.1 Marc Kleine-Budde
0 siblings, 2 replies; 4+ messages in thread
From: Oliver Graute @ 2015-03-04 9:59 UTC (permalink / raw)
To: ptxdist; +Cc: Oliver Graute
This is a version bump to apr 1.5.1 its a required by apache 2.4
Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
rules/apr.make | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/rules/apr.make b/rules/apr.make
index 9c3b11d..a287859 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,6 +38,10 @@ 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"
#
@@ -55,7 +60,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 +76,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] 4+ messages in thread
* [ptxdist] [PATCHv2 2/2] apr: added patches for apr-1.5.1
2015-03-04 9:59 [ptxdist] [PATCHv2 1/2] apr: version updated to 1.5.1 Oliver Graute
@ 2015-03-04 9:59 ` Oliver Graute
2015-03-04 10:04 ` Marc Kleine-Budde
2015-03-04 10:02 ` [ptxdist] [PATCHv2 1/2] apr: version updated to 1.5.1 Marc Kleine-Budde
1 sibling, 1 reply; 4+ messages in thread
From: Oliver Graute @ 2015-03-04 9:59 UTC (permalink / raw)
To: ptxdist; +Cc: Oliver Graute
patches to compile apr on arm platform
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/0002-ac-check-sizeof.patch | 22 +++++++
patches/apr-1.5.1/0003-Makefile-in.patch | 84 ++++++++++++++++++++++++
patches/apr-1.5.1/series | 2 +
4 files changed, 177 insertions(+)
create mode 100644 patches/apr-1.5.1/0001-apr-gen-test-char.patch
create mode 100644 patches/apr-1.5.1/0002-ac-check-sizeof.patch
create mode 100644 patches/apr-1.5.1/0003-Makefile-in.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/0002-ac-check-sizeof.patch b/patches/apr-1.5.1/0002-ac-check-sizeof.patch
new file mode 100644
index 0000000..225ed54
--- /dev/null
+++ b/patches/apr-1.5.1/0002-ac-check-sizeof.patch
@@ -0,0 +1,22 @@
+diff -rupN AV/configure.in AU/configure.in
+--- AV/configure.in 2015-02-18 13:35:04.619502605 +0100
++++ AU/configure.in 2014-01-25 16:17:29.000000000 +0100
+@@ -1693,8 +1693,7 @@ else
+ socklen_t_value="int"
+ fi
+
+-AC_CHECK_SIZEOF([#include <sys/types.h>], pid_t, 8)
+-
++APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8)
+
+ if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
+ pid_t_fmt='#define APR_PID_T_FMT "hd"'
+@@ -1797,7 +1796,7 @@ fi
+
+ size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
+
+-AC_CHECK_SIZEOF([#include <sys/types.h>], off_t, 8)
++APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
+
+ if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
+ # Enable LFS
diff --git a/patches/apr-1.5.1/0003-Makefile-in.patch b/patches/apr-1.5.1/0003-Makefile-in.patch
new file mode 100644
index 0000000..5435df9
--- /dev/null
+++ b/patches/apr-1.5.1/0003-Makefile-in.patch
@@ -0,0 +1,84 @@
+diff -rupN AY/include/apr_hash.h AZ/include/apr_hash.h
+--- AY/include/apr_hash.h 2015-02-27 10:35:07.436548295 +0100
++++ AZ/include/apr_hash.h 2015-02-27 10:33:30.038497258 +0100
+@@ -171,21 +171,21 @@ APR_DECLARE(void) apr_hash_this(apr_hash
+ * @param hi The iteration state
+ * @return The pointer to the key
+ */
+-APR_DECLARE(const void*) apr_hash_this_key(apr_hash_index_t *hi);
++//APR_DECLARE(const void*) apr_hash_this_key(apr_hash_index_t *hi);
+
+ /**
+ * Get the current entry's key length from the iteration state.
+ * @param hi The iteration state
+ * @return The key length
+ */
+-APR_DECLARE(apr_ssize_t) apr_hash_this_key_len(apr_hash_index_t *hi);
++//APR_DECLARE(apr_ssize_t) apr_hash_this_key_len(apr_hash_index_t *hi);
+
+ /**
+ * Get the current entry's value from the iteration state.
+ * @param hi The iteration state
+ * @return The pointer to the value
+ */
+-APR_DECLARE(void*) apr_hash_this_val(apr_hash_index_t *hi);
++//APR_DECLARE(void*) apr_hash_this_val(apr_hash_index_t *hi);
+
+ /**
+ * Get the number of key/value pairs in the hash table.
+diff -rupN AY/include/apr_network_io.h AZ/include/apr_network_io.h
+--- AY/include/apr_network_io.h 2013-12-06 18:10:34.000000000 +0100
++++ AZ/include/apr_network_io.h 2015-02-27 11:50:10.847966181 +0100
+@@ -730,7 +730,7 @@ APR_DECLARE(int) apr_sockaddr_equal(cons
+ * @remark The return value will be non-zero if the address is
+ * initialized and is the wildcard address.
+ */
+-APR_DECLARE(int) apr_sockaddr_is_wildcard(const apr_sockaddr_t *addr);
++//APR_DECLARE(int) apr_sockaddr_is_wildcard(const apr_sockaddr_t *addr);
+
+ /**
+ * Return the type of the socket.
+diff -rupN AY/include/apr_shm.h AZ/include/apr_shm.h
+--- AY/include/apr_shm.h 2015-02-27 12:00:01.119541200 +0100
++++ AZ/include/apr_shm.h 2015-02-27 12:02:01.294089137 +0100
+@@ -111,12 +111,12 @@ APR_DECLARE(apr_status_t) apr_shm_create
+ * function will return the first usable byte of memory.
+ *
+ */
+-APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m,
++/*APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m,
+ apr_size_t reqsize,
+ const char *filename,
+ apr_pool_t *pool,
+ apr_int32_t flags);
+-
++*/
+ /**
+ * Remove named resource associated with a shared memory segment,
+ * preventing attachments to the resource, but not destroying it.
+@@ -164,11 +164,11 @@ APR_DECLARE(apr_status_t) apr_shm_attach
+ * structure for this process.
+ * @param flags mask of APR_SHM_* (defined above)
+ */
+-APR_DECLARE(apr_status_t) apr_shm_attach_ex(apr_shm_t **m,
++/*APR_DECLARE(apr_status_t) apr_shm_attach_ex(apr_shm_t **m,
+ const char *filename,
+ apr_pool_t *pool,
+ apr_int32_t flags);
+-
++*/
+ /**
+ * Detach from a shared memory segment without destroying it.
+ * @param m The shared memory structure representing the segment
+diff -rupN AY/Makefile.in AZ/Makefile.in
+--- AY/Makefile.in 2015-02-27 10:17:32.817392979 +0100
++++ AZ/Makefile.in 2015-02-27 10:17:44.075619396 +0100
+@@ -113,7 +113,7 @@ apr.exp: exports.c export_vars.c
+ @echo "#! lib@APR_LIBNAME@.so" > $@
+ @echo "* This file was AUTOGENERATED at build time." >> $@
+ @echo "* Please do not edit by hand." >> $@
+- $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
++ #$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
+ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.c | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
+
+ dox:
diff --git a/patches/apr-1.5.1/series b/patches/apr-1.5.1/series
new file mode 100644
index 0000000..b1cb577
--- /dev/null
+++ b/patches/apr-1.5.1/series
@@ -0,0 +1,2 @@
+0001-apr-gen-test-char.patch
+0003-Makefile-in.patch
--
1.7.9.5
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCHv2 1/2] apr: version updated to 1.5.1
2015-03-04 9:59 [ptxdist] [PATCHv2 1/2] apr: version updated to 1.5.1 Oliver Graute
2015-03-04 9:59 ` [ptxdist] [PATCHv2 2/2] apr: added patches for apr-1.5.1 Oliver Graute
@ 2015-03-04 10:02 ` Marc Kleine-Budde
1 sibling, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2015-03-04 10:02 UTC (permalink / raw)
To: ptxdist; +Cc: Oliver Graute
[-- Attachment #1.1: Type: text/plain, Size: 1675 bytes --]
On 03/04/2015 10:59 AM, Oliver Graute wrote:
> This is a version bump to apr 1.5.1 its a required by apache 2.4
>
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
> rules/apr.make | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/rules/apr.make b/rules/apr.make
> index 9c3b11d..a287859 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,6 +38,10 @@ 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" \
This is not true for 64 bit Arch.
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] 4+ messages in thread
* Re: [ptxdist] [PATCHv2 2/2] apr: added patches for apr-1.5.1
2015-03-04 9:59 ` [ptxdist] [PATCHv2 2/2] apr: added patches for apr-1.5.1 Oliver Graute
@ 2015-03-04 10:04 ` Marc Kleine-Budde
0 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2015-03-04 10:04 UTC (permalink / raw)
To: ptxdist; +Cc: Oliver Graute
[-- Attachment #1.1: Type: text/plain, Size: 5690 bytes --]
On 03/04/2015 10:59 AM, Oliver Graute wrote:
> patches to compile apr on arm platform
>
> 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/0002-ac-check-sizeof.patch | 22 +++++++
> patches/apr-1.5.1/0003-Makefile-in.patch | 84 ++++++++++++++++++++++++
> patches/apr-1.5.1/series | 2 +
> 4 files changed, 177 insertions(+)
> create mode 100644 patches/apr-1.5.1/0001-apr-gen-test-char.patch
> create mode 100644 patches/apr-1.5.1/0002-ac-check-sizeof.patch
> create mode 100644 patches/apr-1.5.1/0003-Makefile-in.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}"
I think this is done automatically during the install stage.
> + 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/0002-ac-check-sizeof.patch b/patches/apr-1.5.1/0002-ac-check-sizeof.patch
> new file mode 100644
> index 0000000..225ed54
> --- /dev/null
> +++ b/patches/apr-1.5.1/0002-ac-check-sizeof.patch
> @@ -0,0 +1,22 @@
> +diff -rupN AV/configure.in AU/configure.in
> +--- AV/configure.in 2015-02-18 13:35:04.619502605 +0100
> ++++ AU/configure.in 2014-01-25 16:17:29.000000000 +0100
> +@@ -1693,8 +1693,7 @@ else
> + socklen_t_value="int"
> + fi
> +
> +-AC_CHECK_SIZEOF([#include <sys/types.h>], pid_t, 8)
> +-
> ++APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8)
Why do you replace the standard AC_CHECK_SIZEOF by the non standard
APR_CHECK_SIZEOF_EXTENDED?
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] 4+ messages in thread
end of thread, other threads:[~2015-03-04 10:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-04 9:59 [ptxdist] [PATCHv2 1/2] apr: version updated to 1.5.1 Oliver Graute
2015-03-04 9:59 ` [ptxdist] [PATCHv2 2/2] apr: added patches for apr-1.5.1 Oliver Graute
2015-03-04 10:04 ` Marc Kleine-Budde
2015-03-04 10:02 ` [ptxdist] [PATCHv2 1/2] apr: version updated to 1.5.1 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