From patchwork Thu May 3 12:22:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rico Bachmann X-Patchwork-Id: 156677 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 24E61B6FAF for ; Thu, 3 May 2012 22:23:10 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4A2B0100CB1; Thu, 3 May 2012 12:23:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i-bB+WVCGDTG; Thu, 3 May 2012 12:23:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3218E100EBD; Thu, 3 May 2012 12:23:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 683F88F753 for ; Thu, 3 May 2012 12:23:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 59389100EBD for ; Thu, 3 May 2012 12:23:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q4sbZx7f-UJe for ; Thu, 3 May 2012 12:23:04 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mxout1.bln1.prohost.de (mxout1.bln1.prohost.de [213.160.84.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 51608100CB1 for ; Thu, 3 May 2012 12:23:03 +0000 (UTC) Received: from localhost.localdomain (52-134.107-92.cust.bluewin.ch [92.107.134.52]) (authenticated bits=0) by mx1.bln1.prohost.de (8.14.1/8.14.1) with ESMTP id q43CMvDu029548; Thu, 3 May 2012 14:22:58 +0200 From: Rico Bachmann To: buildroot@uclibc.org Date: Thu, 3 May 2012 14:22:36 +0200 Message-Id: <1336047756-1893-1-git-send-email-bachmann@tofwerk.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <201204272309.51623.arnout@mind.be> References: <201204272309.51623.arnout@mind.be> X-Null-Tag: d39d38da9ce5016dbda629ecee7b9443 Cc: Rico Bachmann Subject: [Buildroot] [PATCH v4] Add new package apr-util X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Add new package apr-util Signed-off-by: Rico Bachmann --- 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 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 +--- +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))