* [Buildroot] [PATCH 01/16] automake: add build dependency on host-autoconf
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
@ 2010-02-20 18:42 ` Thomas Petazzoni
2010-02-22 15:51 ` Peter Korsgaard
2010-02-20 18:42 ` [Buildroot] [PATCH 02/16] ccache: remove cleanup of documentation Thomas Petazzoni
` (15 subsequent siblings)
16 siblings, 1 reply; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:42 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/automake/automake.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index eb3b375..db935a4 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -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
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 01/16] automake: add build dependency on host-autoconf
2010-02-20 18:42 ` [Buildroot] [PATCH 01/16] automake: add build dependency on host-autoconf Thomas Petazzoni
@ 2010-02-22 15:51 ` Peter Korsgaard
0 siblings, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2010-02-22 15:51 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 02/16] ccache: remove cleanup of documentation
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
2010-02-20 18:42 ` [Buildroot] [PATCH 01/16] automake: add build dependency on host-autoconf Thomas Petazzoni
@ 2010-02-20 18:42 ` Thomas Petazzoni
2010-02-20 18:42 ` [Buildroot] [PATCH 03/16] libxml2: do not apply libtool patch when compiling for host Thomas Petazzoni
` (14 subsequent siblings)
16 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:42 UTC (permalink / raw)
To: buildroot
The cleanup of documentation is handled in a global way, in the main
Makefile.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/ccache/ccache.mk | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk
index c98937d..8e414b2 100644
--- a/toolchain/ccache/ccache.mk
+++ b/toolchain/ccache/ccache.mk
@@ -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; \
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 03/16] libxml2: do not apply libtool patch when compiling for host
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
2010-02-20 18:42 ` [Buildroot] [PATCH 01/16] automake: add build dependency on host-autoconf Thomas Petazzoni
2010-02-20 18:42 ` [Buildroot] [PATCH 02/16] ccache: remove cleanup of documentation Thomas Petazzoni
@ 2010-02-20 18:42 ` Thomas Petazzoni
2010-02-22 15:47 ` Peter Korsgaard
2010-02-20 18:42 ` [Buildroot] [PATCH 04/16] libxslt: enable compilation on host Thomas Petazzoni
` (13 subsequent siblings)
16 siblings, 1 reply; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:42 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libxml2/libxml2.mk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index e598d36..31fdabf 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -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))
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 03/16] libxml2: do not apply libtool patch when compiling for host
2010-02-20 18:42 ` [Buildroot] [PATCH 03/16] libxml2: do not apply libtool patch when compiling for host Thomas Petazzoni
@ 2010-02-22 15:47 ` Peter Korsgaard
2010-02-22 19:11 ` Thomas Petazzoni
0 siblings, 1 reply; 37+ messages in thread
From: Peter Korsgaard @ 2010-02-22 15:47 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 03/16] libxml2: do not apply libtool patch when compiling for host
2010-02-22 15:47 ` Peter Korsgaard
@ 2010-02-22 19:11 ` Thomas Petazzoni
0 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-22 19:11 UTC (permalink / raw)
To: buildroot
On Mon, 22 Feb 2010 16:47:59 +0100
Peter Korsgaard <jacmet@uclibc.org> 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
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 04/16] libxslt: enable compilation on host
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (2 preceding siblings ...)
2010-02-20 18:42 ` [Buildroot] [PATCH 03/16] libxml2: do not apply libtool patch when compiling for host Thomas Petazzoni
@ 2010-02-20 18:42 ` Thomas Petazzoni
2010-02-20 18:42 ` [Buildroot] [PATCH 05/16] libxcb: fix build with Buildroot compiled xsltproc Thomas Petazzoni
` (12 subsequent siblings)
16 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:42 UTC (permalink / raw)
To: buildroot
Compiling libxcb (from the X.org stack) requires xsltproc on the host,
which is part of libxslt.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libxslt/libxslt.mk | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 03c1131..4bf61b5 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -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
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 05/16] libxcb: fix build with Buildroot compiled xsltproc
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (3 preceding siblings ...)
2010-02-20 18:42 ` [Buildroot] [PATCH 04/16] libxslt: enable compilation on host Thomas Petazzoni
@ 2010-02-20 18:42 ` Thomas Petazzoni
2010-02-20 18:42 ` [Buildroot] [PATCH 06/16] xapp_mkfontscale: enable compilation for the host Thomas Petazzoni
` (11 subsequent siblings)
16 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:42 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/x11r7/libxcb/libxcb.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index b79addd..19cfc6a 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -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))
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 06/16] xapp_mkfontscale: enable compilation for the host
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (4 preceding siblings ...)
2010-02-20 18:42 ` [Buildroot] [PATCH 05/16] libxcb: fix build with Buildroot compiled xsltproc Thomas Petazzoni
@ 2010-02-20 18:42 ` Thomas Petazzoni
2010-02-22 15:52 ` Peter Korsgaard
2010-02-20 18:42 ` [Buildroot] [PATCH 07/16] xfont_encoding: add mkfontscale on the host as dependency Thomas Petazzoni
` (10 subsequent siblings)
16 siblings, 1 reply; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:42 UTC (permalink / raw)
To: buildroot
mkfontscale on the host is required to build xfonts-encoding for the
target.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index 05a3f81..e94312a 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -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))
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 06/16] xapp_mkfontscale: enable compilation for the host
2010-02-20 18:42 ` [Buildroot] [PATCH 06/16] xapp_mkfontscale: enable compilation for the host Thomas Petazzoni
@ 2010-02-22 15:52 ` Peter Korsgaard
2010-02-22 19:20 ` Thomas Petazzoni
0 siblings, 1 reply; 37+ messages in thread
From: Peter Korsgaard @ 2010-02-22 15:52 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 06/16] xapp_mkfontscale: enable compilation for the host
2010-02-22 15:52 ` Peter Korsgaard
@ 2010-02-22 19:20 ` Thomas Petazzoni
0 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-22 19:20 UTC (permalink / raw)
To: buildroot
On Mon, 22 Feb 2010 16:52:39 +0100
Peter Korsgaard <jacmet@uclibc.org> 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
> 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
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 07/16] xfont_encoding: add mkfontscale on the host as dependency
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (5 preceding siblings ...)
2010-02-20 18:42 ` [Buildroot] [PATCH 06/16] xapp_mkfontscale: enable compilation for the host Thomas Petazzoni
@ 2010-02-20 18:42 ` Thomas Petazzoni
2010-02-20 18:42 ` [Buildroot] [PATCH 08/16] xlib_libfontenc: enable compilation on the host Thomas Petazzoni
` (9 subsequent siblings)
16 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:42 UTC (permalink / raw)
To: buildroot
mkfontscale on the host is needed to build xfont_encoding, therefore
we add host-xapp_mkfontscale as a dependency.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/x11r7/xfont_encodings/xfont_encodings.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 74256d1..9097735 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -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))
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 08/16] xlib_libfontenc: enable compilation on the host
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (6 preceding siblings ...)
2010-02-20 18:42 ` [Buildroot] [PATCH 07/16] xfont_encoding: add mkfontscale on the host as dependency Thomas Petazzoni
@ 2010-02-20 18:42 ` Thomas Petazzoni
2010-02-20 18:43 ` [Buildroot] [PATCH 09/16] zlib: " Thomas Petazzoni
` (8 subsequent siblings)
16 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:42 UTC (permalink / raw)
To: buildroot
xlib_libfontenc is required to build xapp_mkfontscale on the host,
which in turn is needed to build font encodings for the target.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index b03697a..7ab4511 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -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))
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 09/16] zlib: enable compilation on the host
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (7 preceding siblings ...)
2010-02-20 18:42 ` [Buildroot] [PATCH 08/16] xlib_libfontenc: enable compilation on the host Thomas Petazzoni
@ 2010-02-20 18:43 ` Thomas Petazzoni
2010-02-22 15:56 ` Peter Korsgaard
2010-02-20 18:43 ` [Buildroot] [PATCH 10/16] xfont_font-util: convert to the autotools infrastructure Thomas Petazzoni
` (7 subsequent siblings)
16 siblings, 1 reply; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:43 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/zlib/zlib.mk | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 7432473..35b79d6 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -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
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 09/16] zlib: enable compilation on the host
2010-02-20 18:43 ` [Buildroot] [PATCH 09/16] zlib: " Thomas Petazzoni
@ 2010-02-22 15:56 ` Peter Korsgaard
0 siblings, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2010-02-22 15:56 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 10/16] xfont_font-util: convert to the autotools infrastructure
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (8 preceding siblings ...)
2010-02-20 18:43 ` [Buildroot] [PATCH 09/16] zlib: " Thomas Petazzoni
@ 2010-02-20 18:43 ` Thomas Petazzoni
2010-02-22 15:56 ` Peter Korsgaard
2010-02-20 18:43 ` [Buildroot] [PATCH 11/16] package infrastructure: add LD_LIBRARY_PATH Thomas Petazzoni
` (6 subsequent siblings)
16 siblings, 1 reply; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:43 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/x11r7/xfont_font-util/xfont_font-util.mk | 74 ++--------------------
1 files changed, 6 insertions(+), 68 deletions(-)
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index 38e7e80..88dce38 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -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
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 11/16] package infrastructure: add LD_LIBRARY_PATH
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (9 preceding siblings ...)
2010-02-20 18:43 ` [Buildroot] [PATCH 10/16] xfont_font-util: convert to the autotools infrastructure Thomas Petazzoni
@ 2010-02-20 18:43 ` Thomas Petazzoni
2010-02-21 21:30 ` Lionel Landwerlin
2010-02-22 15:59 ` Peter Korsgaard
2010-02-20 18:43 ` [Buildroot] [PATCH 12/16] libpng: enable compilation on the host Thomas Petazzoni
` (5 subsequent siblings)
16 siblings, 2 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:43 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.in | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index bc0ac7c..d976481 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -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)" \
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 11/16] package infrastructure: add LD_LIBRARY_PATH
2010-02-20 18:43 ` [Buildroot] [PATCH 11/16] package infrastructure: add LD_LIBRARY_PATH Thomas Petazzoni
@ 2010-02-21 21:30 ` Lionel Landwerlin
2010-02-22 15:59 ` Peter Korsgaard
1 sibling, 0 replies; 37+ messages in thread
From: Lionel Landwerlin @ 2010-02-21 21:30 UTC (permalink / raw)
To: buildroot
Le samedi 20 f?vrier 2010 ? 19:43 +0100, Thomas Petazzoni a ?crit :
> 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.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Lionel Landwerlin <llandwerlin@gmail.com>
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 11/16] package infrastructure: add LD_LIBRARY_PATH
2010-02-20 18:43 ` [Buildroot] [PATCH 11/16] package infrastructure: add LD_LIBRARY_PATH Thomas Petazzoni
2010-02-21 21:30 ` Lionel Landwerlin
@ 2010-02-22 15:59 ` Peter Korsgaard
2010-02-22 19:21 ` Thomas Petazzoni
1 sibling, 1 reply; 37+ messages in thread
From: Peter Korsgaard @ 2010-02-22 15:59 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 11/16] package infrastructure: add LD_LIBRARY_PATH
2010-02-22 15:59 ` Peter Korsgaard
@ 2010-02-22 19:21 ` Thomas Petazzoni
0 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-22 19:21 UTC (permalink / raw)
To: buildroot
On Mon, 22 Feb 2010 16:59:38 +0100
Peter Korsgaard <jacmet@uclibc.org> 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
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 12/16] libpng: enable compilation on the host
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (10 preceding siblings ...)
2010-02-20 18:43 ` [Buildroot] [PATCH 11/16] package infrastructure: add LD_LIBRARY_PATH Thomas Petazzoni
@ 2010-02-20 18:43 ` Thomas Petazzoni
2010-02-21 21:31 ` Lionel Landwerlin
2010-02-22 16:00 ` Peter Korsgaard
2010-02-20 18:43 ` [Buildroot] [PATCH 13/16] ace_of_penguins: add dependency on host-libpng Thomas Petazzoni
` (4 subsequent siblings)
16 siblings, 2 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:43 UTC (permalink / raw)
To: buildroot
libpng is needed on the host to build ace_of_penguins.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libpng/libpng.mk | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 1297c89..1b50707 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -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" \
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 12/16] libpng: enable compilation on the host
2010-02-20 18:43 ` [Buildroot] [PATCH 12/16] libpng: enable compilation on the host Thomas Petazzoni
@ 2010-02-21 21:31 ` Lionel Landwerlin
2010-02-22 16:00 ` Peter Korsgaard
1 sibling, 0 replies; 37+ messages in thread
From: Lionel Landwerlin @ 2010-02-21 21:31 UTC (permalink / raw)
To: buildroot
Le samedi 20 f?vrier 2010 ? 19:43 +0100, Thomas Petazzoni a ?crit :
> libpng is needed on the host to build ace_of_penguins.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Lionel Landwerlin <llandwerlin@gmail.com>
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 12/16] libpng: enable compilation on the host
2010-02-20 18:43 ` [Buildroot] [PATCH 12/16] libpng: enable compilation on the host Thomas Petazzoni
2010-02-21 21:31 ` Lionel Landwerlin
@ 2010-02-22 16:00 ` Peter Korsgaard
2010-02-22 19:21 ` Thomas Petazzoni
1 sibling, 1 reply; 37+ messages in thread
From: Peter Korsgaard @ 2010-02-22 16:00 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> libpng is needed on the host to build ace_of_penguins.
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
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?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 12/16] libpng: enable compilation on the host
2010-02-22 16:00 ` Peter Korsgaard
@ 2010-02-22 19:21 ` Thomas Petazzoni
0 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-22 19:21 UTC (permalink / raw)
To: buildroot
On Mon, 22 Feb 2010 17:00:14 +0100
Peter Korsgaard <jacmet@uclibc.org> 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
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 13/16] ace_of_penguins: add dependency on host-libpng
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (11 preceding siblings ...)
2010-02-20 18:43 ` [Buildroot] [PATCH 12/16] libpng: enable compilation on the host Thomas Petazzoni
@ 2010-02-20 18:43 ` Thomas Petazzoni
2010-02-20 18:43 ` [Buildroot] [PATCH 14/16] merge with libpng for host Thomas Petazzoni
` (3 subsequent siblings)
16 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:43 UTC (permalink / raw)
To: buildroot
libpng is needed on the host to build the make-imglib utility, built
during the compilation of ace_of_penguins for the target.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/games/ace_of_penguins/ace_of_penguins.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/games/ace_of_penguins/ace_of_penguins.mk b/package/games/ace_of_penguins/ace_of_penguins.mk
index fe3e204..a106d14 100644
--- a/package/games/ace_of_penguins/ace_of_penguins.mk
+++ b/package/games/ace_of_penguins/ace_of_penguins.mk
@@ -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))
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 14/16] merge with libpng for host
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (12 preceding siblings ...)
2010-02-20 18:43 ` [Buildroot] [PATCH 13/16] ace_of_penguins: add dependency on host-libpng Thomas Petazzoni
@ 2010-02-20 18:43 ` Thomas Petazzoni
2010-02-20 18:43 ` [Buildroot] [PATCH 15/16] ace_of_penguins: mark as BROKEN Thomas Petazzoni
` (2 subsequent siblings)
16 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:43 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libpng/libpng.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 1b50707..0303d51 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -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
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 15/16] ace_of_penguins: mark as BROKEN
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (13 preceding siblings ...)
2010-02-20 18:43 ` [Buildroot] [PATCH 14/16] merge with libpng for host Thomas Petazzoni
@ 2010-02-20 18:43 ` Thomas Petazzoni
2010-02-22 15:54 ` Peter Korsgaard
2010-02-20 18:43 ` [Buildroot] [PATCH 16/16] dependencies: add gzip and bzip2 as base dependencies Thomas Petazzoni
2010-02-21 17:47 ` [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
16 siblings, 1 reply; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:43 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/games/ace_of_penguins/Config.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/games/ace_of_penguins/Config.in b/package/games/ace_of_penguins/Config.in
index 1d5a367..2240e7c 100644
--- a/package/games/ace_of_penguins/Config.in
+++ b/package/games/ace_of_penguins/Config.in
@@ -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
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 15/16] ace_of_penguins: mark as BROKEN
2010-02-20 18:43 ` [Buildroot] [PATCH 15/16] ace_of_penguins: mark as BROKEN Thomas Petazzoni
@ 2010-02-22 15:54 ` Peter Korsgaard
0 siblings, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2010-02-22 15:54 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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 <thomas.petazzoni@free-electrons.com>
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
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 16/16] dependencies: add gzip and bzip2 as base dependencies
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (14 preceding siblings ...)
2010-02-20 18:43 ` [Buildroot] [PATCH 15/16] ace_of_penguins: mark as BROKEN Thomas Petazzoni
@ 2010-02-20 18:43 ` Thomas Petazzoni
2010-02-21 17:47 ` [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
16 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-20 18:43 UTC (permalink / raw)
To: buildroot
They are needed to uncompress the tarballs we download. bzip2, for
instance, is not necessarly installed by default on basic Debian
systems.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/dependencies/dependencies.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index f5b2621..d0190fd 100755
--- a/toolchain/dependencies/dependencies.sh
+++ b/toolchain/dependencies/dependencies.sh
@@ -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
--
1.6.3.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [pull request] Pull request for branch misc-fixes5
2010-02-20 18:42 [Buildroot] [pull request] Pull request for branch misc-fixes5 Thomas Petazzoni
` (15 preceding siblings ...)
2010-02-20 18:43 ` [Buildroot] [PATCH 16/16] dependencies: add gzip and bzip2 as base dependencies Thomas Petazzoni
@ 2010-02-21 17:47 ` Thomas Petazzoni
16 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-02-21 17:47 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 20 Feb 2010 19:42:51 +0100
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> 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
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread