Patchwork groff: upgrade to 1.22.2

login
register
mail settings
Submitter Constantin Musca
Date Feb. 18, 2013, 12:03 p.m.
Message ID <1361189018-2079-1-git-send-email-constantinx.musca@intel.com>
Download mbox | patch
Permalink /patch/44769/
State New
Headers show

Comments

Constantin Musca - Feb. 18, 2013, 12:03 p.m.
- add code for generating the gnulib configure script
- replace /usr/bin/perl with /usr/bin/env perl

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../groff/{groff_1.20.1.bb => groff_1.22.2.bb}               | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/groff/{groff_1.20.1.bb => groff_1.22.2.bb} (85%)
Saul Wold - Feb. 19, 2013, 6:29 a.m.
On 02/18/2013 04:03 AM, Constantin Musca wrote:
> - add code for generating the gnulib configure script
> - replace /usr/bin/perl with /usr/bin/env perl
>
> Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
> ---
>   .../groff/{groff_1.20.1.bb => groff_1.22.2.bb}               | 12 ++++++++++--
>   1 file changed, 10 insertions(+), 2 deletions(-)
>   rename meta/recipes-extended/groff/{groff_1.20.1.bb => groff_1.22.2.bb} (85%)
>
> diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.22.2.bb
> similarity index 85%
> rename from meta/recipes-extended/groff/groff_1.20.1.bb
> rename to meta/recipes-extended/groff/groff_1.22.2.bb
> index 157365b..dc40784 100644
> --- a/meta/recipes-extended/groff/groff_1.20.1.bb
> +++ b/meta/recipes-extended/groff/groff_1.22.2.bb
> @@ -4,7 +4,7 @@ formatting commands and produces formatted output."
>   SECTION = "base"
>   HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
>   LICENSE = "GPLv2"
> -PR = "r2"
> +PR = "r0"
>
>   LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>

I don't see any SRC_URI Checksum updates for this recipe.  It fails to 
fetch correctly.

Please update the Checksums.

Sau!

> @@ -34,10 +34,18 @@ do_configure_prepend() {
>   	fi
>   }
>
> +do_configure_append() {
> +    # generate gnulib configure script
> +    olddir=`pwd`
> +    cd ${S}/src/libs/gnulib/
> +    ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
> +    cd ${olddir}
> +}
> +
>   do_install_append() {
>   	# Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
>   	# for target as /usr/bin/perl, so fix it to /usr/bin/perl.
> -	for i in afmtodit mmroff; do
> +	for i in afmtodit mmroff gropdf pdfmom; do
>   		if [ -f ${D}${bindir}/$i ]; then
>   			sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/$i
>   		fi
>

Patch

diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.22.2.bb
similarity index 85%
rename from meta/recipes-extended/groff/groff_1.20.1.bb
rename to meta/recipes-extended/groff/groff_1.22.2.bb
index 157365b..dc40784 100644
--- a/meta/recipes-extended/groff/groff_1.20.1.bb
+++ b/meta/recipes-extended/groff/groff_1.22.2.bb
@@ -4,7 +4,7 @@  formatting commands and produces formatted output."
 SECTION = "base"
 HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
 LICENSE = "GPLv2"
-PR = "r2"
+PR = "r0"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
@@ -34,10 +34,18 @@  do_configure_prepend() {
 	fi
 }
 
+do_configure_append() {
+    # generate gnulib configure script
+    olddir=`pwd`
+    cd ${S}/src/libs/gnulib/
+    ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
+    cd ${olddir}
+}
+
 do_install_append() {
 	# Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
 	# for target as /usr/bin/perl, so fix it to /usr/bin/perl.
-	for i in afmtodit mmroff; do
+	for i in afmtodit mmroff gropdf pdfmom; do
 		if [ -f ${D}${bindir}/$i ]; then
 			sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/$i
 		fi