Skip to contentSkip to conversation

Pull request for branch misc-fixes5

GIT PULL New Thomas Petazzoni 3 participants 32 messages Feb 20, 2010 – Feb 22, 2010

lore
Share & tools
lore
#0 lore raw

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 (16):
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 merge with libpng for host
ace_of_penguins: mark as BROKEN
dependencies: add gzip and bzip2 as base dependencies

 package/Makefile.in                                |    6 ++-
 package/automake/automake.mk                       |    2 +-
 package/games/ace_of_penguins/Config.in            |    1 +
 package/games/ace_of_penguins/ace_of_penguins.mk   |    2 +-
 package/libpng/libpng.mk                           |    5 ++
 package/libxml2/libxml2.mk                         |    2 +
 package/libxslt/libxslt.mk                         |    8 ++
 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 +-
 15 files changed, 63 insertions(+), 78 deletions(-)

Thanks,

Signature · 1 line
Thomas Petazzoni
#1 lore raw

PATCH 1/16 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
index eb3b375..db935a4 100644
@@ -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
#2 lore raw

PATCH 1/16 automake: add build dependency on host-autoconf

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> automake for the target fails to build if autoconf is not installed on Thomas> the host:

Thomas> checking whether autoconf is installed... no
Thomas> configure: error: Autoconf 2.58 or better is required.
Thomas> Please make sure it is installed and in your PATH.
Thomas> make: *** [/home/test/brbuilttest/build/automake-1.10/.stamp_configured] Error 1

It doesn't look like it really needs it for anything at build time, but ok - It doesn't hurt building autoconf.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/16 ccache: remove cleanup of documentation

In reply to Thomas Petazzoni

The 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
index c98937d..8e414b2 100644
@@ -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
#4 lore raw

PATCH 3/16 libxml2: do not apply libtool patch when compiling for host

In reply to Thomas Petazzoni

The 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
index e598d36..31fdabf 100644
@@ -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
#5 lore raw

PATCH 3/16 libxml2: do not apply libtool patch when compiling for host

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hi,

Thomas> The libtool patch is not applied when building for the target because Thomas> it does not apply, so do not attempt to apply it when building for the Thomas> host. This fixes libxml2 build for the host.

Thomas> +HOST_LIBXML2_LIBTOOL_PATCH = NO

Is there ever any situation where {HOST,}_<PACKAGE>_LIBTOOL_PATCH will differ, or should we just use the host build use the normal variable, just like we are doing for _SOURCE/_SITE/_VERSION?

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH 3/16 libxml2: do not apply libtool patch when compiling for host

Quoted 3 lines · On Mon, 22 Feb 2010 16:47:59 +0100 Peter Korsgaard <[email protected]> wrote:

Is there ever any situation where {HOST,}_<PACKAGE>_LIBTOOL_PATCH will differ, or should we just use the host build use the normal variable, just like we are doing for _SOURCE/_SITE/_VERSION?

I don't think so, so you're right, we should do this. Noted in my TODO list, but I won't do it for the 2010.02 release.

Cheers,

Thomas

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

PATCH 4/16 libxslt: enable compilation on host

In reply to Thomas Petazzoni

Compiling 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
index 03c1131..4bf61b5 100644
@@ -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
#8 lore raw

PATCH 5/16 libxcb: fix build with Buildroot compiled xsltproc

In reply to Thomas Petazzoni

Make 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
index b79addd..19cfc6a 100644
@@ -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
#9 lore raw

PATCH 6/16 xapp_mkfontscale: enable compilation for the host

In reply to Thomas Petazzoni

mkfontscale 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
index 05a3f81..e94312a 100644
@@ -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
#10 lore raw

PATCH 6/16 xapp_mkfontscale: enable compilation for the host

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> mkfontscale on the host is required to build xfonts-encoding for the Thomas> target.

Thomas> diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk Thomas> index 05a3f81..e94312a 100644
Thomas> --- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
Thomas> +++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
Thomas> @@ -8,6 +8,8 @@ XAPP_MKFONTSCALE_VERSION = 1.0.5

 Thomas>  XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 Thomas>  XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
 Thomas>  XAPP_MKFONTSCALE_AUTORECONF = NO

Thomas> -XAPP_MKFONTSCALE_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc Thomas> +XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libX11 xlib_libfontenc Thomas> +HOST_XAPP_MKFONTSCALE_DEPENDENCIES = host-zlib host-freetype host-xlib_libfontenc

No host-xlib_libX11?

Signature · 1 line
Bye, Peter Korsgaard
#11 lore raw

PATCH 6/16 xapp_mkfontscale: enable compilation for the host

Quoted 5 lines · On Mon, 22 Feb 2010 16:52:39 +0100 Peter Korsgaard <[email protected]> wrote:

Thomas> diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk Thomas> index 05a3f81..e94312a 100644
Thomas> --- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
Thomas> +++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
Thomas> @@ -8,6 +8,8 @@ XAPP_MKFONTSCALE_VERSION = 1.0.5

Quoted 8 lines
 Thomas>  XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 Thomas>  XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
 Thomas>  XAPP_MKFONTSCALE_AUTORECONF = NO

Thomas> -XAPP_MKFONTSCALE_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc Thomas> +XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libX11 xlib_libfontenc Thomas> +HOST_XAPP_MKFONTSCALE_DEPENDENCIES = host-zlib host-freetype host-xlib_libfontenc

No host-xlib_libX11?

Here, host-xlib_libX11 hasn't been built, and xapp_mkfontscale has been correctly built. This seems to be confirmed by the configure.ac file, which only says:

AC_CHECK_LIB(z, gzopen, [],
[AC_MSG_ERROR([zlib is required, but was not found.])])
PKG_CHECK_MODULES(MKFONTSCALE, fontenc freetype2) PKG_CHECK_MODULES(X11, xproto)

So, only zlib, freetype and xproto are needed. Maybe I should add a dependency on host-xproto. But since host-xlib_libfontenc already depends on it, there isn't a real problem.

I'll fix by adding the host-xproto dependency from the HOST_XAPP_MKFONTSCALE_DEPENDENCIES line, and by removing the xlib_libX11 from the XAPP_MKFONTSCALE_DEPENDENCIES line.

Cheers,

Thomas

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

PATCH 7/16 xfont_encoding: add mkfontscale on the host as dependency

In reply to Thomas Petazzoni

mkfontscale 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
index 74256d1..9097735 100644
@@ -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
#13 lore raw

PATCH 8/16 xlib_libfontenc: enable compilation on the host

In reply to Thomas Petazzoni

xlib_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
index b03697a..7ab4511 100644
@@ -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
#14 lore raw

PATCH 9/16 zlib: enable compilation on the host

In reply to Thomas Petazzoni

zlib 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
index 7432473..35b79d6 100644
@@ -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))
\ No newline at end of file
Signature · 1 line
1.6.3.3
#15 lore raw

PATCH 9/16 zlib: enable compilation on the host

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> zlib is needed on the host, to build xlib_libfontenc on the host, to Thomas> build xapp_mkfontscale on the host, in order to finally build xfonts Thomas> encodings on the target.

Thomas> $(eval $(call GENTARGETS,package,zlib)) Thomas> +$(eval $(call GENTARGETS,package,zlib,host)) Thomas> \ No newline at end of file

You forgot the trailing newline - Otherwise it looks good.

Signature · 1 line
Bye, Peter Korsgaard
#16 lore raw

PATCH 10/16 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
index 38e7e80..88dce38 100644
@@ -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))
\ No newline at end of file
Signature · 1 line
1.6.3.3
#17 lore raw

PATCH 10/16 xfont_font-util: convert to the autotools infrastructure

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Thomas> +XFONT_FONT_UTIL_POST_INSTALL_STAGING_HOOKS += XFONT_FONT_UTIL_POST_INSTALL_FIXES

Thomas> +$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util)) Thomas> \ No newline at end of file

Here as well.

Signature · 1 line
Bye, Peter Korsgaard
#18 lore raw

PATCH 11/16 package infrastructure: add LD_LIBRARY_PATH

In reply to Thomas Petazzoni

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. 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
index bc0ac7c..d976481 100644
@@ -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
#19 lore raw

PATCH 11/16 package infrastructure: add LD_LIBRARY_PATH

Le samedi 20 f?vrier 2010 ? 19:43 +0100, Thomas Petazzoni a ?crit :

Quoted 6 lines

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. Therefore, we pass a LD_LIBRARY_PATH variable when building packages.

#20 lore raw

PATCH 11/16 package infrastructure: add LD_LIBRARY_PATH

In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> During the compilation of target packages, host tools might be used, Thomas> and in turn, they might use host libraries installed in Thomas> $(HOST_DIR)/usr/lib. Therefore, we pass a LD_LIBRARY_PATH variable Thomas> when building packages.

Thomas> -TARGET_MAKE_ENV=PATH=$(TARGET_PATH)
Thomas> +# During the compilation of target packages, host tools might be used, Thomas> +# and in turn, they might use host libraries installed in Thomas> +# $(HOST_DIR)/usr/lib
Thomas> +TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \
Thomas> + LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib"

We should probably append to LD_LIBRARY_PATH in case it is set already.

Signature · 1 line
Bye, Peter Korsgaard
#21 lore raw

PATCH 11/16 package infrastructure: add LD_LIBRARY_PATH

Quoted 8 lines · On Mon, 22 Feb 2010 16:59:38 +0100 Peter Korsgaard <[email protected]> wrote:

Thomas> -TARGET_MAKE_ENV=PATH=$(TARGET_PATH)
Thomas> +# During the compilation of target packages, host tools might be used, Thomas> +# and in turn, they might use host libraries installed in Thomas> +# $(HOST_DIR)/usr/lib
Thomas> +TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \
Thomas> + LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib"

We should probably append to LD_LIBRARY_PATH in case it is set already.

Sure, you're right.

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
#22 lore raw

PATCH 12/16 libpng: enable compilation on the host

In reply to Thomas Petazzoni

libpng is needed on the host to build ace_of_penguins.

---
 package/libpng/libpng.mk |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
package/libpng/libpng.mk +4 -0
index 1297c89..1b50707 100644
@@ -11,7 +11,11 @@ LIBPNG_INSTALL_STAGING = YES
 LIBPNG_CONF_OPT = --without-libpng-compat
 LIBPNG_DEPENDENCIES = host-pkg-config zlib
 
+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
#24 lore raw

PATCH 12/16 libpng: enable compilation on the host

In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> libpng is needed on the host to build ace_of_penguins. Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---

 Thomas>  package/libpng/libpng.mk |    4 ++++

Thomas> 1 files changed, 4 insertions(+), 0 deletions(-)

Thomas> diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk Thomas> index 1297c89..1b50707 100644
Thomas> --- a/package/libpng/libpng.mk
Thomas> +++ b/package/libpng/libpng.mk
Thomas> @@ -11,7 +11,11 @@ LIBPNG_INSTALL_STAGING = YES Thomas> LIBPNG_CONF_OPT = --without-libpng-compat
Thomas> LIBPNG_DEPENDENCIES = host-pkg-config zlib

Thomas> +HOST_LIBPNG_CONF_OPT = --without-libpng-compat Thomas> +HOST_LIBPNG_DEPENDENCIES = host-zlib Thomas> +

What about host-pkg-config?

Signature · 1 line
Bye, Peter Korsgaard
#25 lore raw

PATCH 12/16 libpng: enable compilation on the host

Quoted 8 lines · On Mon, 22 Feb 2010 17:00:14 +0100 Peter Korsgaard <[email protected]> wrote:

Thomas> LIBPNG_CONF_OPT = --without-libpng-compat Thomas> LIBPNG_DEPENDENCIES = host-pkg-config zlib

Thomas> +HOST_LIBPNG_CONF_OPT = --without-libpng-compat Thomas> +HOST_LIBPNG_DEPENDENCIES = host-zlib Thomas> +

What about host-pkg-config?

Right, you're correct.

Thomas

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

PATCH 13/16 ace_of_penguins: add dependency on host-libpng

In reply to Thomas Petazzoni

libpng 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
index fe3e204..a106d14 100644
@@ -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
#27 lore raw

PATCH 14/16 merge with libpng for host

In reply to Thomas Petazzoni
---
 package/libpng/libpng.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
package/libpng/libpng.mk +1 -0
index 1b50707..0303d51 100644
@@ -11,6 +11,7 @@ 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
 
Signature · 1 line
1.6.3.3
#28 lore raw

PATCH 15/16 ace_of_penguins: mark as BROKEN

In reply to Thomas Petazzoni

This 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
index 1d5a367..2240e7c 100644
@@ -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
#29 lore raw

PATCH 15/16 ace_of_penguins: mark as BROKEN

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> This package is BROKEN in the way it compiles make-imglib and text2c Thomas> for the host while being in cross-compiled mode. It does not use Thomas> CC_FOR_BUILD and CFLAGS_FOR_BUILD as it should.

Thomas> No upstream release has been made since 2001 and since it is a Thomas> relatively useless package, I don't think it's worth the trouble to Thomas> sanitize its build system.

I agree.

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---

 Thomas>  package/games/ace_of_penguins/Config.in |    1 +

Thomas> 1 files changed, 1 insertions(+), 0 deletions(-)

Thomas> diff --git a/package/games/ace_of_penguins/Config.in b/package/games/ace_of_penguins/Config.in Thomas> index 1d5a367..2240e7c 100644
Thomas> --- a/package/games/ace_of_penguins/Config.in
Thomas> +++ b/package/games/ace_of_penguins/Config.in
Thomas> @@ -3,6 +3,7 @@ config BR2_PACKAGE_ACE_OF_PENGUINS

 Thomas>  	select BR2_PACKAGE_LIBPNG
 Thomas>  	depends on BR2_PACKAGE_XORG7
 Thomas>  	depends on BR2_PACKAGE_XLIB_LIBXPM

Thomas> + depends on BROKEN

It's nice to add a short # comment about why it's broken, like:

games/vice/Config.in: depends on BROKEN # doesn't build, wrong dependencie

Signature · 1 line
Bye, Peter Korsgaard
#30 lore raw

PATCH 16/16 dependencies: add gzip and bzip2 as base dependencies

In reply to Thomas Petazzoni

They 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
index f5b2621..d0190fd 100755
@@ -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
#31 lore raw
In reply to Thomas Petazzoni

Hello,

Quoted 7 lines · On Sat, 20 Feb 2010 19:42:51 +0100 Thomas Petazzoni…

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

Please ignore this pull request and don't merge the patches. I'll send a new one, with more fixes.

Thomas

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