From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 6/9] apr: various improvements
Date: Sun, 24 Mar 2013 19:19:27 +0100 [thread overview]
Message-ID: <1364149170-5521-7-git-send-email-thomas.petazzoni@free-electrons.com> (raw)
In-Reply-To: <1364149170-5521-1-git-send-email-thomas.petazzoni@free-electrons.com>
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>
---
package/apr/apr.mk | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/package/apr/apr.mk b/package/apr/apr.mk
index e502490..a9dcb40 100644
--- a/package/apr/apr.mk
+++ b/package/apr/apr.mk
@@ -5,6 +5,8 @@
#############################################################
APR_VERSION = 1.4.6
APR_SITE = http://archive.apache.org/dist/apr
+APR_LICENSE = Apache-2.0
+APR_LICENSE_FILES = LICENSE
APR_INSTALL_STAGING = YES
APR_CONF_ENV = \
ac_cv_file__dev_zero=yes \
@@ -14,5 +16,21 @@ APR_CONF_ENV = \
apr_cv_tcp_nodelay_with_cork=yes \
ac_cv_sizeof_struct_iovec=8 \
apr_cv_mutex_recursive=yes
+APR_CONFIG_SCRIPTS = apr-1-config
+
+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
+endef
+
+APR_POST_INSTALL_STAGING_HOOKS += APR_FIXUP_RULES_MK
$(eval $(autotools-package))
--
1.7.9.5
next prev parent reply other threads:[~2013-03-24 18:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 1/9] rt-tests: mention that NPTL thread implementation is needed Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 2/9] dtach: new package Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 3/9] gd: add patch to fix gdlib-config script Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 4/9] gnuplot: new package Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 5/9] neon: add license informations Thomas Petazzoni
2013-03-24 18:19 ` Thomas Petazzoni [this message]
2013-03-24 18:19 ` [Buildroot] [PATCH 7/9] apr-util: various improvements Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 8/9] log4cxx: new package Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 9/9] xcursor-transparent-theme: " Thomas Petazzoni
2013-03-24 19:40 ` [Buildroot] Misc set of patches, from Patchwork Day Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364149170-5521-7-git-send-email-thomas.petazzoni@free-electrons.com \
--to=thomas.petazzoni@free-electrons.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.