Patchwork [V2,1/3] gawk: upgrade from 4.0.2 to 4.1.1

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date June 5, 2014, 5:29 a.m.
Message ID <e495f3e49d33bd3b855c8eb91206622e0f2e3d14.1401945914.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/73275/
State New
Headers show

Comments

Qi.Chen@windriver.com - June 5, 2014, 5:29 a.m.
Upgrade gawk from 4.0.2 to 4.1.1.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../gawk/{gawk-4.0.2 => gawk-4.1.1}/run-ptest      |    0
 .../gawk/{gawk_4.0.2.bb => gawk_4.1.1.bb}          |    7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/gawk/{gawk-4.0.2 => gawk-4.1.1}/run-ptest (100%)
 rename meta/recipes-extended/gawk/{gawk_4.0.2.bb => gawk_4.1.1.bb} (83%)
Ross Burton - June 5, 2014, 9:42 a.m.
On 5 June 2014 06:29, Chen Qi <Qi.Chen@windriver.com> wrote:
> +FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/* ${libexecdir}/*.so"

Gawk doesn't install extensions into libexecdir, but $libdir/gawk:

AC_SUBST([pkgextensiondir], ['${pkglibdir}'])

They may end up in the same location but that can't be guaranteed for
all time (especially when I have a series that changes libexecdir).

Ross
Qi.Chen@windriver.com - June 6, 2014, 2:07 a.m.
On 06/05/2014 05:42 PM, Burton, Ross wrote:
> On 5 June 2014 06:29, Chen Qi <Qi.Chen@windriver.com> wrote:
>> +FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/* ${libexecdir}/*.so"
> Gawk doesn't install extensions into libexecdir, but $libdir/gawk:
>
> AC_SUBST([pkgextensiondir], ['${pkglibdir}'])
>
> They may end up in the same location but that can't be guaranteed for
> all time (especially when I have a series that changes libexecdir).
>
> Ross
>
>

Hi Ross,

I checked out your branch and saw your changes.

-export libexecdir = "${libdir}/${BPN}"
+export libexecdir = "${exec_prefix}/libexec"

I'll update my patch and send out a V3.
I think this time, I'll also have to modify the gawk recipe of the old 
3.1.5 version.

(P.S. I grepped in the project, and it seems that there are also other 
recipes that may need some changes about the libexec.)

Best Regards,
Chen Qi

Patch

diff --git a/meta/recipes-extended/gawk/gawk-4.0.2/run-ptest b/meta/recipes-extended/gawk/gawk-4.1.1/run-ptest
similarity index 100%
rename from meta/recipes-extended/gawk/gawk-4.0.2/run-ptest
rename to meta/recipes-extended/gawk/gawk-4.1.1/run-ptest
diff --git a/meta/recipes-extended/gawk/gawk_4.0.2.bb b/meta/recipes-extended/gawk/gawk_4.1.1.bb
similarity index 83%
rename from meta/recipes-extended/gawk/gawk_4.0.2.bb
rename to meta/recipes-extended/gawk/gawk_4.1.1.bb
index cb2f9c0..69a2bcc 100644
--- a/meta/recipes-extended/gawk/gawk_4.0.2.bb
+++ b/meta/recipes-extended/gawk/gawk_4.1.1.bb
@@ -20,16 +20,17 @@  SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
            file://run-ptest \
 "
 
-SRC_URI[md5sum] = "4d505dc2c9f1eb3e9f8d6cac87d4bd1a"
-SRC_URI[sha256sum] = "6e0de117c3713aa8d7fa347fc9fd645b10038ae49d8cf947d8c1d51cbb76141a"
+SRC_URI[md5sum] = "45f5b09aa87b4744c4c53bf274e96ed0"
+SRC_URI[sha256sum] = "556464bd2e4bc5a0fad4526b59623e4be40b4c2f4c663dfaaf246af6e2ec1d62"
 
 inherit autotools gettext texinfo update-alternatives
 
 PACKAGES += "gawk-common pgawk dgawk"
 
 FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk"
-FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*"
+FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/* ${libexecdir}/*.so"
 FILES_pgawk = "${bindir}/pgawk*"
+FILES_${PN}-dev += "${libexecdir}/*.la"
 FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
 FILES_dgawk = "${bindir}/dgawk*"