NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2b5e835dcd
kumquat-buildroot/package/apr/apr.mk

77 lines
2.2 KiB
Makefile
Raw Normal View History

Normalize separator size to 80 Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 01:53:30 +02:00
################################################################################
Add apr-package Signed-off-by: Rico Bachmann <bachmann@tofwerk.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-17 16:35:16 +02:00
#
# apr
#
Normalize separator size to 80 Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 01:53:30 +02:00
################################################################################
Fix package headers to comply with coding style Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 01:53:25 +02:00
package/apr: bump version to 1.7.0 Release notes: http://www.apache.org/dist/apr/CHANGES-APR-1.7 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-08-25 18:45:56 +02:00
APR_VERSION = 1.7.0
package/apr: bump version to 1.5.2 Rebased patch 0001 and changed _SOURCE to .tar.bz2. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-05-21 17:21:04 +02:00
APR_SOURCE = apr-$(APR_VERSION).tar.bz2
Add apr-package Signed-off-by: Rico Bachmann <bachmann@tofwerk.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-17 16:35:16 +02:00
APR_SITE = http://archive.apache.org/dist/apr
apr: various improvements This commit: * Adds licensing informations * Ensures the apr-1-config script gets fixed appropriately * Remove the usr/build-1/ directory from the target, since it is only used during the compilation of packages that rely on APR. * Fix up a few paths in usr/build-1/ so that the compilation of apr-util works properly on top of this apr package. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-24 09:19:27 +01:00
APR_LICENSE = Apache-2.0
APR_LICENSE_FILES = LICENSE
Add apr-package Signed-off-by: Rico Bachmann <bachmann@tofwerk.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-17 16:35:16 +02:00
APR_INSTALL_STAGING = YES
package/apr: Bump version to 1.5.1 apr-0001-cross-compile.patch: Fix cross compilation Fix top_builddir in usr/build-1/apr_rules.mk [Thomas: rename apr-0001-cross-compile.patch to 0001-cross-compile.patch.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-05 19:39:00 +02:00
# We have a patch touching configure.in and Makefile.in,
# so we need to autoreconf:
APR_AUTORECONF = YES
package/apr: Add libuuid as optional dependency libuuid is picked up by apr when present: Checking for OS UUID Support... checking uuid/uuid.h usability... yes checking uuid/uuid.h presence... yes checking for uuid/uuid.h... yes checking for library containing uuid_generate... -luuid checking for uuid_generate... yes checking for os uuid usability... yes $ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/lib/libapr-1.so | grep libuuid 0x00000001 (NEEDED) Shared library: [libuuid.so.1] [Thomas: move the added chunk a bit further down, and use += instead of =.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-05-21 19:19:08 +02:00
Add apr-package Signed-off-by: Rico Bachmann <bachmann@tofwerk.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-17 16:35:16 +02:00
APR_CONF_ENV = \
package/apr: Bump version to 1.5.1 apr-0001-cross-compile.patch: Fix cross compilation Fix top_builddir in usr/build-1/apr_rules.mk [Thomas: rename apr-0001-cross-compile.patch to 0001-cross-compile.patch.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-05 19:39:00 +02:00
CC_FOR_BUILD="$(HOSTCC)" \
CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
Add apr-package Signed-off-by: Rico Bachmann <bachmann@tofwerk.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-17 16:35:16 +02:00
ac_cv_file__dev_zero=yes \
ac_cv_func_setpgrp_void=yes \
apr_cv_process_shared_works=yes \
apr_cv_mutex_robust_shared=no \
apr_cv_tcp_nodelay_with_cork=yes \
ac_cv_sizeof_struct_iovec=8 \
apr: fix size of pid_t pid_t is a signed 32bits integer on both 32bits and 64bits architectures. This fixes an issue with apache server which causes bad pid to be written in PidFile Signed-off-by: Julien Beraud <julien.beraud@spectracom.orolia.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-21 14:23:56 +01:00
ac_cv_sizeof_pid_t=4 \
package/apr: Fix detection of rlimit and large file support Snippets from configure log: before: checking whether to enable -D_LARGEFILE64_SOURCE... no ... checking struct rlimit... no after checking whether to enable -D_LARGEFILE64_SOURCE... (cached) yes ... checking struct rlimit... (cached) yes Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-05 19:38:49 +02:00
ac_cv_struct_rlimit=yes \
package/apr: Fix for Apache when listening to multiple ports For details: https://issues.apache.org/bugzilla/show_bug.cgi?id=56727#c6 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-05 19:39:01 +02:00
ac_cv_o_nonblock_inherited=no \
apr: fix runtime tests for cross compile - epoll supported since linux-2.5.44/glibc-2.3.2 (see [1]) - dup3 supported since linux-2.6.27/glibc-2.9 (see [2]) - SOCK_CLOEXEC supported on linux (see [3]) - accept4 suppported since linux-2.6.28/glibc-2.10 (see [4]) Fixes [5] apache runtime failure (#11576) [mpm_event:crit] [pid 173:tid 1996214272] (70023)This function has not been implemented on this platform: AH00495: Couldn't create a Thread Safe Pollset. Is it supported on your platform?Also check system or user limits! [:emerg] [pid 173:tid 1996214272] AH00017: Pre-configuration failed, exiting [1] http://man7.org/linux/man-pages/man7/epoll.7.html [2] https://linux.die.net/man/2/dup3 [4] https://linux.die.net/man/2/accept4 [5] https://bugs.busybox.net/show_bug.cgi?id=11576 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2019-01-17 20:36:30 +01:00
apr_cv_mutex_recursive=yes \
apr_cv_epoll=yes \
apr_cv_epoll_create1=yes \
apr_cv_dup3=yes \
apr_cv_sock_cloexec=yes \
apr_cv_accept4=yes
apr: various improvements This commit: * Adds licensing informations * Ensures the apr-1-config script gets fixed appropriately * Remove the usr/build-1/ directory from the target, since it is only used during the compilation of packages that rely on APR. * Fix up a few paths in usr/build-1/ so that the compilation of apr-util works properly on top of this apr package. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-24 09:19:27 +01:00
APR_CONFIG_SCRIPTS = apr-1-config
apr: fix threading lib detection apr's configure doesn't try to guess which library is needed for threading when cross-compiling hence this is never reflected in apr-1-config, leading to a build failure such as: http://autobuild.buildroot.net/results/035/035a00de0a56be00559767ba822a396ddc18a9fb/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-27 13:53:04 +01:00
# Doesn't even try to guess when cross compiling
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
APR_CONF_ENV += apr_cv_pthreads_lib="-lpthread"
endif
package/apr: Fix detection of rlimit and large file support Snippets from configure log: before: checking whether to enable -D_LARGEFILE64_SOURCE... no ... checking struct rlimit... no after checking whether to enable -D_LARGEFILE64_SOURCE... (cached) yes ... checking struct rlimit... (cached) yes Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-05 19:38:49 +02:00
# Fix lfs detection when cross compiling
APR_CONF_ENV += apr_cv_use_lfs64=yes
package/apr: fix non-portable atomics apr-1.7.0 added support for 8 bytes atomics for 32 bit archs https://github.com/apache/apr/commit/2f61f960c81e4a45f3849baa7563812e7e526436 We need to adjust our _CONF_OPTS which fixes an apache build error. Fixes: http://autobuild.buildroot.net/results/f24/f2461c1ed542e050afd761db5faeaaff1f51775b/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Reviewed-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-09-04 21:33:15 +02:00
# Use non-portable atomics when available. We have to override
# ap_cv_atomic_builtins because the test used to check for atomic
# builtins uses AC_TRY_RUN, which doesn't work when cross-compiling.
ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8),y)
apache, apr: fix atomic handling Since the apache package was introduced, --enable-nonportable-atomics=yes was passed when BR2_ARCH_HAS_ATOMICS. However, Apache doesn't take this option: it only passes it down when building the APR library. But since we're building APR separately, this statement had no effect. So this commit removes the useless code from the Apache package, and instead adds the appropriate logic to the apr package, using the new BR2_TOOLCHAIN_HAS_SYNC_x symbols rather than BR2_ARCH_HAS_ATOMICS. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
2016-02-02 16:31:24 +01:00
APR_CONF_OPTS += --enable-nonportable-atomics
APR_CONF_ENV += ap_cv_atomic_builtins=yes
else
APR_CONF_OPTS += --disable-nonportable-atomics
endif
package/apr: Add libuuid as optional dependency libuuid is picked up by apr when present: Checking for OS UUID Support... checking uuid/uuid.h usability... yes checking uuid/uuid.h presence... yes checking for uuid/uuid.h... yes checking for library containing uuid_generate... -luuid checking for uuid_generate... yes checking for os uuid usability... yes $ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/lib/libapr-1.so | grep libuuid 0x00000001 (NEEDED) Shared library: [libuuid.so.1] [Thomas: move the added chunk a bit further down, and use += instead of =.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-05-21 19:19:08 +02:00
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
APR_DEPENDENCIES += util-linux
endif
apr: various improvements This commit: * Adds licensing informations * Ensures the apr-1-config script gets fixed appropriately * Remove the usr/build-1/ directory from the target, since it is only used during the compilation of packages that rely on APR. * Fix up a few paths in usr/build-1/ so that the compilation of apr-util works properly on top of this apr package. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-24 09:19:27 +01:00
define APR_CLEANUP_UNNEEDED_FILES
$(RM) -rf $(TARGET_DIR)/usr/build-1/
endef
APR_POST_INSTALL_TARGET_HOOKS += APR_CLEANUP_UNNEEDED_FILES
define APR_FIXUP_RULES_MK
$(SED) 's%apr_builddir=%apr_builddir=$(STAGING_DIR)%' \
$(STAGING_DIR)/usr/build-1/apr_rules.mk
$(SED) 's%apr_builders=%apr_builders=$(STAGING_DIR)%' \
$(STAGING_DIR)/usr/build-1/apr_rules.mk
package/apr: Bump version to 1.5.1 apr-0001-cross-compile.patch: Fix cross compilation Fix top_builddir in usr/build-1/apr_rules.mk [Thomas: rename apr-0001-cross-compile.patch to 0001-cross-compile.patch.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-05 19:39:00 +02:00
$(SED) 's%top_builddir=%top_builddir=$(STAGING_DIR)%' \
$(STAGING_DIR)/usr/build-1/apr_rules.mk
apr: various improvements This commit: * Adds licensing informations * Ensures the apr-1-config script gets fixed appropriately * Remove the usr/build-1/ directory from the target, since it is only used during the compilation of packages that rely on APR. * Fix up a few paths in usr/build-1/ so that the compilation of apr-util works properly on top of this apr package. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-24 09:19:27 +01:00
endef
APR_POST_INSTALL_STAGING_HOOKS += APR_FIXUP_RULES_MK
Add apr-package Signed-off-by: Rico Bachmann <bachmann@tofwerk.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-17 16:35:16 +02:00
all packages: rename XXXTARGETS to xxx-package Also remove the redundant $(call ...). This is a purely mechanical change, performed with find package linux toolchain boot -name \*.mk | \ xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \ -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \ -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-03 00:07:32 +02:00
$(eval $(autotools-package))
Reference in New Issue Copy Permalink