Patchwork [v4] Add new package apr-util

login
register
mail settings
Submitter Rico Bachmann
Date May 3, 2012, 12:22 p.m.
Message ID <1336047756-1893-1-git-send-email-bachmann@tofwerk.com>
Download mbox | patch
Permalink /patch/156677/
State Accepted
Headers show

Comments

Rico Bachmann - May 3, 2012, 12:22 p.m.
Add new package apr-util

Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
---
v1: Add package apr-util
    Add patch to remove check for apr
    because check for apr search for ./apr and not for defined folder
v2: Change spaces to tab in *.mk
v3: Add Signed-off-by and comments to package-patch
v4: remove prefix, is added by buildroot
---
 package/Config.in                                  |    1 +
 package/apr-util/Config.in                         |   11 ++++++++++
 .../apr-util/apr-util-1.4.1-remove-checkapr.patch  |   21 ++++++++++++++++++++
 package/apr-util/apr-util.mk                       |   13 ++++++++++++
 4 files changed, 46 insertions(+), 0 deletions(-)
 create mode 100644 package/apr-util/Config.in
 create mode 100644 package/apr-util/apr-util-1.4.1-remove-checkapr.patch
 create mode 100644 package/apr-util/apr-util.mk
Peter Korsgaard - May 3, 2012, 9:54 p.m.
>>>>> "Rico" == Rico Bachmann <bachmann@tofwerk.com> writes:

 Rico> Add new package apr-util
 Rico> Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
 Rico> ---
 Rico> v1: Add package apr-util
 Rico>     Add patch to remove check for apr
 Rico>     because check for apr search for ./apr and not for defined folder
 Rico> v2: Change spaces to tab in *.mk
 Rico> v3: Add Signed-off-by and comments to package-patch
 Rico> v4: remove prefix, is added by buildroot
 Rico> ---
 Rico>  package/Config.in                                  |    1 +
 Rico>  package/apr-util/Config.in                         |   11 ++++++++++
 Rico>  .../apr-util/apr-util-1.4.1-remove-checkapr.patch  |   21 ++++++++++++++++++++
 Rico>  package/apr-util/apr-util.mk                       |   13 ++++++++++++
 Rico>  4 files changed, 46 insertions(+), 0 deletions(-)
 Rico>  create mode 100644 package/apr-util/Config.in
 Rico>  create mode 100644 package/apr-util/apr-util-1.4.1-remove-checkapr.patch
 Rico>  create mode 100644 package/apr-util/apr-util.mk

 Rico> diff --git a/package/Config.in b/package/Config.in
 Rico> index ed66c05..caa618b 100644
 Rico> --- a/package/Config.in
 Rico> +++ b/package/Config.in
 Rico> @@ -379,6 +379,7 @@ endmenu
 
 Rico>  menu "Other"
 Rico>  source "package/apr/Config.in"
 Rico> +source "package/apr-util/Config.in"
 Rico>  source "package/fftw/Config.in"
 Rico>  source "package/libargtable2/Config.in"
 Rico>  source "package/argp-standalone/Config.in"
 Rico> diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in
 Rico> new file mode 100644
 Rico> index 0000000..45973b2
 Rico> --- /dev/null
 Rico> +++ b/package/apr-util/Config.in
 Rico> @@ -0,0 +1,11 @@
 Rico> +config BR2_PACKAGE_APR_UTIL
 Rico> +	bool "apr-util"
 Rico> +	select BR2_PACKAGE_APR
 Rico> +	select BR2_PACKAGE_SQLITE
 Rico> +	select BR2_PACKAGE_LIBNEON

It is BR2_PACKAGE_NEON, not LIBNEON.

Other than that it looks good, committed - Thanks.

Patch

diff --git a/package/Config.in b/package/Config.in
index ed66c05..caa618b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -379,6 +379,7 @@  endmenu
 
 menu "Other"
 source "package/apr/Config.in"
+source "package/apr-util/Config.in"
 source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in
new file mode 100644
index 0000000..45973b2
--- /dev/null
+++ b/package/apr-util/Config.in
@@ -0,0 +1,11 @@ 
+config BR2_PACKAGE_APR_UTIL
+	bool "apr-util"
+	select BR2_PACKAGE_APR
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_LIBNEON
+	select BR2_PACKAGE_NEON_ZLIB
+	select BR2_PACKAGE_ZLIB
+	help
+	  The utility library for the apache runtime project
+
+	  http://apr.apache.org/
diff --git a/package/apr-util/apr-util-1.4.1-remove-checkapr.patch b/package/apr-util/apr-util-1.4.1-remove-checkapr.patch
new file mode 100644
index 0000000..42ad12f
--- /dev/null
+++ b/package/apr-util/apr-util-1.4.1-remove-checkapr.patch
@@ -0,0 +1,21 @@ 
+remove check apr
+
+this patch removes the check of apr which fails the build
+
+Signed-off-by: Rico Bachmann <bachmann-ahF9wiJNQgNBDgjK7y7TUQ@public.gmane.org>
+---
+v1: disable the check for APU_FIND_APR because the check only looks into folders
+named apr, and our source-tree is called apr-versionnumber (e.g. apr-1.4.6)
+
+diff -rupN apr-util-1.4.1/configure.in apr-util-1.4.1-fix/configure.in
+--- apr-util-1.4.1/configure.in	2009-12-17 20:15:19.000000000 +0100
++++ apr-util-1.4.1-fix/configure.in	2012-04-24 10:10:32.000000000 +0200
+@@ -99,7 +99,7 @@ fi
+ dnl
+ dnl Find the APR includes directory and (possibly) the source (base) dir.
+ dnl
+-APU_FIND_APR
++dnl APU_FIND_APR
+ 
+ dnl
+ dnl even though we use apr_rules.mk for building apr-util, we need
diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
new file mode 100644
index 0000000..564b1bb
--- /dev/null
+++ b/package/apr-util/apr-util.mk
@@ -0,0 +1,13 @@ 
+#############################################################
+#
+# apr-util
+#
+#############################################################
+APR_UTIL_VERSION = 1.4.1
+APR_UTIL_SITE = http://archive.apache.org/dist/apr
+APR_UTIL_INSTALL_STAGING = YES
+APR_UTIL_DEPENDENCIES = apr sqlite neon zlib
+APR_UTIL_CONF_OPT = \
+	--with-apr=$(BUILD_DIR)/apr-$(APR_VERSION) \
+
+$(eval $(call AUTOTARGETS))