Skip to contentSkip to conversation

small bumps

GIT PULL New llandwerlin at gmail.com 1 participant 6 messages Sep 18, 2010 – Sep 20, 2010

lore
Share & tools
lore
#0 lore raw

This serie bumps automake to 1.11.1 and gettext to 0.18.1.1. Automake 1.11.1 brings a nice "silent" mode when compiling packages, and we had an old gettext version. Some packages like gstreamer expect gettext 0.17 to be autoreconfigured. Also the gettext package has been converted to new package infrastructure.

The patch concerning autotools rules brings the ability to have a better control over the autoreconfiguration process.

Regards,

--
Lionel Landwerlin

#1 lore raw

PATCH 1/3 automake: bump to 1.11.1

From: Lionel Landwerlin <[email protected]>

---
 package/automake/automake.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/automake/automake.mk +1 -1
index a33c9f4..e2ff9b2 100644
@@ -3,7 +3,7 @@
 # automake
 #
 #############################################################
-AUTOMAKE_VERSION = 1.10
+AUTOMAKE_VERSION = 1.11.1
 AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
 
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/3 autotools: introduce $(PKG_NAME)_AUTORECONF_ENV/$(PKG_NAME)_AUTORECONF_OPT variables

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Rather than defining the AUTORECONF variable containing the path to the autoreconf tool + all its arguments, we split the variable in two. There is now :
- AUTORECONF which contains the path to the autoreconf tool,
- $(PKG_NAME)_AUTORECONF_OPT which contains the autoreconf arguments,

- and we add $(PKG_NAME)_AUTORECONF_ENV which contains the autoreconf environment variables.

This allow us to define a specific setup to run autoreconf for both target and host as well as per package if needed.

---
 docs/buildroot.html           |   18 ++++++++++++++++++
 package/Makefile.autotools.in |   19 ++++++++++++++++++-
 package/autoconf/autoconf.mk  |    2 +-
 package/automake/automake.mk  |    5 +++--
 4 files changed, 40 insertions(+), 4 deletions(-)
docs/buildroot.html +18 -0
index 6d4f17c..0f0efba 100644
@@ -1329,6 +1329,24 @@ LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP
       options passed to the <i>autoreconf</i> program
       if <code>LIBFOO_AUTORECONF=YES</code>. By default, empty.</li>
 
+      <li><code>LIBFOO_AUTORECONF_ENV</code>, to specify environment
+      variables to pass to <i>autoreconf</i> program if
+      <code>LIBFOO_AUTORECONF=YES</code>. By default, it depends
+      whether we're building a package for the host or target, but it
+      should always define the following variables :
+      <ul>
+        <li>ACLOCAL</li>
+        <li>AUTOCONF</li>
+        <li>AUTOHEADER</li>
+        <li>AUTOMAKE</li>
+        <li>LIBTOOLIZE</li>
+      </ul></li>
+
+      <li><code>LIBFOO_AUTORECONF_OPT</code>, to specify options
+      passed to the <i>autoreconf</i> program if
+      <code>LIBFOO_AUTORECONF=YES</code>. By default, <code>-f -i -I
+      "$(ACLOCAL_DIR)"</code>.</li>
+
       <li><code>LIBFOO_LIBTOOL_PATCH</code> tells whether the
       Buildroot patch to fix libtool cross-compilation issues should
       be applied or not. Valid values are <code>YES</code>
package/Makefile.autotools.in +18 -1
index bc813e3..6d4f604 100644
@@ -62,8 +62,25 @@ $(2)_CONF_OPT			?=
 $(2)_MAKE			?= $(MAKE)
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPT			?=
+ifeq ($(5),host)
 $(2)_AUTORECONF			?= NO
-$(2)_AUTORECONF_OPT		?=
+$(2)_AUTORECONF_OPT		?= -f -i -I "$$(ACLOCAL_HOST_DIR)"
+$(2)_AUTORECONF_ENV		?= $$(HOST_CONFIGURE_OPTS) \
+				ACLOCAL="$$(ACLOCAL)" \
+				AUTOCONF="$$(AUTOCONF)" \
+				AUTOHEADER="$$(AUTOHEADER)" \
+				AUTOMAKE="$$(AUTOMAKE)" \
+				LIBTOOLIZE="$$(LIBTOOLIZE)"
+else
+$(2)_AUTORECONF			?= YES
+$(2)_AUTORECONF_OPT		?= -f -i -I "$$(ACLOCAL_STAGING_DIR)"
+$(2)_AUTORECONF_ENV		?= $$(TARGET_CONFIGURE_OPTS) \
+				ACLOCAL="$$(ACLOCAL)" \
+				AUTOCONF="$$(AUTOCONF)" \
+				AUTOHEADER="$$(AUTOHEADER)" \
+				AUTOMAKE="$$(AUTOMAKE)" \
+				LIBTOOLIZE="$$(LIBTOOLIZE)"
+endif
 $(2)_USE_CONFIG_CACHE           ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
 ifeq ($(BR2_ENABLE_DEBUG),y)
package/autoconf/autoconf.mk +1 -1
index a21192f..4b58986 100644
@@ -23,4 +23,4 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
 # variables used by other packages
 AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
 AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
-AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)"
+AUTORECONF=$(HOST_DIR)/usr/bin/autoreconf
package/automake/automake.mk +3 -2
index e2ff9b2..565bd42 100644
@@ -22,5 +22,6 @@ $(eval $(call AUTOTARGETS,package,automake,host))
 
 # variables used by other packages
 AUTOMAKE = $(HOST_DIR)/usr/bin/automake
-ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
-ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
+ACLOCAL_STAGING_DIR = $(STAGING_DIR)/usr/share/aclocal
+ACLOCAL_HOST_DIR = $(HOST_DIR)/usr/share/aclocal
+ACLOCAL = $(HOST_DIR)/usr/bin/aclocal
Signature · 1 line
1.7.1
#3 lore raw

PATCH 3/3 gettext: bump to 0.18.1.1

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Also ensure with use autopoint tool from the gettext-host package rather than the one from the host.

---
 package/Makefile.autotools.in                      |    3 +-
 .../gettext/gettext-autoconf-lib-link-no-L.patch   |   28 +++
 package/gettext/gettext-autotools.patch            |   28 +++
 package/gettext/gettext-error_print_progname.patch |   14 --
 .../gettext-gnulib-uclibc-sched_param-def.patch    |   53 +++++
 package/gettext/gettext.mk                         |  227 +++++++-------------
 package/gettext/libdir-la.patch                    |  154 -------------
 7 files changed, 188 insertions(+), 319 deletions(-)
 create mode 100644 package/gettext/gettext-autoconf-lib-link-no-L.patch
 create mode 100644 package/gettext/gettext-autotools.patch
 delete mode 100644 package/gettext/gettext-error_print_progname.patch
 create mode 100644 package/gettext/gettext-gnulib-uclibc-sched_param-def.patch
 delete mode 100644 package/gettext/libdir-la.patch
package/Makefile.autotools.in +2 -1
index 6d4f604..db44601 100644
@@ -75,6 +75,7 @@ else
 $(2)_AUTORECONF			?= YES
 $(2)_AUTORECONF_OPT		?= -f -i -I "$$(ACLOCAL_STAGING_DIR)"
 $(2)_AUTORECONF_ENV		?= $$(TARGET_CONFIGURE_OPTS) \
+				AUTOPOINT="$$(AUTOPOINT)" \
 				ACLOCAL="$$(ACLOCAL)" \
 				AUTOCONF="$$(AUTOCONF)" \
 				AUTOHEADER="$$(AUTOHEADER)" \
@@ -188,7 +189,7 @@ endef
 
 ifeq ($$($(2)_AUTORECONF),YES)
 $(2)_POST_PATCH_HOOKS += AUTORECONF_HOOK
-$(2)_DEPENDENCIES += host-automake host-autoconf host-libtool
+$(2)_DEPENDENCIES += host-automake host-autoconf host-libtool $(if $(BR2_NEEDS_GETTEXT,y),host-gettext)
 endif
 
 #
package/gettext/gettext-autoconf-lib-link-no-L.patch new file +28 -0
new file mode 100644
index 0000000..d2063b0
@@ -0,0 +1,28 @@
+Index: gettext-0.18/gettext-runtime/gnulib-m4/lib-link.m4
+===================================================================
+--- gettext-0.18.orig/gettext-runtime/gnulib-m4/lib-link.m4	2010-05-18 17:12:12.593014616 -0700
++++ gettext-0.18/gettext-runtime/gnulib-m4/lib-link.m4	2010-05-18 17:12:58.631176939 -0700
+@@ -312,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+               fi
+             fi
+           fi
++          dnl Just let the compiler find the library, the compiler and user are smarter then this script
++          dnl when cross compiling and working with a relocated install.
++          found_dir=""
+           if test "X$found_dir" = "X"; then
+             for x in $LDFLAGS $LTLIB[]NAME; do
+               AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+Index: gettext-0.18/gettext-tools/gnulib-m4/lib-link.m4
+===================================================================
+--- gettext-0.18.orig/gettext-tools/gnulib-m4/lib-link.m4	2010-05-18 17:12:12.633052946 -0700
++++ gettext-0.18/gettext-tools/gnulib-m4/lib-link.m4	2010-05-18 17:13:35.020559106 -0700
+@@ -312,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+               fi
+             fi
+           fi
++          dnl Just let the compiler find the library, the compiler and user are smarter then this script
++          dnl when cross compiling and working with a relocated install.
++          found_dir=""
+           if test "X$found_dir" = "X"; then
+             for x in $LDFLAGS $LTLIB[]NAME; do
+               AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
package/gettext/gettext-autotools.patch new file +28 -0
new file mode 100644
index 0000000..8302b34
@@ -0,0 +1,28 @@
+Index: gettext-0.18/gettext-runtime/man/Makefile.am
+===================================================================
+--- gettext-0.18.orig/gettext-runtime/man/Makefile.am	2009-06-28 12:44:04.000000000 -0700
++++ gettext-0.18/gettext-runtime/man/Makefile.am	2010-05-18 16:58:51.130518057 -0700
+@@ -159,8 +159,7 @@ bind_textdomain_codeset.3.html: bind_tex
+ 	$(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
+ 	mv t-$@ $@
+ 
+-install-html-local:
+-	$(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ 	for file in $(man_HTML); do \
+ 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+Index: gettext-0.18/gettext-tools/man/Makefile.am
+===================================================================
+--- gettext-0.18.orig/gettext-tools/man/Makefile.am	2009-06-28 12:44:04.000000000 -0700
++++ gettext-0.18/gettext-tools/man/Makefile.am	2010-05-18 16:58:51.130518057 -0700
+@@ -186,8 +186,7 @@ autopoint.1.html: autopoint.1
+ 	$(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
+ 	mv t-$@ $@
+ 
+-install-html-local:
+-	$(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ 	for file in $(man_HTML); do \
+ 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
package/gettext/gettext-error_print_progname.patch deleted +0 -14
deleted file mode 100644
index 189d28b..0000000
@@ -1,14 +0,0 @@
---- gettext-0.16.1.oorig/gettext-tools/gnulib-lib/error.h	2006-11-27 18:14:50.000000000 +0100
-+++ gettext-0.16.1/gettext-tools/gnulib-lib/error.h	2007-06-20 13:29:32.000000000 +0200
-@@ -50,7 +50,10 @@ extern void error_at_line (int __status,
- /* If NULL, error will flush stdout, then print on stderr the program
-    name, a colon and a space.  Otherwise, error will call this
-    function without parameters instead.  */
--extern DLL_VARIABLE void (*error_print_progname) (void);
-+#ifndef __UCLIBC__
-+extern DLL_VARIABLE
-+#endif
-+void (*error_print_progname) (void);
- 
- /* This variable is incremented each time `error' is called.  */
- extern DLL_VARIABLE unsigned int error_message_count;
package/gettext/gettext-gnulib-uclibc-sched_param-def.patch new file +53 -0

53 lines not on this page · raw message

package/gettext/gettext.mk +77 -150

241 lines not on this page · raw message

package/gettext/libdir-la.patch deleted +0 -154

154 lines not on this page · raw message

Signature · 1 line
1.7.1
#4 lore raw

PATCH 3/3 gettext: bump to 0.18.1.1

I'm sorry, but this patch does not seem to work well in all situations. I'm having problems with "dumb" configuration where we select libglib which requires libintl to work, but we don't have a toolchain with locales...

I will resend a patch without this problem.

Regards,

Signature · 1 line
Lionel Landwerlin
#5 lore raw

PATCH 1/1 gettext: bump to 0.18.1.1

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Also ensure with use autopoint tool from the gettext-host package rather than the one from the host.

---
 package/Makefile.autotools.in                      |    3 +-
 package/gettext/Config.in                          |    1 +
 .../gettext/gettext-autoconf-lib-link-no-L.patch   |   28 +++
 package/gettext/gettext-autotools.patch            |   28 +++
 package/gettext/gettext-error_print_progname.patch |   14 --
 .../gettext-gnulib-uclibc-sched_param-def.patch    |   53 +++++
 package/gettext/gettext.mk                         |  238 ++++++++------------
 package/gettext/libdir-la.patch                    |  154 -------------
 8 files changed, 204 insertions(+), 315 deletions(-)
 create mode 100644 package/gettext/gettext-autoconf-lib-link-no-L.patch
 create mode 100644 package/gettext/gettext-autotools.patch
 delete mode 100644 package/gettext/gettext-error_print_progname.patch
 create mode 100644 package/gettext/gettext-gnulib-uclibc-sched_param-def.patch
 delete mode 100644 package/gettext/libdir-la.patch
package/Makefile.autotools.in +2 -1
index 6d4f604..04ba637 100644
@@ -75,6 +75,7 @@ else
 $(2)_AUTORECONF			?= YES
 $(2)_AUTORECONF_OPT		?= -f -i -I "$$(ACLOCAL_STAGING_DIR)"
 $(2)_AUTORECONF_ENV		?= $$(TARGET_CONFIGURE_OPTS) \
+				AUTOPOINT="$$(AUTOPOINT)" \
 				ACLOCAL="$$(ACLOCAL)" \
 				AUTOCONF="$$(AUTOCONF)" \
 				AUTOHEADER="$$(AUTOHEADER)" \
@@ -188,7 +189,7 @@ endef
 
 ifeq ($$($(2)_AUTORECONF),YES)
 $(2)_POST_PATCH_HOOKS += AUTORECONF_HOOK
-$(2)_DEPENDENCIES += host-automake host-autoconf host-libtool
+$(2)_DEPENDENCIES += host-automake host-autoconf host-libtool host-gettext
 endif
 
 #
package/gettext/Config.in +1 -0
index c1ae97f..8342030 100644
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GETTEXT
 	bool "gettext"
 	depends on BR2_NEEDS_GETTEXT
 	depends on BR2_USE_WCHAR
+        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  The GNU `gettext' utilities are a set of tools that provide a
 	  framework to help other GNU packages produce multi-lingual
package/gettext/gettext-autoconf-lib-link-no-L.patch new file +28 -0
new file mode 100644
index 0000000..d2063b0
@@ -0,0 +1,28 @@
+Index: gettext-0.18/gettext-runtime/gnulib-m4/lib-link.m4
+===================================================================
+--- gettext-0.18.orig/gettext-runtime/gnulib-m4/lib-link.m4	2010-05-18 17:12:12.593014616 -0700
++++ gettext-0.18/gettext-runtime/gnulib-m4/lib-link.m4	2010-05-18 17:12:58.631176939 -0700
+@@ -312,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+               fi
+             fi
+           fi
++          dnl Just let the compiler find the library, the compiler and user are smarter then this script
++          dnl when cross compiling and working with a relocated install.
++          found_dir=""
+           if test "X$found_dir" = "X"; then
+             for x in $LDFLAGS $LTLIB[]NAME; do
+               AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+Index: gettext-0.18/gettext-tools/gnulib-m4/lib-link.m4
+===================================================================
+--- gettext-0.18.orig/gettext-tools/gnulib-m4/lib-link.m4	2010-05-18 17:12:12.633052946 -0700
++++ gettext-0.18/gettext-tools/gnulib-m4/lib-link.m4	2010-05-18 17:13:35.020559106 -0700
+@@ -312,6 +312,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+               fi
+             fi
+           fi
++          dnl Just let the compiler find the library, the compiler and user are smarter then this script
++          dnl when cross compiling and working with a relocated install.
++          found_dir=""
+           if test "X$found_dir" = "X"; then
+             for x in $LDFLAGS $LTLIB[]NAME; do
+               AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
package/gettext/gettext-autotools.patch new file +28 -0
new file mode 100644
index 0000000..8302b34
@@ -0,0 +1,28 @@
+Index: gettext-0.18/gettext-runtime/man/Makefile.am
+===================================================================
+--- gettext-0.18.orig/gettext-runtime/man/Makefile.am	2009-06-28 12:44:04.000000000 -0700
++++ gettext-0.18/gettext-runtime/man/Makefile.am	2010-05-18 16:58:51.130518057 -0700
+@@ -159,8 +159,7 @@ bind_textdomain_codeset.3.html: bind_tex
+ 	$(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
+ 	mv t-$@ $@
+ 
+-install-html-local:
+-	$(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ 	for file in $(man_HTML); do \
+ 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+Index: gettext-0.18/gettext-tools/man/Makefile.am
+===================================================================
+--- gettext-0.18.orig/gettext-tools/man/Makefile.am	2009-06-28 12:44:04.000000000 -0700
++++ gettext-0.18/gettext-tools/man/Makefile.am	2010-05-18 16:58:51.130518057 -0700
+@@ -186,8 +186,7 @@ autopoint.1.html: autopoint.1
+ 	$(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
+ 	mv t-$@ $@
+ 
+-install-html-local:
+-	$(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ 	for file in $(man_HTML); do \
+ 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
package/gettext/gettext-error_print_progname.patch deleted +0 -14
deleted file mode 100644
index 189d28b..0000000
@@ -1,14 +0,0 @@
---- gettext-0.16.1.oorig/gettext-tools/gnulib-lib/error.h	2006-11-27 18:14:50.000000000 +0100
-+++ gettext-0.16.1/gettext-tools/gnulib-lib/error.h	2007-06-20 13:29:32.000000000 +0200
-@@ -50,7 +50,10 @@ extern void error_at_line (int __status,
- /* If NULL, error will flush stdout, then print on stderr the program
-    name, a colon and a space.  Otherwise, error will call this
-    function without parameters instead.  */
--extern DLL_VARIABLE void (*error_print_progname) (void);
-+#ifndef __UCLIBC__
-+extern DLL_VARIABLE
-+#endif
-+void (*error_print_progname) (void);
- 
- /* This variable is incremented each time `error' is called.  */
- extern DLL_VARIABLE unsigned int error_message_count;
package/gettext/gettext-gnulib-uclibc-sched_param-def.patch new file +53 -0

53 lines not on this page · raw message

package/gettext/gettext.mk +92 -146

255 lines not on this page · raw message

package/gettext/libdir-la.patch deleted +0 -154

154 lines not on this page · raw message

Signature · 1 line
1.7.1