Skip to contentSkip to conversation

rework of libtool

Buildroot New llandwerlin at gmail.com 2 participants 9 messages Sep 18, 2010 – Sep 29, 2010 Kbuild

lore
Share & tools
lore
#0 lore raw

This patch serie tries to rework how buildroot deals with libtooled packages.

The main thing to retain is that instead of dealing with the libtool scripts shipped within the packages, we want to use our own slightly modified libtool version. The downside of this approach is that now, we have to turn on autoreconfiguration on libtooled packages. And so we need to make a pass on all concerned packages to make sure nothing is broken. Otherwise, most of the concerned packages just need a simple modification of the <PKG_NAME>_AUTORECONF and <PKG_NAME>_LIBTOOL_PATCH variables.

This series shows the modifications to bring for a few packages.

#1 lore raw

PATCH 1/7 libtool: bump to 2.2.6b + introduce 2 libtool packages + cross compile patch

From: Lionel Landwerlin <[email protected]>

This patch deserve a little explanation...

Amongst packages which use autotools, some of them are using a tool called libtool, to build themself. Libtool is particulary usefull when you've to build libraries. It avoids us to deal with all kind of tricks we would have to do by ourself. For example, it helps us to build a full gnome stack within /opt/gnome which (except basic libraries like glibc) does not depends on gnome's libraries already installed /usr/lib. Each package using libtool embeds a libtool script which is generated from the ltmain.sh script shipped within the libtool sources. This script is generated when you run autogen.sh/autoreconf from the root of your package's tree.

Here is our problem, because libtool does not handle very well cross compilation. And until now, the buildroot's approach has been to try to compile each package, and when we see a link problem with libtool (usually libtool tries to link a package with the host's libraries), we set the <PACKAGE_NAME>_LIBTOOL_PATCH variable to yes to patch the libtool generated script.

The purpose of this patch is to handle this libtool problem in a different way. Instead of patching each package's libtool script, we provide a libtool patch which alterates the original ltmain.sh script, and we activate autoreconfiguration by default for target packages.

The result of this is that the <PACKAGE_NAME>_LIBTOOL_PATCH variable becomes almost useless (we might still need it for a very few packages). We also does not need to add '-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib' to LDFLAGS.

There two downside to this patch :
1. we need to build libtool twice, because of dependencies between automake/autoconf/libtool
2. we need to make a pass on all autotooled packages to make sure there is no problem when we run autoreconf on them...

---
 Makefile                                           |   14 +-
 package/Makefile.autotools.in                      |   22 +-
 package/Makefile.in                                |    3 +-
 package/autoconf/autoconf.mk                       |   11 +-
 package/automake/automake.mk                       |    1 +
 package/libtool-host/libtool-host.mk               |   43 +++
 .../libtool-2.2.6b_cross-environment-support.patch |  300 ++++++++++++++++++++
 package/libtool/libtool.mk                         |   27 ++-
 8 files changed, 397 insertions(+), 24 deletions(-)
 create mode 100644 package/libtool-host/libtool-host.mk
 create mode 100644 package/libtool/libtool-2.2.6b_cross-environment-support.patch
Makefile +8 -6
index faa802b..cf9c280 100644
@@ -253,7 +253,8 @@ GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX))
 STAGING_DIR:=$(call qstrip,$(BR2_STAGING_DIR))
 
 # packages compiled for the host goes here
-HOST_DIR:=$(BASE_DIR)/host
+HOST_DIR:=$(BASE_DIR)/host-target
+HOST_HOST_DIR:=$(BASE_DIR)/host-host
 
 # stamp (dependency) files go here
 STAMP_DIR:=$(BASE_DIR)/stamps
@@ -312,7 +313,7 @@ TARGETS_ALL:=$(patsubst %,__real_tgt_%,$(TARGETS))
 $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
 
 dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
+	$(HOST_DIR) $(HOST_HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
 $(BASE_TARGETS): dirs
 
@@ -328,7 +329,7 @@ world: prepare dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL)
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
 	$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
+	$(HOST_DIR) $(HOST_HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
 #############################################################
 #
@@ -336,7 +337,7 @@ world: prepare dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL)
 # dependencies anywhere else
 #
 #############################################################
-$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR):
+$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(HOST_HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR):
 	@mkdir -p $@
 
 $(STAGING_DIR):
@@ -560,8 +561,9 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 #
 #############################################################
 clean:
-	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
-		$(STAMP_DIR) $(BUILD_DIR) $(TOOLCHAIN_DIR)
+	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(BINARIES_DIR)		\
+		$(HOST_DIR) $(HOST_HOST_DIR) $(STAMP_DIR) $(BUILD_DIR)	\
+		$(TOOLCHAIN_DIR)
 
 distclean: clean
 ifeq ($(DL_DIR),$(TOPDIR)/dl)
package/Makefile.autotools.in +13 -9
index db44601..1eb7ca4 100644
@@ -53,7 +53,7 @@ ifndef $(2)_LIBTOOL_PATCH
  ifdef $(3)_LIBTOOL_PATCH
   $(2)_LIBTOOL_PATCH = $($(3)_LIBTOOL_PATCH)
  else
-  $(2)_LIBTOOL_PATCH ?= YES
+  $(2)_LIBTOOL_PATCH ?= NO
  endif
 endif
 
@@ -64,13 +64,14 @@ $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPT			?=
 ifeq ($(5),host)
 $(2)_AUTORECONF			?= NO
-$(2)_AUTORECONF_OPT		?= -f -i -I "$$(ACLOCAL_HOST_DIR)"
+$(2)_AUTORECONF_OPT		?= -f -i -I "$$(ACLOCAL_HOST_HOST_DIR)" -I "$$(ACLOCAL_HOST_DIR)"
 $(2)_AUTORECONF_ENV		?= $$(HOST_CONFIGURE_OPTS) \
 				ACLOCAL="$$(ACLOCAL)" \
 				AUTOCONF="$$(AUTOCONF)" \
 				AUTOHEADER="$$(AUTOHEADER)" \
 				AUTOMAKE="$$(AUTOMAKE)" \
-				LIBTOOLIZE="$$(LIBTOOLIZE)"
+				LIBTOOL="$$(LIBTOOL_HOST)" \
+				LIBTOOLIZE="$$(LIBTOOLIZE_HOST)"
 else
 $(2)_AUTORECONF			?= YES
 $(2)_AUTORECONF_OPT		?= -f -i -I "$$(ACLOCAL_STAGING_DIR)"
@@ -80,7 +81,9 @@ $(2)_AUTORECONF_ENV		?= $$(TARGET_CONFIGURE_OPTS) \
 				AUTOCONF="$$(AUTOCONF)" \
 				AUTOHEADER="$$(AUTOHEADER)" \
 				AUTOMAKE="$$(AUTOMAKE)" \
-				LIBTOOLIZE="$$(LIBTOOLIZE)"
+				LIBTOOL="$$(LIBTOOL_TARGET)" \
+				LIBTOOLIZE="$$(LIBTOOLIZE_TARGET)" \
+				LIBTOOL_SYSROOT="$$(STAGING_DIR)"
 endif
 $(2)_USE_CONFIG_CACHE           ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
@@ -179,7 +182,7 @@ endif
 #
 define AUTORECONF_HOOK
 	@$$(call MESSAGE,"Autoreconfiguring")
-	$(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
+	$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
 	$(Q)if test "$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
 		for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
 		toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \
@@ -188,9 +191,14 @@ define AUTORECONF_HOOK
 endef
 
 ifeq ($$($(2)_AUTORECONF),YES)
+ifeq ($(5),host)
+$(2)_POST_PATCH_HOOKS += AUTORECONF_HOOK
+$(2)_DEPENDENCIES += host-automake host-autoconf host-libtool-host
+else
 $(2)_POST_PATCH_HOOKS += AUTORECONF_HOOK
 $(2)_DEPENDENCIES += host-automake host-autoconf host-libtool $(if $(BR2_NEEDS_GETTEXT,y),host-gettext)
 endif
+endif
 
 #
 # Build step. Only define it if not already defined by the package .mk
@@ -225,10 +233,6 @@ endif
 ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
 	$$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
-	for i in $$$$(find $(STAGING_DIR)/usr/lib* -name "*.la"); do \
-		cp -f $$$$i $$$$i~; \
-		$$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$$$i; \
-	done
 endef
 endif
 
package/Makefile.in +1 -2
index bb2aafa..46e9c50 100644
@@ -81,7 +81,6 @@ ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
 endif
 
-TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
 TARGET_CXXFLAGS=$(TARGET_CFLAGS)
 TARGET_SYSROOT_OPT=--sysroot=$(STAGING_DIR)
 
@@ -165,7 +164,7 @@ BISON:=$(shell which bison || type -p bison)
 HOST_CFLAGS   += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include
 HOST_CXXFLAGS += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include
 HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib
-HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH)
+HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_HOST_DIR)/usr/bin:$(PATH)
 
 # hostcc version as an integer - E.G. 4.3.2 => 432
 HOSTCC_VERSION:=$(shell $(HOSTCC) --version | \
package/autoconf/autoconf.mk +8 -3
index 4b58986..4c69e91 100644
@@ -9,13 +9,18 @@ AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
 
 AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 		    ac_cv_prog_gnu_m4_gnu=no
-
 AUTOCONF_DEPENDENCIES = microperl host-m4
 
+#HOST_AUTOCONF_AUTORECONF = YES
+#HOST_AUTOCONF_AUTORECONF_ENV = $(HOST_CONFIGURE_OPTS) \
+				ACLOCAL="$(ACLOCAL)" \
+				AUTOCONF="$(AUTOCONF)" \
+				AUTOHEADER="$(AUTOHEADER)" \
+				AUTOMAKE="$(AUTOMAKE)" \
+				LIBTOOLIZE="/bin/true"
 HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
 			ac_cv_prog_gnu_m4_gnu=no
-
-HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
+HOST_AUTOCONF_DEPENDENCIES = host-m4
 
 $(eval $(call AUTOTARGETS,package,autoconf))
 $(eval $(call AUTOTARGETS,package,autoconf,host))
package/automake/automake.mk +1 -0
index 565bd42..9f42bed 100644
@@ -24,4 +24,5 @@ $(eval $(call AUTOTARGETS,package,automake,host))
 AUTOMAKE = $(HOST_DIR)/usr/bin/automake
 ACLOCAL_STAGING_DIR = $(STAGING_DIR)/usr/share/aclocal
 ACLOCAL_HOST_DIR = $(HOST_DIR)/usr/share/aclocal
+ACLOCAL_HOST_HOST_DIR = $(HOST_HOST_DIR)/usr/share/aclocal
 ACLOCAL = $(HOST_DIR)/usr/bin/aclocal
package/libtool-host/libtool-host.mk new file +43 -0

43 lines not on this page · raw message

package/libtool/libtool-2.2.6b_cross-environment-support.patch new file +300 -0

300 lines not on this page · raw message

package/libtool/libtool.mk +23 -4
index a996876..3177c72 100644
@@ -3,22 +3,41 @@
 # libtool
 #
 #############################################################
-LIBTOOL_VERSION = 1.5.24
+LIBTOOL_VERSION = 2.2.6b
 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz
 LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
 
+HOST_LIBTOOL_AUTORECONF = YES
+HOST_LIBTOOL_AUTORECONF_ENV = $(HOST_CONFIGURE_OPTS) \
+				ACLOCAL="$(ACLOCAL)" \
+				AUTOCONF="$(AUTOCONF)" \
+				AUTOHEADER="$(AUTOHEADER)" \
+				AUTOMAKE="$(AUTOMAKE)" \
+				LIBTOOL="$(LIBTOOL_HOST)" \
+				LIBTOOLIZE="/bin/true"
+HOST_LIBTOOL_CONF_ENV = LIBTOOL="$(LIBTOOL_HOST)"
+
+# While running the configure script, the litool package uses aclocal
+# from the host system (because@this point we haven't build our
+# own). And because we can't know which version is installed on the
+# host system, we have to sed the generated libtool script which may
+# give compilation errors with some host libtool if version ~= 1.5.x.
+define HOST_LIBTOOL_POST_CONFIG_PATCH
+	$(SED) "s,lt_ptr,void *,g" $(@D)/libtool
+endef
+HOST_LIBTOOL_POST_CONFIGURE_HOOKS += HOST_LIBTOOL_POST_CONFIG_PATCH
+
 define HOST_LIBTOOL_CUSTOM_INSTALL
 	install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/libtool.m4 \
 		$(STAGING_DIR)/usr/share/aclocal/libtool.m4
 	install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/ltdl.m4 \
 		$(STAGING_DIR)/usr/share/aclocal/ltdl.m4
 endef
-
 HOST_LIBTOOL_POST_INSTALL_HOOKS += HOST_LIBTOOL_CUSTOM_INSTALL
 
 $(eval $(call AUTOTARGETS,package,libtool))
 $(eval $(call AUTOTARGETS,package,libtool,host))
 
 # variables used by other packages
-LIBTOOL:=$(HOST_DIR)/usr/bin/libtool
-LIBTOOLIZE:=$(HOST_DIR)/usr/bin/libtoolize
+LIBTOOL_TARGET:=$(HOST_DIR)/usr/bin/libtool
+LIBTOOLIZE_TARGET:=$(HOST_DIR)/usr/bin/libtoolize
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/7 package: modifications to work with new libtool policy

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

---
 package/bash/bash.mk         |    2 ++
 package/directfb/directfb.mk |    2 --
 package/expat/expat.mk       |    1 +
 package/freetype/freetype.mk |    1 +
 package/jpeg/jpeg.mk         |    1 +
 package/ncurses/ncurses.mk   |    1 +
 6 files changed, 6 insertions(+), 2 deletions(-)
package/bash/bash.mk +2 -0
index d7bb699..3d815e2 100644
@@ -6,6 +6,8 @@
 
 BASH_VERSION = 4.1
 BASH_SITE = $(BR2_GNU_MIRROR)/bash
+BASH_AUTORECONF = NO
+
 BASH_DEPENDENCIES = ncurses
 
 # Save the old sh file/link if there is one and symlink bash->sh
package/directfb/directfb.mk +0 -2
index ccb0c5a..d01ef9f 100644
@@ -7,8 +7,6 @@ DIRECTFB_VERSION_MAJOR:=1.4
 DIRECTFB_VERSION:=1.4.3
 DIRECTFB_SITE:=http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
 DIRECTFB_SOURCE:=DirectFB-$(DIRECTFB_VERSION).tar.gz
-DIRECTFB_AUTORECONF = NO
-DIRECTFB_LIBTOOL_PATCH = NO
 DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_INSTALL_TARGET = YES
 
package/expat/expat.mk +1 -0
index 5d68e36..ae725fd 100644
@@ -7,6 +7,7 @@
 EXPAT_VERSION = 2.0.1
 EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.gz
 EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
+EXPAT_AUTORECONF = NO
 EXPAT_LIBTOOL_PATCH = NO
 EXPAT_INSTALL_STAGING = YES
 EXPAT_INSTALL_TARGET = YES
package/freetype/freetype.mk +1 -0
index 5a88cca..99f6998 100644
@@ -7,6 +7,7 @@ FREETYPE_VERSION = 2.3.12
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_LIBTOOL_PATCH = NO
+FREETYPE_AUTORECONF = NO
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_INSTALL_TARGET = YES
 FREETYPE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
package/jpeg/jpeg.mk +1 -0
index 9a4512c..b2e1c7b 100644
@@ -27,6 +27,7 @@ JPEG_INSTALL_STAGING = YES
 JPEG_INSTALL_TARGET = YES
 JPEG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 JPEG_LIBTOOL_PATCH = NO
+JPEG_AUTORECONF = NO
 JPEG_CONF_OPT = --without-x --enable-shared --enable-static
 
 define JPEG_REMOVE_USELESS_TOOLS
package/ncurses/ncurses.mk +1 -0
index 0a49887..70b3e09 100644
@@ -27,6 +27,7 @@ NCURSES_VERSION = 5.7
 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
 NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
 NCURSES_INSTALL_STAGING = YES
+NCURSES_AUTORECONF = NO
 
 NCURSES_CONF_OPT = \
 	--with-shared \
Signature · 1 line
1.7.1
#3 lore raw

PATCH 3/7 tslib: Fix installation with new autotools policy

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

---
 package/tslib/tslib-1.0-newer-libtool-fix.patch |   11 +++++++++++
 package/tslib/tslib.mk                          |    2 --
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 package/tslib/tslib-1.0-newer-libtool-fix.patch
package/tslib/tslib-1.0-newer-libtool-fix.patch new file +11 -0
new file mode 100644
index 0000000..f08d4b6
@@ -0,0 +1,11 @@
+--- tslib-1.0/configure.ac~	2010-03-25 15:59:55.000000000 +0100
++++ tslib-1.0/configure.ac	2010-03-25 15:59:55.000000000 +0100
+@@ -168,7 +168,7 @@
+         AS_HELP_STRING([--with-plugindir=ARG],
+                 [Where to look for plugins (default=${libdir}/ts)]),
+         [PLUGIN_DIR=$withval],
+-        [PLUGIN_DIR='${libdir}/ts/'])
++        [PLUGIN_DIR='${libdir}/ts'])
+ AC_MSG_RESULT($PLUGIN_DIR)
+ AC_SUBST(PLUGIN_DIR)
+ 
package/tslib/tslib.mk +0 -2
index edde0b6..b6a224d 100644
@@ -10,11 +10,9 @@ TSLIB_AUTORECONF = YES
 TSLIB_LIBTOOL_PATCH = NO
 TSLIB_INSTALL_STAGING = YES
 TSLIB_INSTALL_TARGET = YES
-TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
 TSLIB_CONF_OPT = \
 	--enable-shared	\
-	--prefix=/usr	\
 	--sysconfdir=/etc
 
 $(eval $(call AUTOTARGETS,package,tslib))
Signature · 1 line
1.7.1
#4 lore raw

PATCH 4/7 bison: add host rules

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

---
 package/bison/bison.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/bison/bison.mk +1 -0
index 9e28e85..a411d10 100644
@@ -14,3 +14,4 @@ endef
 BISON_POST_CONFIGURE_HOOKS += BISON_DISABLE_EXAMPLES
 
 $(eval $(call AUTOTARGETS,package,bison))
+$(eval $(call AUTOTARGETS,package,bison,host))
Signature · 1 line
1.7.1
#5 lore raw

PATCH 4/7 bison: add host rules

Quoted 1 line · On Sat, 18 Sep 2010 19:59:46 +0200 llandwerlin at gmail.com wrote:

+$(eval $(call AUTOTARGETS,package,bison,host))

Bison is part of our set of mandatory dependencies on the host, as checked in toolchain/dependencies/dependencies.sh. Therefore, host-bison shouldn't be needed.

However, flex is also part of the mandatory dependencies on the host, but we still have a couple of package that depend on host-flex. Interesting.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#6 lore raw

PATCH 5/7 expat: comply with new libtool policy

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

---
 ...pat-2.0.1-Do-not-include-packaged-libtool.patch |   25 +++++++
 package/expat/expat-libdir-la.patch                |   77 --------------------
 package/expat/expat.mk                             |    2 -
 3 files changed, 25 insertions(+), 79 deletions(-)
 create mode 100644 package/expat/expat-2.0.1-Do-not-include-packaged-libtool.patch
 delete mode 100644 package/expat/expat-libdir-la.patch
package/expat/expat-2.0.1-Do-not-include-packaged-libtool.patch new file +25 -0
new file mode 100644
index 0000000..5165e84
@@ -0,0 +1,25 @@
+From cbe99fa8d8bd9f1b6dd85c3423c91daea2c6b4be Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Fri, 17 Sep 2010 11:30:42 +0200
+Subject: [PATCH] Do not include packaged libtool.m4 file
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+---
+ configure.in |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 24bcb40..1c3f31b 100755
+--- a/configure.in
++++ b/configure.in
+@@ -50,7 +50,6 @@ LIBAGE=5
+ 
+ AC_CONFIG_HEADER(expat_config.h)
+ 
+-sinclude(conftools/libtool.m4)
+ sinclude(conftools/ac_c_bigendian_cross.m4)
+ 
+ AC_LIBTOOL_WIN32_DLL
+-- 
+1.6.0.6
+
package/expat/expat-libdir-la.patch deleted +0 -77

77 lines not on this page · raw message

package/expat/expat.mk +0 -2
index ae725fd..b18ffec 100644
@@ -7,8 +7,6 @@
 EXPAT_VERSION = 2.0.1
 EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.gz
 EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
-EXPAT_AUTORECONF = NO
-EXPAT_LIBTOOL_PATCH = NO
 EXPAT_INSTALL_STAGING = YES
 EXPAT_INSTALL_TARGET = YES
 # no install-strip / install-exec
Signature · 1 line
1.7.1
#7 lore raw

PATCH 6/7 sysstat: bump to 9.1.5 and comply with new libtool policy

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

---
 ...t-9.5.1-add-missing-lintl-to-linker-flags.patch |   25 ++++++++++++++++++++
 package/sysstat/sysstat.mk                         |    8 +----
 2 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 package/sysstat/sysstat-9.5.1-add-missing-lintl-to-linker-flags.patch
package/sysstat/sysstat-9.5.1-add-missing-lintl-to-linker-flags.patch new file +25 -0
new file mode 100644
index 0000000..d9b7cf0
@@ -0,0 +1,25 @@
+From fff3734146edf3ff6e2627dba729aa30d1faf8da Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Fri, 17 Sep 2010 17:10:17 +0200
+Subject: [PATCH] Add missing -lintl to linker flags
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+---
+ Makefile.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5dac5c7..6821cce 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -87,6 +87,7 @@ REQUIRE_NLS = -DUSE_NLS -DPACKAGE=\"$(PACKAGE)\" -DLOCALEDIR=\"$(NLS_DIR)\"
+ endif
+ ifdef REQUIRE_NLS
+    DFLAGS += $(REQUIRE_NLS)
++   LFLAGS += -lintl
+ endif
+ INSTALL_CRON = @INSTALL_CRON@
+ CRON_OWNER = @CRON_OWNER@
+-- 
+1.6.0.6
+
package/sysstat/sysstat.mk +2 -6
index 324580e..846eeec 100644
@@ -4,17 +4,13 @@
 #
 #############################################################
 
-SYSSTAT_VERSION = 9.0.5
+SYSSTAT_VERSION = 9.1.5
 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
 SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard/
-SYSSTAT_AUTORECONF = NO
-SYSSTAT_LIBTOOL_PATCH = NO
 SYSSTAT_INSTALL_STAGING = NO
 SYSSTAT_INSTALL_TARGET = YES
 
-# Should be --disable-man-group, it might be a little mistake in the
-# configure.in script.
-SYSSTAT_CONF_OPT = --enable-man-group
+SYSSTAT_CONF_OPT = --disable-man-group
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 SYSSTAT_CONF_OPT += --disable-documentation
 endif
Signature · 1 line
1.7.1
#8 lore raw

PATCH 7/7 gstreamer: allow autoreconfigure with gettext 0.18

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

---
 ...-bad-0.10.14-request-gettext-version-0.18.patch |   26 ++++++++++++++++++++
 ...base-0.10.25-request-gettext-version-0.18.patch |   26 ++++++++++++++++++++
 ...good-0.10.16-request-gettext-version-0.18.patch |   26 ++++++++++++++++++++
 ...ugly-0.10.10-Request-gettext-version-0.18.patch |   26 ++++++++++++++++++++
 ...amer-0.10.25-request-gettext-version-0.18.patch |   26 ++++++++++++++++++++
 5 files changed, 130 insertions(+), 0 deletions(-)
 create mode 100644 package/multimedia/gst-plugins-bad/gst-plugins-bad-0.10.14-request-gettext-version-0.18.patch
 create mode 100644 package/multimedia/gst-plugins-base/gst-plugins-base-0.10.25-request-gettext-version-0.18.patch
 create mode 100644 package/multimedia/gst-plugins-good/gst-plugins-good-0.10.16-request-gettext-version-0.18.patch
 create mode 100644 package/multimedia/gst-plugins-ugly/gst-plugins-ugly-0.10.10-Request-gettext-version-0.18.patch
 create mode 100644 package/multimedia/gstreamer/gstreamer-0.10.25-request-gettext-version-0.18.patch
package/multimedia/gst-plugins-bad/gst-plugins-bad-0.10.14-request-gettext-version-0.18.patch new file +26 -0
new file mode 100644
index 0000000..3248e74
@@ -0,0 +1,26 @@
+From 3e79e82708ef31281eadbce303f934f126f4c3a0 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Fri, 17 Sep 2010 12:39:46 +0200
+Subject: [PATCH] Request gettext version 0.18
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4a3c041..30362f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4 -I .")
+ 
+ dnl set up gettext
+ dnl the version check needs to stay here because autopoint greps for it
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+ AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
+ 
+-- 
+1.6.0.6
+
package/multimedia/gst-plugins-base/gst-plugins-base-0.10.25-request-gettext-version-0.18.patch new file +26 -0
new file mode 100644
index 0000000..3248e74
@@ -0,0 +1,26 @@
+From 3e79e82708ef31281eadbce303f934f126f4c3a0 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Fri, 17 Sep 2010 12:39:46 +0200
+Subject: [PATCH] Request gettext version 0.18
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4a3c041..30362f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4 -I .")
+ 
+ dnl set up gettext
+ dnl the version check needs to stay here because autopoint greps for it
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+ AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
+ 
+-- 
+1.6.0.6
+
package/multimedia/gst-plugins-good/gst-plugins-good-0.10.16-request-gettext-version-0.18.patch new file +26 -0
new file mode 100644
index 0000000..3248e74
@@ -0,0 +1,26 @@
+From 3e79e82708ef31281eadbce303f934f126f4c3a0 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Fri, 17 Sep 2010 12:39:46 +0200
+Subject: [PATCH] Request gettext version 0.18
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4a3c041..30362f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4 -I .")
+ 
+ dnl set up gettext
+ dnl the version check needs to stay here because autopoint greps for it
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+ AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
+ 
+-- 
+1.6.0.6
+
package/multimedia/gst-plugins-ugly/gst-plugins-ugly-0.10.10-Request-gettext-version-0.18.patch new file +26 -0
new file mode 100644
index 0000000..5f611f3
@@ -0,0 +1,26 @@
+From 2699fdb8c52e2e1f86e8682c09d2fe2cf0494d42 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Fri, 17 Sep 2010 16:33:05 +0200
+Subject: [PATCH] Request gettext version 0.18
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0bc29c1..0876781 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -60,7 +60,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
+ 
+ dnl set up gettext
+ dnl the version check needs to stay here because autopoint greps for it
+-AM_GNU_GETTEXT_VERSION(0.11.5)
++AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+ AG_GST_GETTEXT([gst-plugins-ugly-$GST_MAJORMINOR])
+ 
+-- 
+1.6.0.6
+
package/multimedia/gstreamer/gstreamer-0.10.25-request-gettext-version-0.18.patch new file +26 -0
new file mode 100644
index 0000000..3248e74
@@ -0,0 +1,26 @@
+From 3e79e82708ef31281eadbce303f934f126f4c3a0 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Fri, 17 Sep 2010 12:39:46 +0200
+Subject: [PATCH] Request gettext version 0.18
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4a3c041..30362f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4 -I .")
+ 
+ dnl set up gettext
+ dnl the version check needs to stay here because autopoint greps for it
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+ AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
+ 
+-- 
+1.6.0.6
+
Signature · 1 line
1.7.1