Pull request for branch misc-fixes5
The following changes since commit c8ff60c8283b0ad116fcf43f485f199c29432c9d:
Peter Korsgaard (1):
CHANGES: add ace_of_penguins, rubix and xboard
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot misc-fixes5
Thomas Petazzoni (38):
automake: add build dependency on host-autoconf
ccache: remove cleanup of documentation
libxml2: do not apply libtool patch when compiling for host
libxslt: enable compilation on host
libxcb: fix build with Buildroot compiled xsltproc
xapp_mkfontscale: enable compilation for the host
xfont_encoding: add mkfontscale on the host as dependency
xlib_libfontenc: enable compilation on the host
zlib: enable compilation on the host
xfont_font-util: convert to the autotools infrastructure package infrastructure: add LD_LIBRARY_PATH
libpng: enable compilation on the host
ace_of_penguins: add dependency on host-libpng
ace_of_penguins: mark as BROKEN
dependencies: add gzip and bzip2 as base dependencies
libgtk2: break the dependency of host-libgtk2 on host-cairo
libxml-parser-perl: new package
package infrastructure: add PERLLIB and LD_LIBRARY_PATH
intltool: new package
dependencies: add perl as a mandatory dependency
gmpc: add dependency on host-intltool
flex: install in the staging directory
gob2: update dependency on flex
shared-mime-info: run update-mime-database with correct env variables
imagemagick: help configure to detect file_offset_bits
imagemagick: use internal libtool
iw: give path to pkg-config
kexec: bump version to fix build failure
matchbox: apply libtool patch to matchbox-desktop
matchbox: fix dependency to not always rebuilt libmatchbox
shared-mime-info: do not depend on phony target in hook
dosfstools: make sure install targets aren't run everytime
lvm2: prevent dmsetup from being re-installed every time
libeXosip: do not re-run targets at every invocation of 'make'
webkit: several build fixes
webkit: make sure that people don't try to build with uClibc
libsoup: remove --without-html-dir
mplayer: use UTF-8 charset to avoid iconv dependency
package/Config.in | 2 + package/Makefile.in | 16 ++- package/automake/automake.mk | 2 +- package/dosfstools/dosfstools.mk | 32 ++-- package/flex/flex.mk | 1 + package/games/ace_of_penguins/Config.in | 1 + package/games/ace_of_penguins/ace_of_penguins.mk | 2 +- package/gmpc/gmpc.mk | 2 +- package/gob2/Config.in | 1 + package/gob2/gob2.mk | 2 +- package/imagemagick/imagemagick.mk | 11 +- package/intltool/Config.in | 6 + package/intltool/intltook.mk | 16 ++ package/iw/iw.mk | 1 + package/kexec/kexec.mk | 2 +- package/libeXosip2/libeXosip2.mk | 6 + .../host-libgtk2-2.12.12-reduce-dependencies.patch | 200 ++++++++++++++++++++ package/libgtk2/libgtk2.mk | 29 +++- package/libpng/libpng.mk | 5 + package/libsoup/libsoup.mk | 2 +- package/libxml-parser-perl/Config.in | 6 + package/libxml-parser-perl/libxml-parser-perl.mk | 32 +++ package/libxml2/libxml2.mk | 2 + package/libxslt/libxslt.mk | 8 + package/lvm2/lvm2.mk | 2 + package/matchbox/matchbox.mk | 5 +- package/multimedia/mplayer/mplayer.mk | 2 +- package/shared-mime-info/shared-mime-info.mk | 6 +- package/webkit/Config.in | 5 +- package/webkit/gtk-doc.make | 173 +++++++++++++++++ package/webkit/webkit.mk | 4 +- package/x11r7/libxcb/libxcb.mk | 4 +- package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 4 +- package/x11r7/xfont_encodings/xfont_encodings.mk | 1 + package/x11r7/xfont_font-util/xfont_font-util.mk | 74 +------- package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 3 + package/zlib/zlib.mk | 24 +++ toolchain/ccache/ccache.mk | 3 - toolchain/dependencies/dependencies.sh | 2 +- 39 files changed, 588 insertions(+), 111 deletions(-) create mode 100644 package/intltool/Config.in create mode 100644 package/intltool/intltook.mk create mode 100644 package/libgtk2/host-libgtk2-2.12.12-reduce-dependencies.patch create mode 100644 package/libxml-parser-perl/Config.in create mode 100644 package/libxml-parser-perl/libxml-parser-perl.mk create mode 100644 package/webkit/gtk-doc.make
Thanks,
Signature · 1 line
Thomas Petazzoni
PATCH 1/38 automake: add build dependency on host-autoconf
automake for the target fails to build if autoconf is not installed on the host:
checking whether autoconf is installed... no
configure: error: Autoconf 2.58 or better is required.
Please make sure it is installed and in your PATH.
make: *** [/home/test/brbuilttest/build/automake-1.10/.stamp_configured] Error 1
--- package/automake/automake.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/automake/automake.mk +1 -1
@@ -11,7 +11,7 @@ ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff AUTOMAKE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install endif -AUTOMAKE_DEPENDENCIES = autoconf microperl +AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
Signature · 1 line
1.6.3.3
PATCH 2/38 ccache: remove cleanup of documentation
In reply to Thomas PetazzoniThe cleanup of documentation is handled in a global way, in the main Makefile.
--- toolchain/ccache/ccache.mk | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
toolchain/ccache/ccache.mk +0 -3
@@ -163,9 +163,6 @@ $(CCACHE_DIR2)/$(CCACHE_BINARY): $(CCACHE_DIR2)/.configured $(TARGET_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR2)/$(CCACHE_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(CCACHE_DIR2) install -ifneq ($(BR2_HAVE_MANPAGES),y) - rm -rf $(TARGET_DIR)/usr/man -endif # put a bunch of symlinks into /bin, since that is earlier # in the default PATH than /usr/bin where gcc lives (cd $(TARGET_DIR)/bin; \
Signature · 1 line
1.6.3.3
PATCH 3/38 libxml2: do not apply libtool patch when compiling for host
In reply to Thomas PetazzoniThe libtool patch is not applied when building for the target because it does not apply, so do not attempt to apply it when building for the host. This fixes libxml2 build for the host.
--- package/libxml2/libxml2.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
package/libxml2/libxml2.mk +2 -0
@@ -28,6 +28,8 @@ HOST_LIBXML2_CONF_OPT = \ --enable-shared --without-debugging --without-python \ --without-threads +HOST_LIBXML2_LIBTOOL_PATCH = NO + $(eval $(call AUTOTARGETS,package,libxml2)) $(eval $(call AUTOTARGETS,package,libxml2,host))
Signature · 1 line
1.6.3.3
PATCH 4/38 libxslt: enable compilation on host
In reply to Thomas PetazzoniCompiling libxcb (from the X.org stack) requires xsltproc on the host, which is part of libxslt.
--- package/libxslt/libxslt.mk | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
package/libxslt/libxslt.mk +8 -0
@@ -25,7 +25,15 @@ LIBXSLT_CONF_OPT = --with-gnu-ld --enable-shared \ LIBXSLT_DEPENDENCIES = libxml2 $(LIBXSLT_DEPENDENCIES_EXTRA) +HOST_LIBXSLT_CONF_OPT = --enable-shared \ + --without-debugging \ + --without-python \ + --without-threads + +HOST_LIBXSLT_DEPENDENCIES = host-libxml2 + $(eval $(call AUTOTARGETS,package,libxslt)) +$(eval $(call AUTOTARGETS,package,libxslt,host)) $(LIBXSLT_HOOK_POST_INSTALL): $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xslt-config
Signature · 1 line
1.6.3.3
PATCH 5/38 libxcb: fix build with Buildroot compiled xsltproc
In reply to Thomas PetazzoniMake sure that libxcb depends on host-xsltproc, since xsltproc is required for the compilation of libxcb.
Moreover, remove the XSLTPROC=/usr/bin/xsltproc variable definition, which was assuming that XSLTPROC was installed on the host. xsltproc should just be part of the PATH.
--- package/x11r7/libxcb/libxcb.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
package/x11r7/libxcb/libxcb.mk +2 -2
@@ -10,9 +10,9 @@ LIBXCB_SITE = http://xcb.freedesktop.org/dist/ LIBXCB_INSTALL_STAGING = YES LIBXCB_AUTORECONF = NO -LIBXCB_DEPENDENCIES = pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau +LIBXCB_DEPENDENCIES = host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)" -LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb XSLTPROC=/usr/bin/xsltproc +LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb $(eval $(call AUTOTARGETS,package/x11r7,libxcb))
Signature · 1 line
1.6.3.3
PATCH 6/38 xapp_mkfontscale: enable compilation for the host
In reply to Thomas Petazzonimkfontscale on the host is required to build xfonts-encoding for the target.
--- package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +3 -1
@@ -8,6 +8,8 @@ XAPP_MKFONTSCALE_VERSION = 1.0.5 XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_MKFONTSCALE_AUTORECONF = NO -XAPP_MKFONTSCALE_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc +XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libX11 xlib_libfontenc +HOST_XAPP_MKFONTSCALE_DEPENDENCIES = host-zlib host-freetype host-xlib_libfontenc $(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontscale)) +$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontscale,host))
Signature · 1 line
1.6.3.3
PATCH 7/38 xfont_encoding: add mkfontscale on the host as dependency
In reply to Thomas Petazzonimkfontscale on the host is needed to build xfont_encoding, therefore we add host-xapp_mkfontscale as a dependency.
--- package/x11r7/xfont_encodings/xfont_encodings.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/x11r7/xfont_encodings/xfont_encodings.mk +1 -0
@@ -9,5 +9,6 @@ XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font XFONT_ENCODINGS_AUTORECONF = NO XFONT_ENCODINGS_MAKE_OPT = +XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale $(eval $(call AUTOTARGETS,package/x11r7,xfont_encodings))
Signature · 1 line
1.6.3.3
PATCH 8/38 xlib_libfontenc: enable compilation on the host
In reply to Thomas Petazzonixlib_libfontenc is required to build xapp_mkfontscale on the host, which in turn is needed to build font encodings for the target.
--- package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
package/x11r7/xlib_libfontenc/xlib_libfontenc.mk +3 -0
@@ -12,4 +12,7 @@ XLIB_LIBFONTENC_INSTALL_STAGING = YES XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto XLIB_LIBFONTENC_CONF_OPT = --enable-shared --disable-static +HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto + $(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc)) +$(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc,host))
Signature · 1 line
1.6.3.3
PATCH 9/38 zlib: enable compilation on the host
In reply to Thomas Petazzonizlib is needed on the host, to build xlib_libfontenc on the host, to build xapp_mkfontscale on the host, in order to finally build xfonts encodings on the target.
--- package/zlib/zlib.mk | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-)
package/zlib/zlib.mk +24 -0
@@ -30,10 +30,26 @@ define ZLIB_CONFIGURE_CMDS ) endef +define HOST_ZLIB_CONFIGURE_CMDS + (cd $(@D); rm -rf config.cache; \ + $(HOST_CONFIGURE_ARGS) \ + $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(ZLIB_PIC)" \ + ./configure \ + $(ZLIB_SHARED) \ + --prefix="$(HOST_DIR)/usr" \ + --sysconfdir="$(HOST_DIR)/etc" \ + ) +endef + define ZLIB_BUILD_CMDS $(MAKE) -C $(@D) all libz.a endef +define HOST_ZLIB_BUILD_CMDS + $(MAKE) -C $(@D) all libz.a +endef + define ZLIB_INSTALL_STAGING_CMDS $(INSTALL) -D $(@D)/libz.a $(STAGING_DIR)/usr/lib/libz.a $(INSTALL) -D $(@D)/zlib.h $(STAGING_DIR)/usr/include/zlib.h
@@ -41,6 +57,13 @@ define ZLIB_INSTALL_STAGING_CMDS cp -dpf $(@D)/libz.so* $(STAGING_DIR)/usr/lib/ endef +define HOST_ZLIB_INSTALL_CMDS + $(INSTALL) -D $(@D)/libz.a $(HOST_DIR)/usr/lib/libz.a + $(INSTALL) -D $(@D)/zlib.h $(HOST_DIR)/usr/include/zlib.h + $(INSTALL) $(@D)/zconf.h $(HOST_DIR)/usr/include/ + cp -dpf $(@D)/libz.so* $(HOST_DIR)/usr/lib/ +endef + ifeq ($(BR2_HAVE_DEVFILES),y) define ZLIB_INSTALL_TARGET_HEADERS $(INSTALL) -D $(@D)/zlib.h $(TARGET_DIR)/usr/include/zlib.h
@@ -57,3 +80,4 @@ define ZLIB_INSTALL_TARGET_CMDS endef $(eval $(call GENTARGETS,package,zlib)) +$(eval $(call GENTARGETS,package,zlib,host))
Signature · 1 line
1.6.3.3
PATCH 10/38 xfont_font-util: convert to the autotools infrastructure
In reply to Thomas Petazzoni--- package/x11r7/xfont_font-util/xfont_font-util.mk | 74 ++-------------------- 1 files changed, 6 insertions(+), 68 deletions(-)
package/x11r7/xfont_font-util/xfont_font-util.mk +6 -68
@@ -5,76 +5,14 @@ ################################################################################ XFONT_FONT_UTIL_VERSION = 1.0.1 -XFONT_FONT_UTIL_NAME = font-util-$(XFONT_FONT_UTIL_VERSION) XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2 XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_UTIL_AUTORECONF = NO -XFONT_FONT_UTIL_DIR=$(BUILD_DIR)/$(XFONT_FONT_UTIL_NAME) -XFONT_FONT_UTIL_CAT:=$(BZCAT) +XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config -$(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE): - $(call DOWNLOAD,$(XFONT_FONT_UTIL_SITE),$(XFONT_FONT_UTIL_SOURCE)) +define XFONT_FONT_UTIL_POST_INSTALL_FIXES + $(@D)/post-install.sh $(STAGING_DIR) +endef -xfont_font-util-source: $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE) - -$(XFONT_FONT_UTIL_DIR)/.unpacked: $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE) - $(XFONT_FONT_UTIL_CAT) $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(XFONT_FONT_UTIL_DIR) package/x11r7/xfont_font-util/ \*.patch - $(CONFIG_UPDATE) $(XFONT_FONT_UTIL_DIR) - touch $@ - -$(XFONT_FONT_UTIL_DIR)/.configured: $(XFONT_FONT_UTIL_DIR)/.unpacked - (cd $(XFONT_FONT_UTIL_DIR) && rm -rf config.cache) - (cd $(XFONT_FONT_UTIL_DIR) && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --includedir=/usr/include \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - ) - touch $@ - -$(XFONT_FONT_UTIL_DIR)/.compiled: $(XFONT_FONT_UTIL_DIR)/.configured - $(MAKE) -C $(XFONT_FONT_UTIL_DIR) - touch $@ - -$(XFONT_FONT_UTIL_DIR)/.installed: $(XFONT_FONT_UTIL_DIR)/.compiled - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(XFONT_FONT_UTIL_DIR) install - touch $@ - -$(XFONT_FONT_UTIL_DIR)/.hacked: $(XFONT_FONT_UTIL_DIR)/.installed - ( package/x11r7/xfont_font-util/post-install.sh $(STAGING_DIR) ) - touch $@ - -xfont_font-util: host-pkg-config $(XFONT_FONT_UTIL_DIR)/.hacked - -xfont_font-util-unpacked: $(XFONT_FONT_UTIL_DIR)/.unpacked - -xfont_font-util-clean: - -$(MAKE) -C $(XFONT_FONT_UTIL_DIR) clean - -xfont_font-util-dirclean: - rm -rf $(XFONT_FONT_UTIL_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_XFONT_FONT_UTIL),y) -TARGETS+=xfont_font-util -endif +XFONT_FONT_UTIL_POST_INSTALL_STAGING_HOOKS += XFONT_FONT_UTIL_POST_INSTALL_FIXES +$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util))
Signature · 1 line
1.6.3.3
PATCH 11/38 package infrastructure: add LD_LIBRARY_PATH
In reply to Thomas PetazzoniDuring the compilation of target packages, host tools might be used, and in turn, they might use host libraries installed in $(HOST_DIR)/usr/lib. Therefore, we pass a LD_LIBRARY_PATH variable when building packages.
--- package/Makefile.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
package/Makefile.in +5 -1
@@ -236,7 +236,11 @@ TARGET_CONFIGURE_ENV=\ LDFLAGS="$(TARGET_LDFLAGS)" \ FCFLAGS="$(TARGET_FCFLAGS)" \ -TARGET_MAKE_ENV=PATH=$(TARGET_PATH) +# During the compilation of target packages, host tools might be used, +# and in turn, they might use host libraries installed in +# $(HOST_DIR)/usr/lib +TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \ + LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ AR="$(HOSTAR)" \
Signature · 1 line
1.6.3.3
PATCH 12/38 libpng: enable compilation on the host
In reply to Thomas Petazzonilibpng is needed on the host to build ace_of_penguins.
--- package/libpng/libpng.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
package/libpng/libpng.mk +5 -0
@@ -11,7 +11,12 @@ LIBPNG_INSTALL_STAGING = YES LIBPNG_CONF_OPT = --without-libpng-compat LIBPNG_DEPENDENCIES = host-pkg-config zlib +HOST_LIBPNG_LIBTOOL_PATCH = NO +HOST_LIBPNG_CONF_OPT = --without-libpng-compat +HOST_LIBPNG_DEPENDENCIES = host-zlib + $(eval $(call AUTOTARGETS,package,libpng)) +$(eval $(call AUTOTARGETS,package,libpng,host)) $(LIBPNG_HOOK_POST_INSTALL): $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
Signature · 1 line
1.6.3.3
PATCH 13/38 ace_of_penguins: add dependency on host-libpng
In reply to Thomas Petazzonilibpng is needed on the host to build the make-imglib utility, built during the compilation of ace_of_penguins for the target.
--- package/games/ace_of_penguins/ace_of_penguins.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/games/ace_of_penguins/ace_of_penguins.mk +1 -1
@@ -10,6 +10,6 @@ ACE_OF_PENGUINS_AUTORECONF = YES ACE_OF_PENGUINS_STAGING = NO ACE_OF_PENGUINS_TARGET = YES -ACE_OF_PENGUINS_DEPENDENCIES = libpng xserver_xorg-server xlib_libXpm +ACE_OF_PENGUINS_DEPENDENCIES = libpng host-libpng xserver_xorg-server xlib_libXpm $(eval $(call AUTOTARGETS,package/games,ace_of_penguins))
Signature · 1 line
1.6.3.3
PATCH 14/38 ace_of_penguins: mark as BROKEN
In reply to Thomas PetazzoniThis package is BROKEN in the way it compiles make-imglib and text2c for the host while being in cross-compiled mode. It does not use CC_FOR_BUILD and CFLAGS_FOR_BUILD as it should.
No upstream release has been made since 2001 and since it is a relatively useless package, I don't think it's worth the trouble to sanitize its build system.
--- package/games/ace_of_penguins/Config.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/games/ace_of_penguins/Config.in +1 -0
@@ -3,6 +3,7 @@ config BR2_PACKAGE_ACE_OF_PENGUINS select BR2_PACKAGE_LIBPNG depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XLIB_LIBXPM + depends on BROKEN help The Ace of Penguins is a set of Unix/X solitaire games based on the ones available for Windows but with a number of
Signature · 1 line
1.6.3.3
PATCH 15/38 dependencies: add gzip and bzip2 as base dependencies
In reply to Thomas PetazzoniThey are needed to uncompress the tarballs we download. bzip2, for instance, is not necessarly installed by default on basic Debian systems.
--- toolchain/dependencies/dependencies.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
toolchain/dependencies/dependencies.sh +1 -1
@@ -122,7 +122,7 @@ if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then fi; # Check that a few mandatory programs are installed -for prog in awk bison flex msgfmt makeinfo patch ; do +for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 ; do if ! which $prog > /dev/null ; then /bin/echo -e "\nYou must install '$prog' on your build machine"; if test $prog = "makeinfo" ; then
Signature · 1 line
1.6.3.3
PATCH 16/38 libgtk2: break the dependency of host-libgtk2 on host-cairo
In reply to Thomas PetazzoniMaking a full build of libgtk2 for the host is a pain, since it requires host-cairo, which it turns requires a full X.org stack to be compiled for the host.
Moreover, building libgtk2 for the host completely is useless: we only need gdk-pixbuf-csource and gtk-update-icon-cache.
In this patch, we add a new host-libgtk2-2.12.12-reduce-dependencies.patch, that is only applied to libgtk2 when being built for the host. This patch removes a lot of dependencies in configure.in, which allows to:
* run make and make install in gdk-pixbuf/, which compiles and installs the gdk-pixbuf library and the gdk-pixbuf-csource utility
* run make gtk-update-icon-cache in gtk/, which compiles the gtk-update-icon-cache utility, which is then installed manually
The compilation and installation steps of libgtk2 for the host are therefore overriden, so as to not use the default behaviour, which would attempt to build the full gtk library.
--- .../host-libgtk2-2.12.12-reduce-dependencies.patch | 200 ++++++++++++++++++++ package/libgtk2/libgtk2.mk | 29 +++- 2 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 package/libgtk2/host-libgtk2-2.12.12-reduce-dependencies.patch
package/libgtk2/host-libgtk2-2.12.12-reduce-dependencies.patch new file +200 -0
@@ -0,0 +1,200 @@ +Index: gtk+-2.12.12/configure.in +=================================================================== +--- gtk+-2.12.12.orig/configure.in 2008-09-13 02:01:07.000000000 +0200 ++++ gtk+-2.12.12/configure.in 2010-02-21 10:42:40.000000000 +0100 +@@ -32,9 +32,6 @@ + + # required versions of other packages + m4_define([glib_required_version], [2.13.5]) +-m4_define([pango_required_version], [1.17.3]) +-m4_define([atk_required_version], [1.9.0]) +-m4_define([cairo_required_version], [1.2.0]) + + + AC_INIT([gtk+], [gtk_version], +@@ -239,12 +236,12 @@ + gdktarget=x11 + fi + +-AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target], ++AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target], + gdktarget=$with_gdktarget) + + AC_SUBST(gdktarget) + case $gdktarget in +- x11|win32|quartz|directfb) ;; ++ x11|win32|quartz|directfb|none) ;; + *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);; + esac + +@@ -349,10 +346,7 @@ + ## the version requirements since those make the module lists + ## annoying to construct + PKG_CHECK_MODULES(BASE_DEPENDENCIES, +- [glib-2.0 >= glib_required_version dnl +- atk >= atk_required_version dnl +- pango >= pango_required_version dnl +- cairo >= cairo_required_version]) ++ [glib-2.0 >= glib_required_version]) + + if test "$os_win32" != yes; then + # libtool option to control which symbols are exported +@@ -1061,7 +1055,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS= + GDK_PIXBUF_XLIB_EXTRA_LIBS= + +-X_PACKAGES=fontconfig ++X_PACKAGES= + GDK_EXTRA_LIBS="$GDK_WLIBS" + GDK_EXTRA_CFLAGS= + +@@ -1070,14 +1064,6 @@ + GTK_DEP_LIBS_FOR_X= + + if test "x$gdktarget" = "xx11"; then +- # +- # We use fontconfig very peripherally when decoding the default +- # settings. +- # +- if $PKG_CONFIG --exists fontconfig; then : ; else +- AC_MSG_ERROR([ +-*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.]) +- fi + + # + # Check for basic X packages; we use pkg-config if available +@@ -1124,16 +1110,6 @@ + gtk_save_LIBS=$LIBS + LIBS="$x_libs_for_checks $LIBS" + +- # Sanity check for the X11 and Xext libraries. While everything we need from +- # Xext is optional, the chances a system has *none* of these things is so +- # small that we just unconditionally require it. +- AC_CHECK_FUNC(XOpenDisplay, :, +- AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.])) +- AC_CHECK_FUNC(XextFindDisplay, :, +- AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.])) +- AC_CHECK_FUNC(XRenderQueryExtension, :, +- AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.])) +- + # Check for xReply + + AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply]) +@@ -1418,48 +1394,6 @@ + AM_CONDITIONAL(USE_DIRECTFB, false) + fi + +- +-# Check for Pango flags +- +-if test "x$gdktarget" = "xwin32"; then +- PANGO_PACKAGES="pangowin32 pangocairo" +-else +- PANGO_PACKAGES="pango pangocairo" +-fi +- +-AC_MSG_CHECKING(Pango flags) +-if $PKG_CONFIG --exists $PANGO_PACKAGES ; then +- PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` +- PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` +- +- AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS) +-else +- AC_MSG_ERROR([ +-*** Pango not found. Pango built with Cairo support is required +-*** to build GTK+. See http://www.pango.org for Pango information. +-]) +-fi +- +-CFLAGS="$CFLAGS $PANGO_CFLAGS" +- +-if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then +- : +-else +- gtk_save_LIBS="$LIBS" +- LIBS="$PANGO_LIBS $LIBS" +- AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([ +-*** Can't link to Pango. Pango is required to build +-*** GTK+. For more information see http://www.pango.org])) +- LIBS="$gtk_save_LIBS" +-fi +- +-CFLAGS="$saved_cflags" +-LDFLAGS="$saved_ldflags" +- +-GDK_PACKAGES="$PANGO_PACKAGES" +-if test "x$gdktarget" = "xx11"; then +- GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" +-fi + GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" + GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" + +@@ -1468,7 +1402,7 @@ + # into the pkg-config files + # + if test $enable_explicit_deps != yes ; then +- GDK_PACKAGES="$PANGO_PACKAGES" ++ GDK_PACKAGES= + GDK_EXTRA_LIBS= + fi + +@@ -1479,39 +1413,10 @@ + AC_SUBST(GDK_DEP_CFLAGS) + + +-######################################## +-# Check for Accessibility Toolkit flags +-######################################## +- +-ATK_PACKAGES=atk +-AC_MSG_CHECKING(ATK flags) +-if $PKG_CONFIG --exists $ATK_PACKAGES ; then +- ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` +- ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` +- +- AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS) +-else +- AC_MSG_ERROR([ +-*** Accessibility Toolkit not found. Accessibility Toolkit is required +-*** to build GTK+. +-]) +-fi +- +-if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then +- : +-else +- gtk_save_LIBS="$LIBS" +- LIBS="$ATK_LIBS $LIBS" +- AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([ +- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required +- *** to build GTK+])) +- LIBS="$gtk_save_LIBS" +-fi +- +-GTK_PACKAGES="atk cairo" ++GTK_PACKAGES= + GTK_EXTRA_LIBS= + GTK_EXTRA_CFLAGS= +-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" ++GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" + GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" + + if test x"$os_win32" = xyes; then +@@ -1601,17 +1506,6 @@ + + gtk_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" +- +-AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([ +-*** Can't find cairo-pdf.h. You must build Cairo with the pdf +-*** backend enabled.])) +- +-if test "$os_win32" != "yes"; then +- AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([ +-*** Can't find cairo-ps.h. You must build Cairo with the +-*** postscript backend enabled.])) +-fi +- + CPPFLAGS="$gtk_save_cppflags" + +
package/libgtk2/libgtk2.mk +26 -3
@@ -119,17 +119,40 @@ else LIBGTK2_CONF_OPT += --disable-cups endif -HOST_LIBGTK2_DEPENDENCIES = host-cairo host-libglib2 host-pango host-atk +# We do not build a full version of libgtk2 for the host, because that +# requires compiling Cairo, Pango, ATK and X.org for the +# host. Therefore, we patch it to remove dependencies, and we hack the +# build to only build gdk-pixbuf-from-source and +# gtk-update-icon-cache, which are the host tools needed to build Gtk +# for the target. + +HOST_LIBGTK2_DEPENDENCIES = host-libglib2 +HOST_LIBGTK2_AUTORECONF = YES HOST_LIBGTK2_CONF_OPT = \ --disable-static \ --disable-glibtest \ --without-libtiff \ --without-libjpeg \ - --with-x \ - --with-gdktarget=x11 \ + --with-gdktarget=none \ --disable-cups \ --disable-debug +define HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK + toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME) host-*.patch +endef + +HOST_LIBGTK2_POST_PATCH_HOOKS += HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK + +define HOST_LIBGTK2_BUILD_CMDS + $(HOST_MAKE_ENV) make -C $(@D)/gdk-pixbuf + $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache +endef + +define HOST_LIBGTK2_INSTALL_CMDS + $(HOST_MAKE_ENV) make -C $(@D)/gdk-pixbuf install + cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin +endef + $(eval $(call AUTOTARGETS,package,libgtk2)) $(eval $(call AUTOTARGETS,package,libgtk2,host))
Signature · 1 line
1.6.3.3
PATCH 17/38 libxml-parser-perl: new package
In reply to Thomas PetazzoniThis Perl module is needed to build intltool, which in turn is needed to build several of our packages. We assume that Perl is installed on the host.
Only the host variant of this package has been tested and is used.
--- package/Config.in | 1 + package/libxml-parser-perl/Config.in | 6 ++++ package/libxml-parser-perl/libxml-parser-perl.mk | 32 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 0 deletions(-) create mode 100644 package/libxml-parser-perl/Config.in create mode 100644 package/libxml-parser-perl/libxml-parser-perl.mk
package/Config.in +1 -0
@@ -412,6 +412,7 @@ source "package/ezxml/Config.in" source "package/libxml2/Config.in" source "package/libxslt/Config.in" source "package/xerces/Config.in" +source "package/libxml-parser-perl/Config.in" endmenu # java support
package/libxml-parser-perl/Config.in new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBXML_PARSER_PERL + bool "libxml-parser-perl" + help + The Perl XML::Parser module. + + http://www.cpan.org/modules/by-module/XML/
package/libxml-parser-perl/libxml-parser-perl.mk new file +32 -0
@@ -0,0 +1,32 @@ +############################################################# +# +# libxml-parser-perl +# +############################################################# +LIBXML_PARSER_PERL_VERSION:=2.36 +LIBXML_PARSER_PERL_SOURCE:=XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz +LIBXML_PARSER_PERL_SITE:=http://www.cpan.org/modules/by-module/XML/ + +HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat + +define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS + (cd $(@D) ; \ + perl Makefile.PL \ + PREFIX=$(HOST_DIR)/usr \ + EXPATLIBPATH=$(HOST_DIR)/usr/lib \ + EXPATINCPATH=$(HOST_DIR)/usr/include \ + INSTALLDIRS=site \ + INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \ + ) +endef + +define HOST_LIBXML_PARSER_PERL_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install +endef + +$(eval $(call GENTARGETS,package,libxml-parser-perl)) +$(eval $(call GENTARGETS,package,libxml-parser-perl,host))
Signature · 1 line
1.6.3.3
PATCH 17/38 libxml-parser-perl: new package
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> This Perl module is needed to build intltool, which in turn is needed Thomas> to build several of our packages. We assume that Perl is installed on Thomas> the host.
Thomas> Only the host variant of this package has been tested and is used.
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---
Thomas> package/Config.in | 1 + Thomas> package/libxml-parser-perl/Config.in | 6 ++++ Thomas> package/libxml-parser-perl/libxml-parser-perl.mk | 32 ++++++++++++++++++++++ Thomas> 3 files changed, 39 insertions(+), 0 deletions(-) Thomas> create mode 100644 package/libxml-parser-perl/Config.in Thomas> create mode 100644 package/libxml-parser-perl/libxml-parser-perl.mk
Thomas> diff --git a/package/Config.in b/package/Config.in Thomas> index 5ddd63c..00f3401 100644
Thomas> --- a/package/Config.in
Thomas> +++ b/package/Config.in
Thomas> @@ -412,6 +412,7 @@ source "package/ezxml/Config.in"
Thomas> source "package/libxml2/Config.in" Thomas> source "package/libxslt/Config.in" Thomas> source "package/xerces/Config.in"
Thomas> +source "package/libxml-parser-perl/Config.in" Thomas> endmenu
Thomas> # java support
Thomas> diff --git a/package/libxml-parser-perl/Config.in b/package/libxml-parser-perl/Config.in Thomas> new file mode 100644
Thomas> index 0000000..c96e9ee
Thomas> --- /dev/null
Thomas> +++ b/package/libxml-parser-perl/Config.in
Thomas> @@ -0,0 +1,6 @@
Thomas> +config BR2_PACKAGE_LIBXML_PARSER_PERL
Thomas> + bool "libxml-parser-perl"
Thomas> + help
Thomas> + The Perl XML::Parser module.
Thomas> +
Thomas> + http://www.cpan.org/modules/by-module/XML/
Thomas> \ No newline at end of file
Missing newline.
It should presumably select EXPAT?
Thomas> diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk Thomas> new file mode 100644
Thomas> index 0000000..08446d5
Thomas> --- /dev/null
Thomas> +++ b/package/libxml-parser-perl/libxml-parser-perl.mk
Thomas> @@ -0,0 +1,32 @@
Thomas> +#############################################################
Thomas> +#
Thomas> +# libxml-parser-perl
Thomas> +#
Thomas> +#############################################################
Thomas> +LIBXML_PARSER_PERL_VERSION:=2.36
Thomas> +LIBXML_PARSER_PERL_SOURCE:=XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz
Thomas> +LIBXML_PARSER_PERL_SITE:=http://www.cpan.org/modules/by-module/XML/
Thomas> +
Thomas> +HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat
And have a similar line for the TARGET.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 17/38 libxml-parser-perl: new package
Quoted 3 lines · On Mon, 22 Feb 2010 17:19:03 +0100 Peter Korsgaard <[email protected]> wrote:
Missing newline.
It should presumably select EXPAT?
Yes.
Quoted 3 lines
Thomas> +HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat
And have a similar line for the TARGET.
Yes.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 18/38 package infrastructure: add PERLLIB and LD_LIBRARY_PATH
In reply to Thomas PetazzoniNow that we build Perl modules in $(HOST_DIR), PERLLIB must be defined to $(HOST_DIR)/usr/lib/perl.
Moreover, several utilities built into $(HOST_DIR) depend on libraries installed in $(HOST_DIR)/usr/lib. We must therefore pass the appropriate LD_LIBRARY_PATH variable.
--- package/Makefile.in | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)
package/Makefile.in +9 -3
@@ -228,6 +228,8 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ + PERLLIB="$(HOST_DIR)/usr/lib/perl" \ + LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" \ STAGING_DIR="$(STAGING_DIR)" TARGET_CONFIGURE_ENV=\
@@ -240,7 +242,8 @@ TARGET_CONFIGURE_ENV=\ # and in turn, they might use host libraries installed in # $(HOST_DIR)/usr/lib TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \ - LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" + LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" \ + PERLLIB="$(HOST_DIR)/usr/lib/perl" HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ AR="$(HOSTAR)" \
@@ -278,11 +281,14 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \ ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" + PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \ + PERLLIB="$(HOST_DIR)/usr/lib/perl" HOST_MAKE_ENV=PATH=$(HOST_PATH) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" + PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \ + LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" \ + PERLLIB="$(HOST_DIR)/usr/lib/perl" #######################################################################
Signature · 1 line
1.6.3.3
PATCH 18/38 package infrastructure: add PERLLIB and LD_LIBRARY_PATH
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Now that we build Perl modules in $(HOST_DIR), PERLLIB must be defined Thomas> to $(HOST_DIR)/usr/lib/perl.
Thomas> Moreover, several utilities built into $(HOST_DIR) depend on libraries Thomas> installed in $(HOST_DIR)/usr/lib. We must therefore pass the Thomas> appropriate LD_LIBRARY_PATH variable.
Same comment as the other one setting LD_LIBRARY_PATH - Perhaps the two patches should get merged?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 18/38 package infrastructure: add PERLLIB and LD_LIBRARY_PATH
Quoted 9 lines · On Mon, 22 Feb 2010 17:21:16 +0100 Peter Korsgaard <[email protected]> wrote:
Thomas> Now that we build Perl modules in $(HOST_DIR), PERLLIB must be defined Thomas> to $(HOST_DIR)/usr/lib/perl.
Thomas> Moreover, several utilities built into $(HOST_DIR) depend on libraries Thomas> installed in $(HOST_DIR)/usr/lib. We must therefore pass the Thomas> appropriate
LD_LIBRARY_PATHvariable.Same comment as the other one setting
LD_LIBRARY_PATH- Perhaps the two patches should get merged?
Will do.
Thanks,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 19/38 intltool: new package
In reply to Thomas PetazzoniThis XML internationalization set of tools is required to build several of our packages, and may not be available on the host machine.
Only the host variant has been tested.
--- package/Config.in | 1 + package/intltool/Config.in | 6 ++++++ package/intltool/intltook.mk | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) create mode 100644 package/intltool/Config.in create mode 100644 package/intltool/intltook.mk
package/Config.in +1 -0
@@ -46,6 +46,7 @@ source "package/pkg-config/Config.in" source "package/readline/Config.in" source "package/valgrind/Config.in" source "package/pcre/Config.in" +source "package/intltool/Config.in" comment "Other stuff" source "package/at/Config.in"
package/intltool/Config.in new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_INTLTOOL + bool "intltool" + help + Utility scripts for internationalizing XML + + http://www.freedesktop.org/wiki/Software/intltool
package/intltool/intltook.mk new file +16 -0
@@ -0,0 +1,16 @@ +############################################################# +# +# intltool +# +############################################################# +INTLTOOL_VERSION:=0.40.6 +INTLTOOL_SOURCE:=intltool-$(INTLTOOL_VERSION).tar.bz2 +INTLTOOL_SITE:=http://ftp.acc.umu.se/pub/GNOME/sources/intltool/0.40/ + +HOST_INTLTOOL_DEPENDENCIES = host-libxml-parser-perl +HOST_INTLTOOL_CONF_OPT = \ + PERLLIB=$(HOST_DIR)/usr/lib/perl + +$(eval $(call AUTOTARGETS,package,intltool)) +$(eval $(call AUTOTARGETS,package,intltool,host)) +
Signature · 1 line
1.6.3.3
PATCH 20/38 dependencies: add perl as a mandatory dependency
In reply to Thomas PetazzoniNow that we might happen to build libxml-parser-perl and intltool, Perl becomes a mandatory dependency. This shouldn't be a problem since most distributions install Perl by default anyway.
--- toolchain/dependencies/dependencies.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
toolchain/dependencies/dependencies.sh +1 -1
@@ -122,7 +122,7 @@ if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then fi; # Check that a few mandatory programs are installed -for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 ; do +for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl ; do if ! which $prog > /dev/null ; then /bin/echo -e "\nYou must install '$prog' on your build machine"; if test $prog = "makeinfo" ; then
Signature · 1 line
1.6.3.3
PATCH 21/38 gmpc: add dependency on host-intltool
In reply to Thomas Petazzoni--- package/gmpc/gmpc.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/gmpc/gmpc.mk +1 -1
@@ -11,7 +11,7 @@ GMPC_CONF_ENV = ac_cv_lib_curl_curl_global_init=yes \ ac_cv_path_GOB2=$(GOB2_HOST_BINARY) GMPC_CONF_OPT = --disable-mmkeys -GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd host-gob2 +GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd host-gob2 host-intltool ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y) GMPC_DEPENENCIES += xlib_libSM
Signature · 1 line
1.6.3.3
PATCH 22/38 flex: install in the staging directory
In reply to Thomas PetazzoniFlex contains a libfl.a directory, which programs for the target might link against. Therefore, we need to install flex to the staging directory. An example of such a program is gob2, which needs the yywrap() function, which is implemented by libfl.
--- package/flex/flex.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/flex/flex.mk +1 -0
@@ -9,6 +9,7 @@ FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex FLEX_DIR:=$(BUILD_DIR)/flex-$(FLEX_VERSION) +FLEX_INSTALL_STAGING=YES # lex -> flex define FLEX_INSTALL_LEX
Signature · 1 line
1.6.3.3
PATCH 23/38 gob2: update dependency on flex
In reply to Thomas Petazzonigob2 for the target needs both flex on the host (for running the flex program at compile time) and flex on the target (so that it can link against libfl.a).
--- package/gob2/Config.in | 1 + package/gob2/gob2.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
package/gob2/Config.in +1 -0
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GOB2 bool "gob2" select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_FLEX + select BR2_PACKAGE_FLEX_LIBFL select BR2_PACKAGE_BISON help GOB (GTK+ Object Builder) is a preprocessor which simplifies
package/gob2/gob2.mk +1 -1
@@ -7,7 +7,7 @@ GOB2_VERSION = 2.0.15 GOB2_SOURCE = gob2-$(GOB2_VERSION).tar.gz GOB2_SITE = http://ftp.5z.com/pub/gob/ -GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config +GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex HOST_GOB2_DEPENDENCIES = host-libglib2
Signature · 1 line
1.6.3.3
PATCH 24/38 shared-mime-info: run update-mime-database with correct env variables
In reply to Thomas PetazzoniWhen installing shared-mime-info on the target, we runn update-mime-database, which has been built previously by building and installing shared-mime-info for the host. However, for update-mime-database (host version) to run properly, we must pass the appropriate LD_LIBRARY_PATH variable.
We re-use the existing $(HOST_MAKE_ENV) variable to pass all the appropriate variables.
--- package/shared-mime-info/shared-mime-info.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/shared-mime-info/shared-mime-info.mk +1 -1
@@ -29,6 +29,6 @@ SHARED_MIME_INFO_HOST_BINARY:=$(HOST_DIR)/usr/bin/update-mime-database # update the shared-mime-info database in the target $(SHARED_MIME_INFO_HOOK_POST_INSTALL): host-shared-mime-info - $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime + $(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime $(INSTALL) -D $(STAGING_DIR)/usr/share/mime/mime.cache $(TARGET_DIR)/usr/share/mime/mime.cache touch $@
Signature · 1 line
1.6.3.3
PATCH 25/38 imagemagick: help configure to detect file_offset_bits
In reply to Thomas Petazzoniimagemagick configure script wants to run programs to detect the file_offset_bits, but fails since it is running cross-compile mode. Therefore, we help the configure script by passing the appropriate ac_cv variable.
--- package/imagemagick/imagemagick.mk | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
package/imagemagick/imagemagick.mk +7 -0
@@ -31,6 +31,12 @@ $(IMAGEMAGICK_DIR)/.unpacked: $(DL_DIR)/$(IMAGEMAGICK_SOURCE) $(CONFIG_UPDATE) $(IMAGEMAGICK_DIR)/config touch $@ +ifeq ($(BR2_LARGEFILE),y) +IMAGEMAGICK_CONF_OPTS = ac_cv_sys_file_offset_bits=64 +else +IMAGEMAGICK_CONF_OPTS = ac_cv_sys_file_offset_bits=32 +endif + $(IMAGEMAGICK_DIR)/.configured: $(IMAGEMAGICK_DIR)/.unpacked (cd $(IMAGEMAGICK_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \
@@ -55,6 +61,7 @@ $(IMAGEMAGICK_DIR)/.configured: $(IMAGEMAGICK_DIR)/.unpacked --without-fpx \ --without-freetype \ --without-x \ + $(IMAGEMAGICK_CONF_OPTS) \ ) touch $@
Signature · 1 line
1.6.3.3
PATCH 26/38 imagemagick: use internal libtool
In reply to Thomas PetazzoniFor some reason, our imagemagick.mk file calls libtool, but assumes that libtool is available on the host, which may not be true. Therefore, we use ImageMagick's internal libtool, which has been used for compiling/linking all the rest of ImageMagic anyway.
--- package/imagemagick/imagemagick.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
package/imagemagick/imagemagick.mk +2 -2
@@ -83,8 +83,8 @@ $(IMAGEMAGICK_LIB): $(STAGING_DIR)/usr/lib/libMagickCore.a touch -c $@ $(IMAGEMAGICK_DIR)/.libinstall: $(IMAGEMAGICK_LIB) - libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/coders - libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/filters + $(IMAGEMAGICK_DIR)/libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/coders + $(IMAGEMAGICK_DIR)/libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/filters touch $@ $(TARGET_DIR)/usr/bin/animate: $(IMAGEMAGICK_LIB)
Signature · 1 line
1.6.3.3
PATCH 27/38 iw: give path to pkg-config
In reply to Thomas PetazzoniAt install stage, iw needs pkg-config, through the PKG_CONFIG environment variable.
--- package/iw/iw.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/iw/iw.mk +1 -0
@@ -11,6 +11,7 @@ IW_DEPENDENCIES = libnl IW_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install IW_CONFIG = $(IW_DIR)/.config IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ + PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \ GIT_DIR=$(IW_DIR) $(eval $(call AUTOTARGETS,package,iw))
Signature · 1 line
1.6.3.3
PATCH 28/38 kexec: bump version to fix build failure
In reply to Thomas Petazzoni--- package/kexec/kexec.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/kexec/kexec.mk +1 -1
@@ -3,7 +3,7 @@ # kexec # ############################################################# -KEXEC_VERSION = 2.0.0 +KEXEC_VERSION = 2.0.1 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.bz2 KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/horms/kexec-tools/ # no install-strip/install-exec
Signature · 1 line
1.6.3.3
PATCH 29/38 matchbox: apply libtool patch to matchbox-desktop
In reply to Thomas Petazzonimatchbox-desktop fails to build because it tries to read /usr/lib/libxcb.la, which doesn't exist on a very basic system with no development files instead. The buildroot-libtool.patch must therefore be applied.
Unfortunately, matchbox doesn't yet use the autotools infrastructure, so we have to manually apply the patch.
--- package/matchbox/matchbox.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/matchbox/matchbox.mk +1 -0
@@ -141,6 +141,7 @@ $(MATCHBOX_PL_DIR)/.unpacked: $(DL_DIR)/$(MATCHBOX_PL_SOURCE) $(MATCHBOX_DP_DIR)/.unpacked: $(DL_DIR)/$(MATCHBOX_DP_SOURCE) $(MATCHBOX_CAT) $(DL_DIR)/$(MATCHBOX_DP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(SED) 's:mbfolder\.png:mbtasks\.png:g' $(MATCHBOX_DP_DIR)/modules/tasks.c + toolchain/patch-kernel.sh $(MATCHBOX_DP_DIR) package/ buildroot-libtool.patch touch $(MATCHBOX_DP_DIR)/.unpacked $(MATCHBOX_FK_DIR)/.unpacked: $(DL_DIR)/$(MATCHBOX_FK_SOURCE)
Signature · 1 line
1.6.3.3
PATCH 30/38 matchbox: fix dependency to not always rebuilt libmatchbox
In reply to Thomas PetazzoniReal targets should not depend on phony targets, otherwise they get rebuilt every time.
--- package/matchbox/matchbox.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
package/matchbox/matchbox.mk +2 -2
@@ -219,7 +219,7 @@ else endif -$(MATCHBOX_LIB_DIR)/.configured: $(MATCHBOX_LIB_DIR)/.unpacked xlib_libXext-install-staging +$(MATCHBOX_LIB_DIR)/.configured: $(MATCHBOX_LIB_DIR)/.unpacked (cd $(MATCHBOX_LIB_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ ./configure $(QUIET) \
@@ -610,7 +610,7 @@ $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN): $(STAGING_DIR)/usr/bin/$(MATCHBOX_KB_B cp -af $(STAGING_DIR)/usr/share/matchbox/matchbox-keyboard $(TARGET_DIR)/usr/share/matchbox/ cp -dpf ./package/matchbox/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ -matchbox: host-pkg-config expat $(MATCHBOX_WM_DEPS) $(MATCHBOX_SNOTIFY_DEPS) $(MATCHBOX_LIB_DEPS) $(TARGET_DIR)/usr/lib/libmb.so $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN) +matchbox: host-pkg-config expat xlib_libXext $(MATCHBOX_WM_DEPS) $(MATCHBOX_SNOTIFY_DEPS) $(MATCHBOX_LIB_DEPS) $(TARGET_DIR)/usr/lib/libmb.so $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN) matchbox-panel: matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) $(TARGET_DIR)/usr/bin/matchbox-session $(MATCHBOX_PANEL_DEPS)
Signature · 1 line
1.6.3.3
PATCH 31/38 shared-mime-info: do not depend on phony target in hook
In reply to Thomas PetazzoniReal targets should not depend on phony targets, otherwise they get rebuilt everytime.
--- package/shared-mime-info/shared-mime-info.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
package/shared-mime-info/shared-mime-info.mk +2 -2
@@ -12,7 +12,7 @@ SHARED_MIME_INFO_INSTALL_TARGET = NO SHARED_MIME_INFO_AUTORECONF = NO SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint -SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 libxml2 libglib2 +SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2 SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
@@ -28,7 +28,7 @@ $(eval $(call AUTOTARGETS,package,shared-mime-info,host)) SHARED_MIME_INFO_HOST_BINARY:=$(HOST_DIR)/usr/bin/update-mime-database # update the shared-mime-info database in the target -$(SHARED_MIME_INFO_HOOK_POST_INSTALL): host-shared-mime-info +$(SHARED_MIME_INFO_HOOK_POST_INSTALL): $(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime $(INSTALL) -D $(STAGING_DIR)/usr/share/mime/mime.cache $(TARGET_DIR)/usr/share/mime/mime.cache touch $@
Signature · 1 line
1.6.3.3
PATCH 32/38 dosfstools: make sure install targets aren't run everytime
In reply to Thomas PetazzoniAdding real targets to $(TARGETS) doesn't work, since they are prefixed __real_tgt by the main Makefile. 'make' then always thinks that these targets aren't up-to-date, and re-generate them every time.
Therefore, we switch dosfstools to the more common way of handling packages, with a phony target added to $(TARGETS), this phony target depending on real targets.
--- package/dosfstools/dosfstools.mk | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-)
package/dosfstools/dosfstools.mk +19 -13
@@ -32,7 +32,8 @@ $(DOSFSTOOLS_DIR)/.built : $(DOSFSTOOLS_DIR)/.unpacked $(STRIPCMD) $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY) touch $@ -$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built +$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): # $(DOSFSTOOLS_DIR)/.built + echo foo cp -a $(DOSFSTOOLS_DIR)/$(MKDOSFS_BINARY) $@ touch -c $@
@@ -44,7 +45,20 @@ $(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built cp -a $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY) $@ touch -c $@ -dosfstools: $(TARGET_DIR)/$(DOSFSTOOLS_TARGET_BINARY) $(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY) +DOSFSTOOLS= +ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS),y) +DOSFSTOOLS+=$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY) +endif + +ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK),y) +DOSFSTOOLS+=$(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY) +endif + +ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL),y) +DOSFSTOOLS+=$(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY) +endif + +dosfstools: $(DOSFSTOOLS) dosfstools-clean: rm -f $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
@@ -60,14 +74,6 @@ dosfstools-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS),y) -TARGETS+=$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY) -endif - -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK),y) -TARGETS+=$(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY) -endif - -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL),y) -TARGETS+=$(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY) -endif +ifeq ($(BR2_PACKAGE_DOSFSTOOLS),y) +TARGETS+=dosfstools +endif
Signature · 1 line
1.6.3.3
PATCH 33/38 lvm2: prevent dmsetup from being re-installed every time
In reply to Thomas PetazzoniAfter being copied to target/, touch dmsetup so that its date is newer than the .built stamp file in lvm2 source directory. This prevents make from re-installing dmsetup every time.
--- package/lvm2/lvm2.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
package/lvm2/lvm2.mk +2 -0
@@ -86,9 +86,11 @@ $(LVM2_DIR)/.built: $(LVM2_DIR)/.configured $(LVM2_TARGET_SBINS) $(LVM2_TARGET_DMSETUP_SBINS): $(LVM2_DIR)/.built cp -a $(STAGING_DIR)/sbin/$(notdir $@) $@ + touch $@ $(LVM2_TARGET_LIBS): $(LVM2_DIR)/.built cp -a $(STAGING_DIR)/lib/$(notdir $@) $@ + touch $@ ifeq ($(BR2_PACKAGE_LVM2_DMSETUP_ONLY),y)
Signature · 1 line
1.6.3.3
PATCH 34/38 libeXosip: do not re-run targets at every invocation of 'make'
In reply to Thomas PetazzoniMake sure that we touch the target so that the target is newer than the .compiled stamp file.
--- package/libeXosip2/libeXosip2.mk | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
package/libeXosip2/libeXosip2.mk +6 -0
@@ -43,27 +43,33 @@ $(LIBEXOSIP2_DIR)/.compiled: $(LIBEXOSIP2_DIR)/.configured $(STAGING_DIR)/usr/lib/libeXosip2.so: $(LIBEXOSIP2_DIR)/.compiled cp -dpf $(LIBEXOSIP2_DIR)/src/.libs/libeXosip2.so* $(STAGING_DIR)/usr/lib + touch $@ $(STAGING_DIR)/usr/lib/libeXosip2.a: $(LIBEXOSIP2_DIR)/.compiled cp -dpf $(LIBEXOSIP2_DIR)/src/.libs/libeXosip2.a $(STAGING_DIR)/usr/lib cp -dpf $(LIBEXOSIP2_DIR)/include/*.h $(STAGING_DIR)/usr/include + touch $@ $(STAGING_DIR)/usr/lib/libeXosip2.la: $(LIBEXOSIP2_DIR)/.compiled cp -dpf $(LIBEXOSIP2_DIR)/src/libeXosip2.la $(STAGING_DIR)/usr/lib $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libeXosip2.la + touch $@ $(STAGING_DIR)/usr/bin/sip_reg: $(LIBEXOSIP2_DIR)/.compiled cp -dpf $(LIBEXOSIP2_DIR)/tools/.libs/sip_reg $(STAGING_DIR)/usr/bin + touch $@ $(TARGET_DIR)/usr/lib/libeXosip2.so: $(STAGING_DIR)/usr/lib/libeXosip2.so mkdir -p $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/libeXosip2.so* $(TARGET_DIR)/usr/lib/ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libeXosip2.so* + touch $@ $(TARGET_DIR)/usr/bin/sip_reg: $(STAGING_DIR)/usr/bin/sip_reg mkdir -p $(TARGET_DIR)/usr/bin cp -dpf $(STAGING_DIR)/usr/bin/sip_reg $(TARGET_DIR)/usr/bin + touch $@
Signature · 1 line
1.6.3.3
PATCH 35/38 webkit: several build fixes
In reply to Thomas PetazzoniThis patch fixes different problems:
* The autogen script of Webkit did not find autoconf, automake and aclocal since they are not installed in the host, but in $(HOST_DIR). Therefore we pass HOST_CONFIGURE_OPTS to autogen.sh so that the PATH is correct.
* The autogen script was complaining that gtk-doc.make could not be find. As compiling gtk-doc completely is a pain (depends on Docbook), we just include gtk-doc.make into package/webkit/, and copy it to the source directory.
* The autogen script was complaining about macros used in gtk-doc.make that did not exist. This is because aclocal was not run with $(STAGING_DIR)/usr/share/aclocal/ in the include path. Therefore, we fix ACLOCAL_FLAGS of Webkit's autogen script before running it.
--- package/webkit/gtk-doc.make | 173 +++++++++++++++++++++++++++++++++++++++++++ package/webkit/webkit.mk | 4 +- 2 files changed, 176 insertions(+), 1 deletions(-) create mode 100644 package/webkit/gtk-doc.make
package/webkit/gtk-doc.make new file +173 -0
@@ -0,0 +1,173 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp +else +all-local: +endif + +docs: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +tmpl/*.sgml: + @true + + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp + +############## + +clean-local: + rm -f *~ *.bak + rm -rf .libs + +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + +install-data-local: + -installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs
package/webkit/webkit.mk +3 -1
@@ -25,10 +25,12 @@ endif WEBKIT_CONF_OPT += --disable-video define WEBKIT_AUTOGEN_PATCH +$(SED) 's%ACLOCAL_FLAGS=.*%ACLOCAL_FLAGS="-I autotools -I $(STAGING_DIR)/usr/share/aclocal"%' $(WEBKIT_DIR)/autogen.sh $(SED) 's/AUTOMAKE_FLAGS=.*/AUTOMAKE_FLAGS="--foreign --add-missing --copy"/' $(WEBKIT_DIR)/autogen.sh $(SED) 's/LIBTOOLIZE_FLAGS=.*/LIBTOOLIZE_FLAGS="--force --automake --copy"/' $(WEBKIT_DIR)/autogen.sh +cp package/webkit/gtk-doc.make $(WEBKIT_DIR)/ # Don't run the configure step yet -cd $(WEBKIT_DIR); AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh +cd $(WEBKIT_DIR); $(HOST_CONFIGURE_OPTS) AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh endef WEBKIT_POST_EXTRACT_HOOKS += WEBKIT_AUTOGEN_PATCH
Signature · 1 line
1.6.3.3
PATCH 36/38 webkit: make sure that people don't try to build with uClibc
In reply to Thomas PetazzoniCurrently, webkit uses the pthread_getattr_np() function (in JavaScriptCore/runtime/Collector.cpp), and this function isn't implemented by uClibc (see pthread.h).
So, we enforce the fact that a glibc external toolchain should be used to build Webkit.
--- package/webkit/Config.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
package/webkit/Config.in +3 -2
@@ -2,6 +2,7 @@ config BR2_PACKAGE_WEBKIT bool "webkit" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_ICU select BR2_PACKAGE_CURL
@@ -16,8 +17,8 @@ config BR2_PACKAGE_WEBKIT http://webkit.org/ -comment "webkit requires a toolchain with C++ support and WCHAR enabled" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR +comment "webkit requires a glibc toolchain with C++ support and WCHAR enabled" + depends on !BR2_TOOLCHAIN_EXTERNAL_GLIBC || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR if BR2_PACKAGE_WEBKIT
Signature · 1 line
1.6.3.3
PATCH 36/38 webkit: make sure that people don't try to build with uClibc
On Sun, Feb 21, 2010 at 5:47 PM, Thomas Petazzoni
<[email protected]> wrote:
Hi Thomas,
Quoted 3 lines
Currently, webkit uses the
pthread_getattr_np()function (in JavaScriptCore/runtime/Collector.cpp), and this function isn't implemented by uClibc (seepthread.h).
This isn't strictly true - the newer version of LinuxThreads and NPTL for uClibc both implement this function.
I build and run WebKit with uClibc so I would rather this change did not go in.
Thanks,
PATCH 36/38 webkit: make sure that people don't try to build with uClibc
Hello Will,
Quoted 5 lines · On Sun, 21 Feb 2010 18:10:11 +0000 Will Newton <[email protected]> wrote:
This isn't strictly true - the newer version of LinuxThreads and NPTL for uClibc both implement this function.
I build and run WebKit with uClibc so I would rather this change did not go in.
Right. I missed the fact that pthread_getattr_np() is implemented in linuxthreads but not in old-linuxthreads.
Peter, please drop this patch for now.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 37/38 libsoup: remove --without-html-dir
In reply to Thomas Petazzoni--without-html-dir doesn't work. It leads libsoup ./configure script to think that HTML_DIR is "no", which leads to the installation of the documentation in $(STAGING_DIR)no (yes, with the "no" suffix at the end). The issue is that --with-html-dir is not an enable/disable type of option, it's an option that only allows to pass a PATH for documentation installation.
As we don't want the documentation to be installed in this odd $(STAGING_DIR)no directory, we simply get rid of this option.
See 7e62e8ec723f91e07bb4ac9ae3e55b65e3123082 for another instance of the same problem.
--- package/libsoup/libsoup.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/libsoup/libsoup.mk +1 -1
@@ -24,7 +24,7 @@ LIBSOUP_CONF_OPT = \ --disable-explicit-deps \ --disable-glibtest \ --without-gnome \ - --disable-gtk-doc --without-html-dir + --disable-gtk-doc LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2
Signature · 1 line
1.6.3.3
PATCH 38/38 mplayer: use UTF-8 charset to avoid iconv dependency
In reply to Thomas PetazzoniThe mplayer configure script was failing with:
Checking for iconv program ... no
No working iconv program found, use
--charset=UTF-8 to continue anyway.
If you also have problems with iconv library functions use --charset=noconv. Messages in the GTK-2 interface will be broken then.
Therefore, we pass --charset=UTF-8 instead of --charset=US-ASCII.
--- package/multimedia/mplayer/mplayer.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/multimedia/mplayer/mplayer.mk +1 -1
@@ -54,7 +54,7 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked --as=$(TARGET_CROSS)as \ --with-extraincdir=$(STAGING_DIR)/usr/include \ --with-extralibdir=$(STAGING_DIR)/lib \ - --charset=US-ASCII \ + --charset=UTF-8 \ --enable-mad \ --enable-fbdev \ $(MPLAYER_ENDIAN) \
Signature · 1 line
1.6.3.3
Hi Peter, Hi All,
Quoted 9 lines · On Sun, 21 Feb 2010 18:46:38 +0100 Thomas Petazzoni…
The following changes since commit
c8ff60c8283b0ad116fcf43f485f199c29432c9d:
Peter Korsgaard (1):
CHANGES: addace_of_penguins, rubix and xboardare available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildrootmisc-fixes5Thomas Petazzoni (38):
How do you want me to handle your review remarks ?
Should I fix them in my branch (which means doing a rebase), and send another pull request ?
Or do you want to pick the patches that you agree with and wait for me to send a pull request only for the patches that required fixes ?
Thanks for your review!
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Hi,
Thomas> How do you want me to handle your review remarks ?
Thomas> Should I fix them in my branch (which means doing a rebase), Thomas> and send another pull request ?
Thomas> Or do you want to pick the patches that you agree with and wait Thomas> for me to send a pull request only for the patches that Thomas> required fixes ?
I would prefer you to rebase your branch and send a new pull request.
Thomas> Thanks for your review!
You're welcome - Thanks for all your work!
Signature · 1 line
Bye, Peter Korsgaard