* [ptxdist] [PATCH 1/3] apache2: first try to update apache apr and apr-util @ 2015-02-16 13:59 Oliver Graute 2015-02-16 13:59 ` [ptxdist] [PATCH 2/3] added apr-gen-test-char.patch Oliver Graute 2015-02-16 13:59 ` [ptxdist] [PATCH 3/3] added apu-config-add-SYSROOT.patch Oliver Graute 0 siblings, 2 replies; 3+ messages in thread From: Oliver Graute @ 2015-02-16 13:59 UTC (permalink / raw) To: ptxdist; +Cc: Oliver Graute This is request for a first patch review. first try to update apache2, apr and apr-util to a recent versions Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de> --- rules/apache2.in | 1 - rules/apache2.make | 11 +++++++---- rules/apr-util.in | 1 - rules/apr-util.make | 9 +++++---- rules/apr.make | 13 ++++++++----- 5 files changed, 20 insertions(+), 15 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 select LIBC_M select LIBC_RT select LIBC_DL diff --git a/rules/apache2.make b/rules/apache2.make index 98b628e..258f870 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -17,8 +17,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) @@ -38,8 +38,11 @@ APACHE2_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --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 \ + --with-expat=$(PTXDIST_SYSROOT_TARGET)/usr/include/apr-1 + --with-ssl=$(PTXDIST_SYSROOT_TARGET)/usr/lib/ssl \ + --enable-ssl=shared ifdef PTXCONF_APACHE2_MPM_PREFORK APACHE2_CONF_OPT += --with-mpm=prefork 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..3f3e401 100644 --- a/rules/apr-util.make +++ b/rules/apr-util.make @@ -16,8 +16,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) @@ -35,9 +35,10 @@ APR_UTIL_LICENSE := APLv2 APR_UTIL_CONF_TOOL := autoconf APR_UTIL_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \ + --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-1-config \ --with-expat=$(PTXDIST_SYSROOT_TARGET)/usr + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -51,7 +52,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) diff --git a/rules/apr.make b/rules/apr.make index 9c3b11d..00b84e0 100644 --- a/rules/apr.make +++ b/rules/apr.make @@ -16,8 +16,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 +37,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 +58,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 +74,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] 3+ messages in thread
* [ptxdist] [PATCH 2/3] added apr-gen-test-char.patch 2015-02-16 13:59 [ptxdist] [PATCH 1/3] apache2: first try to update apache apr and apr-util Oliver Graute @ 2015-02-16 13:59 ` Oliver Graute 2015-02-16 13:59 ` [ptxdist] [PATCH 3/3] added apu-config-add-SYSROOT.patch Oliver Graute 1 sibling, 0 replies; 3+ messages in thread From: Oliver Graute @ 2015-02-16 13:59 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] 3+ messages in thread
* [ptxdist] [PATCH 3/3] added apu-config-add-SYSROOT.patch 2015-02-16 13:59 [ptxdist] [PATCH 1/3] apache2: first try to update apache apr and apr-util Oliver Graute 2015-02-16 13:59 ` [ptxdist] [PATCH 2/3] added apr-gen-test-char.patch Oliver Graute @ 2015-02-16 13:59 ` Oliver Graute 1 sibling, 0 replies; 3+ messages in thread From: Oliver Graute @ 2015-02-16 13:59 UTC (permalink / raw) To: ptxdist; +Cc: 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-16 14:00 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-02-16 13:59 [ptxdist] [PATCH 1/3] apache2: first try to update apache apr and apr-util Oliver Graute 2015-02-16 13:59 ` [ptxdist] [PATCH 2/3] added apr-gen-test-char.patch Oliver Graute 2015-02-16 13:59 ` [ptxdist] [PATCH 3/3] added apu-config-add-SYSROOT.patch Oliver Graute
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox