package/libconfuse: switch to the new upstream

PATCH New Yann E. MORIN 4 participants 6 messages Jul 16, 2014 – Jul 17, 2014

lore

Share & tools

lore

Yann E. MORIN

author

2014-07-16 22:32 UTC #0 lore raw

PATCH 1/1 package/libconfuse: switch to the new upstream

From: Alvaro Gamez <[email protected]>

libconfuse is being migrated to github (see http://www.nongnu.org/confuse/)
So, just follow suite.

Needs a bit of a hack so gettextize + autoreconf does not step on each other's toes. See comment in the patch.

Based on a patch by: Alvaro Gamez <[email protected]>

[me: fix gettextizing, write commit log]

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Arnout Vandecappelle <[email protected]>

---
 .../libconfuse-0000-fix-configure-ac.patch         | 27 ++++++++++++++++++++++
 package/libconfuse/libconfuse.mk                   |  9 +++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 package/libconfuse/libconfuse-0000-fix-configure-ac.patch

package/libconfuse/libconfuse-0000-fix-configure-ac.patch new file +27 -0

new file mode 100644
index 0000000..6d61b48
@@ -0,0 +1,27 @@
+configure: remove po/Makefile.in from AC_CONFIG_FILES
+
+Since we are gettextizing the package, gettextize updates configure.ac
+to add po/Makefile.in to AC_CONFIG_FILES>
+
+Unfortunately, it's already present, and gettextize does not detect it,
+and insists on adding its own. Later on, autoreconf barfs on the double
+occurences.
+
+As suggested by Arnout, just patch configure.ac to remove the
+po/Makefile.in occurence, so gettextize can safely add its own
+
+Reported-by: Arnout Vandecappelle <[email protected]>
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+Cc: Alvaro Gamez <[email protected]>
+
+diff -durN libconfuse-V2_7.orig/configure.ac libconfuse-V2_7/configure.ac
+--- libconfuse-V2_7.orig/configure.ac	2010-02-20 10:14:10.000000000 +0100
++++ libconfuse-V2_7/configure.ac	2014-07-17 00:19:18.816785340 +0200
+@@ -49,7 +49,6 @@
+ AC_CONFIG_FILES([Makefile \
+ 		 src/Makefile \
+ 		 examples/Makefile \
+-                 po/Makefile.in \
+ 		 m4/Makefile \
+ 		 tests/Makefile \
+ 		 doc/Makefile \

package/libconfuse/libconfuse.mk +6 -3

index 8a0d80f..e9a1114 100644
@@ -4,13 +4,16 @@
 #
 ################################################################################
 
-LIBCONFUSE_VERSION = 2.7
-LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.gz
-LIBCONFUSE_SITE = http://savannah.nongnu.org/download/confuse/
+LIBCONFUSE_VERSION = V2_7
+LIBCONFUSE_SITE = $(call github,martinh,libconfuse,$(LIBCONFUSE_VERSION))
 LIBCONFUSE_INSTALL_STAGING = YES
 LIBCONFUSE_CONF_OPT = --disable-rpath
 LIBCONFUSE_LICENSE = ISC
 LIBCONFUSE_LICENSE_FILES = src/confuse.c
 
+# Fresh from the repository, no configure et al.
+LIBCONFUSE_AUTORECONF = YES
+LIBCONFUSE_GETTEXTIZE = YES
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

Signature · 1 line

1.9.1

Yann E. MORIN

author

2014-07-16 22:34 UTC #1 lore raw

PATCH 1/1 package/libconfuse: switch to the new upstream

All,

On 2014-07-17 00:32 +0200, Yann E. MORIN spake thusly:

Quoted 7 lines

From: Alvaro Gamez <[email protected]>
libconfuse is being migrated to github (see http://www.nongnu.org/confuse/)
So, just follow suite.
Needs a bit of a hack so gettextize + autoreconf does not step on each other's toes. See comment in the patch.

I forgot to say that this patch should go in after the gettextize series I posted earlier, since it relies on the nes GETTEXTIZ variable.

Regards,
Yann E. MORIN.

Quoted 71 lines

Based on a patch by: Alvaro Gamez <[email protected]>

[me: fix gettextizing, write commit log]

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Arnout Vandecappelle <[email protected]>

---
 .../libconfuse-0000-fix-configure-ac.patch         | 27 ++++++++++++++++++++++
 package/libconfuse/libconfuse.mk                   |  9 +++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 package/libconfuse/libconfuse-0000-fix-configure-ac.patch

package/libconfuse/libconfuse-0000-fix-configure-ac.patch new file +27 -0

new file mode 100644
index 0000000..6d61b48
@@ -0,0 +1,27 @@
+configure: remove po/Makefile.in from AC_CONFIG_FILES
+
+Since we are gettextizing the package, gettextize updates configure.ac
+to add po/Makefile.in to AC_CONFIG_FILES>
+
+Unfortunately, it's already present, and gettextize does not detect it,
+and insists on adding its own. Later on, autoreconf barfs on the double
+occurences.
+
+As suggested by Arnout, just patch configure.ac to remove the
+po/Makefile.in occurence, so gettextize can safely add its own
+
+Reported-by: Arnout Vandecappelle <[email protected]>
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+Cc: Alvaro Gamez <[email protected]>
+
+diff -durN libconfuse-V2_7.orig/configure.ac libconfuse-V2_7/configure.ac
+--- libconfuse-V2_7.orig/configure.ac	2010-02-20 10:14:10.000000000 +0100
++++ libconfuse-V2_7/configure.ac	2014-07-17 00:19:18.816785340 +0200
+@@ -49,7 +49,6 @@
+ AC_CONFIG_FILES([Makefile \
+ 		 src/Makefile \
+ 		 examples/Makefile \
+-                 po/Makefile.in \
+ 		 m4/Makefile \
+ 		 tests/Makefile \
+ 		 doc/Makefile \

package/libconfuse/libconfuse.mk +6 -3

index 8a0d80f..e9a1114 100644
@@ -4,13 +4,16 @@
 #
 ################################################################################
 
-LIBCONFUSE_VERSION = 2.7
-LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.gz
-LIBCONFUSE_SITE = http://savannah.nongnu.org/download/confuse/
+LIBCONFUSE_VERSION = V2_7
+LIBCONFUSE_SITE = $(call github,martinh,libconfuse,$(LIBCONFUSE_VERSION))
 LIBCONFUSE_INSTALL_STAGING = YES
 LIBCONFUSE_CONF_OPT = --disable-rpath
 LIBCONFUSE_LICENSE = ISC
 LIBCONFUSE_LICENSE_FILES = src/confuse.c
 
+# Fresh from the repository, no configure et al.
+LIBCONFUSE_AUTORECONF = YES
+LIBCONFUSE_GETTEXTIZE = YES
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

Signature · 1 line

1.9.1

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Arnout Vandecappelle

2014-07-16 22:40 UTC #2 lore raw

PATCH 1/1 package/libconfuse: switch to the new upstream

In reply to Yann E. MORIN

Quoted 4 lines · Yann E. MORIN

From: Alvaro Gamez <[email protected]>
libconfuse is being migrated to github (see http://www.nongnu.org/confuse/)
So, just follow suite.

suit (pronounced [set]), not suite (pronounced [swi.t]).

Quoted 5 lines

Needs a bit of a hack so gettextize + autoreconf does not step on each other's toes. See comment in the patch.
Based on a patch by: Alvaro Gamez <[email protected]>

Kind of unnecessary since you kept him as author.

Quoted 2 lines

[me: fix gettextizing, write commit log]

Once it's committed, it won't be clear anymore who the 'me' is.

Quoted 1 line

Signed-off-by "Yann E. MORIN" <[email protected]>

You should keep Alvaro's SoB. Well, except that he didn't sign it off :-)
Alvaro, can you provide your SoB?

But it basically looks good to me :-)

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 65 lines

Cc Arnout Vandecappelle <[email protected]>

---
 .../libconfuse-0000-fix-configure-ac.patch         | 27 ++++++++++++++++++++++
 package/libconfuse/libconfuse.mk                   |  9 +++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 package/libconfuse/libconfuse-0000-fix-configure-ac.patch

package/libconfuse/libconfuse-0000-fix-configure-ac.patch new file +27 -0

new file mode 100644
index 0000000..6d61b48
@@ -0,0 +1,27 @@
+configure: remove po/Makefile.in from AC_CONFIG_FILES
+
+Since we are gettextizing the package, gettextize updates configure.ac
+to add po/Makefile.in to AC_CONFIG_FILES>
+
+Unfortunately, it's already present, and gettextize does not detect it,
+and insists on adding its own. Later on, autoreconf barfs on the double
+occurences.
+
+As suggested by Arnout, just patch configure.ac to remove the
+po/Makefile.in occurence, so gettextize can safely add its own
+
+Reported-by: Arnout Vandecappelle <[email protected]>
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+Cc: Alvaro Gamez <[email protected]>
+
+diff -durN libconfuse-V2_7.orig/configure.ac libconfuse-V2_7/configure.ac
+--- libconfuse-V2_7.orig/configure.ac	2010-02-20 10:14:10.000000000 +0100
++++ libconfuse-V2_7/configure.ac	2014-07-17 00:19:18.816785340 +0200
+@@ -49,7 +49,6 @@
+ AC_CONFIG_FILES([Makefile \
+ 		 src/Makefile \
+ 		 examples/Makefile \
+-                 po/Makefile.in \
+ 		 m4/Makefile \
+ 		 tests/Makefile \
+ 		 doc/Makefile \

package/libconfuse/libconfuse.mk +6 -3

index 8a0d80f..e9a1114 100644
@@ -4,13 +4,16 @@
 #
 ################################################################################
 
-LIBCONFUSE_VERSION = 2.7
-LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.gz
-LIBCONFUSE_SITE = http://savannah.nongnu.org/download/confuse/
+LIBCONFUSE_VERSION = V2_7
+LIBCONFUSE_SITE = $(call github,martinh,libconfuse,$(LIBCONFUSE_VERSION))
 LIBCONFUSE_INSTALL_STAGING = YES
 LIBCONFUSE_CONF_OPT = --disable-rpath
 LIBCONFUSE_LICENSE = ISC
 LIBCONFUSE_LICENSE_FILES = src/confuse.c
 
+# Fresh from the repository, no configure et al.
+LIBCONFUSE_AUTORECONF = YES
+LIBCONFUSE_GETTEXTIZE = YES
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Alvaro Gamez

2014-07-17 06:38 UTC #3 lore raw

PATCH 1/1 package/libconfuse: switch to the new upstream

Hi, Arnout, Yann

You can change main authorship if you feel it's better, my patch was in fact trivial and non-working :)
The commit message would also match with the 'me', that is, you.

Signed-off-by Alvaro G. M <[email protected]>

Regards

2014-07-17 0:40 GMT+02:00 Arnout Vandecappelle <[email protected]>:

Quoted 109 lines · Yann E. MORIN

Quoted 4 lines

From: Alvaro Gamez <[email protected]>
libconfuse is being migrated to github (see http://www.nongnu.org/confuse/)
So, just follow suite.

suit (pronounced [set]), not suite (pronounced [swi.t]).

Quoted 5 lines

Needs a bit of a hack so gettextize + autoreconf does not step on each other's toes. See comment in the patch.
Based on a patch by: Alvaro Gamez <[email protected]>

Kind of unnecessary since you kept him as author.

Quoted 2 lines

[me: fix gettextizing, write commit log]

Once it's committed, it won't be clear anymore who the 'me' is.

Quoted 1 line

Signed-off-by "Yann E. MORIN" <[email protected]>

You should keep Alvaro's SoB. Well, except that he didn't sign it off :-)
Alvaro, can you provide your SoB?

But it basically looks good to me :-)

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 55 lines

Cc Arnout Vandecappelle <[email protected]>

---
 .../libconfuse-0000-fix-configure-ac.patch         | 27 ++++++++++++++++++++++
 package/libconfuse/libconfuse.mk                   |  9 +++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 package/libconfuse/libconfuse-0000-fix-configure-ac.patch

package/libconfuse/libconfuse-0000-fix-configure-ac.patch new file +27 -0

new file mode 100644
index 0000000..6d61b48
@@ -0,0 +1,27 @@
+configure: remove po/Makefile.in from AC_CONFIG_FILES
+
+Since we are gettextizing the package, gettextize updates configure.ac
+to add po/Makefile.in to AC_CONFIG_FILES>
+
+Unfortunately, it's already present, and gettextize does not detect it,
+and insists on adding its own. Later on, autoreconf barfs on the double
+occurences.
+
+As suggested by Arnout, just patch configure.ac to remove the
+po/Makefile.in occurence, so gettextize can safely add its own
+
+Reported-by: Arnout Vandecappelle <[email protected]>
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+Cc: Alvaro Gamez <[email protected]>
+
+diff -durN libconfuse-V2_7.orig/configure.ac libconfuse-V2_7/configure.ac
+--- libconfuse-V2_7.orig/configure.ac        2010-02-20 10:14:10.000000000 +0100
++++ libconfuse-V2_7/configure.ac     2014-07-17 00:19:18.816785340 +0200
+@@ -49,7 +49,6 @@
+ AC_CONFIG_FILES([Makefile \
+              src/Makefile \
+              examples/Makefile \
+-                 po/Makefile.in \
+              m4/Makefile \
+              tests/Makefile \
+              doc/Makefile \

package/libconfuse/libconfuse.mk +2 -3

index 8a0d80f..e9a1114 100644
@@ -4,13 +4,16 @@
 #
 ################################################################################
 
-LIBCONFUSE_VERSION = 2.7
-LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.gz
-LIBCONFUSE_SITE = http://savannah.nongnu.org/download/confuse/
+LIBCONFUSE_VERSION = V2_7
+LIBCONFUSE_SITE = $(call github,martinh,libconfuse,$(LIBCONFUSE_VERSION))
 LIBCONFUSE_INSTALL_STAGING = YES

package/libconfuse/libconfuse.mk line 19

Quoted 10 lines

package/libconfuse/libconfuse.mk +4 -0

 LIBCONFUSE_CONF_OPT = --disable-rpath
 LIBCONFUSE_LICENSE = ISC
 LIBCONFUSE_LICENSE_FILES = src/confuse.c
 
+# Fresh from the repository, no configure et al.
+LIBCONFUSE_AUTORECONF = YES
+LIBCONFUSE_GETTEXTIZE = YES
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Signature · 1 line

?lvaro G?mez Machado

Thomas Petazzoni

Applied

2014-07-17 07:58 UTC #4 lore raw

PATCH 1/1 package/libconfuse: switch to the new upstream

In reply to Yann E. MORIN

Dear Yann E. MORIN,

Quoted 10 lines · Yann E. MORIN

From: Alvaro Gamez <[email protected]>
libconfuse is being migrated to github (see http://www.nongnu.org/confuse/)
So, just follow suite.
Needs a bit of a hack so gettextize + autoreconf does not step on each other's toes. See comment in the patch.
Based on a patch by: Alvaro Gamez <[email protected]>

Quoted 8 lines

[me: fix gettextizing, write commit log]
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Arnout Vandecappelle <[email protected]>
---
 .../libconfuse-0000-fix-configure-ac.patch         | 27 ++++++++++++++++++++++
 package/libconfuse/libconfuse.mk                   |  9 +++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 package/libconfuse/libconfuse-0000-fix-configure-ac.patch

Applied, with Arnout fixes made in the commit log.

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Yann E. MORIN

author

2014-07-17 22:46 UTC #5 lore raw

PATCH 1/1 package/libconfuse: switch to the new upstream

In reply to Yann E. MORIN

Thomas, All,

On 2014-07-17 00:32 +0200, Yann E. MORIN spake thusly:

Quoted 5 lines

libconfuse is being migrated to github (see http://www.nongnu.org/confuse/)
So, just follow suite.
Needs a bit of a hack so gettextize + autoreconf does not step on each other's toes. See comment in the patch.

[--SNIP--]

OK, so this bump is causing a bunch of autobuild failures:
http://autobuild.buildroot.org/?reason=libconfuse-V2_7

Some of them are due to a problem while either gettextizing or autoreconfiguring the package.

Thomas was able to reproduce this build failure:

    http://autobuild.buildroot.org/results/f60/f6089c90d4f0ba579725ac834d8ac43b839bbc3b/

However, I was not able to reproduce it; it builds fine for me, in a Debian Squeeze 32-bit chroot.

I'm lost.

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'