Patchwork [4/7] apr-util: Upgrade to 1.3.12

login
register
mail settings
Submitter Zhai, Edwin
Date July 28, 2011, 1:03 p.m.
Message ID <dbe75b1d05a85f17c749a45fdfbca0025c481c24.1311858056.git.edwin.zhai@intel.com>
Download mbox | patch
Permalink /patch/8793/
State New, archived
Headers show

Comments

Zhai, Edwin - July 28, 2011, 1:03 p.m.
From: Zhai Edwin <edwin.zhai@intel.com>

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../apr/{apr-util_1.3.10.bb => apr-util_1.3.12.bb} |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
 rename meta/recipes-support/apr/{apr-util_1.3.10.bb => apr-util_1.3.12.bb} (74%)
Khem Raj - July 30, 2011, 6:48 p.m.
On Thursday, July 28, 2011 09:03:06 PM edwin.zhai@intel.com wrote:
> From: Zhai Edwin <edwin.zhai@intel.com>
> 
> Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
> ---
>  .../apr/{apr-util_1.3.10.bb => apr-util_1.3.12.bb} |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
>  rename meta/recipes-support/apr/{apr-util_1.3.10.bb => apr-util_1.3.12.bb}
> (74%)
> 
> diff --git a/meta/recipes-support/apr/apr-util_1.3.10.bb
> b/meta/recipes-support/apr/apr-util_1.3.12.bb similarity index 74%
> rename from meta/recipes-support/apr/apr-util_1.3.10.bb
> rename to meta/recipes-support/apr/apr-util_1.3.12.bb
> index 7071b90..8e9fd61 100644
> --- a/meta/recipes-support/apr/apr-util_1.3.10.bb
> +++ b/meta/recipes-support/apr/apr-util_1.3.12.bb
> @@ -13,8 +13,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
>             file://configfix.patch;patch=1 \
>             file://configure_fixes.patch;patch=1"
> 
> -SRC_URI[md5sum] = "82acd25cf3df8c72eba44eaee8b80c19"
> -SRC_URI[sha256sum] =
> "7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23"
> +SRC_URI[md5sum] = "d1977289889592ef998e3f777f68efe4"
> +SRC_URI[sha256sum] =
> "815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8"
> 
>  EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
>  		--without-odbc \
> @@ -33,3 +33,7 @@ do_configure_prepend() {
>  	cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
>  }
> 
> +FILES_${PN}-dev += "${libdir}/aprutil.exp"
> +FILES_${PN}     += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so"
> +FILES_${PN}-dbg += "${libdir}/apr-util-1/* ${libdir}/apr-util-1/.debug/*"

do you really want ${libdir}/apr-util-1/* wildcard to go into a dbg package 
here ?
> +
Zhai, Edwin - Aug. 2, 2011, 7:53 a.m.
Khem Raj wrote:
>
> On Thursday, July 28, 2011 09:03:06 PM edwin.zhai@intel.com wrote:
> >
> >
> > +FILES_${PN}-dev += "${libdir}/aprutil.exp"
> > +FILES_${PN}     += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so"
> > +FILES_${PN}-dbg += "${libdir}/apr-util-1/* 
> ${libdir}/apr-util-1/.debug/*"
>
> do you really want ${libdir}/apr-util-1/* wildcard to go into a dbg 
> package
> here ?
>

2nd thought make them into dev package like following:

+FILES_${PN}     += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so"
+FILES_${PN}-dev += "${libdir}/aprutil.exp 
${libdir}/apr-util-1/apr_dbm_gdbm.*"
+FILES_${PN}-dbg += "${libdir}/apr-util-1/.debug/*"


> > +
> -- 
> Khem Raj
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-support/apr/apr-util_1.3.10.bb b/meta/recipes-support/apr/apr-util_1.3.12.bb
similarity index 74%
rename from meta/recipes-support/apr/apr-util_1.3.10.bb
rename to meta/recipes-support/apr/apr-util_1.3.12.bb
index 7071b90..8e9fd61 100644
--- a/meta/recipes-support/apr/apr-util_1.3.10.bb
+++ b/meta/recipes-support/apr/apr-util_1.3.12.bb
@@ -13,8 +13,8 @@  SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
            file://configfix.patch;patch=1 \
            file://configure_fixes.patch;patch=1"
 
-SRC_URI[md5sum] = "82acd25cf3df8c72eba44eaee8b80c19"
-SRC_URI[sha256sum] = "7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23"
+SRC_URI[md5sum] = "d1977289889592ef998e3f777f68efe4"
+SRC_URI[sha256sum] = "815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ 
 		--without-odbc \
@@ -33,3 +33,7 @@  do_configure_prepend() {
 	cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
 }
 
+FILES_${PN}-dev += "${libdir}/aprutil.exp"
+FILES_${PN}     += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so"
+FILES_${PN}-dbg += "${libdir}/apr-util-1/* ${libdir}/apr-util-1/.debug/*"
+