Pull request for branch misc-fixes1
The following changes since commit f0bdacdb5b8fe0fbc276ed510fc58e9a219f5cf8:
Peter Korsgaard (1):
update for 2010.02-rc1
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot misc-fixes1
Thomas Petazzoni (3):
gtk-doc: add gtk-doc.m4 to satisfy aclocal
Fix dependencies for TrapProto
Bump TCL version and switch to the autotools infrastructure
package/automake/automake.mk | 6 ++
package/automake/gtk-doc.m4 | 61 ++++++++++++++++++++
.../{tcl-strtod.patch => tcl-8.4.19-strtod.patch} | 0
package/tcl/tcl-configure-syntax-error.patch | 42 -------------
package/tcl/tcl-strstr.patch | 11 ----
package/tcl/tcl.mk | 56 +++---------------
package/x11r7/xproto_trapproto/Config.in | 1 +
package/x11r7/xproto_trapproto/xproto_trapproto.mk | 1 +
8 files changed, 77 insertions(+), 101 deletions(-)
create mode 100644 package/automake/gtk-doc.m4
rename package/tcl/{tcl-strtod.patch => tcl-8.4.19-strtod.patch} (100%)
delete mode 100644 package/tcl/tcl-configure-syntax-error.patch
delete mode 100644 package/tcl/tcl-strstr.patchThanks,
Signature · 1 line
Thomas Petazzoni
PATCH 1/3 gtk-doc: add gtk-doc.m4 to satisfy aclocal
When packages using gtk-doc are autoreconfigured, aclocal complains because it cannot find the macros defined in gtk-doc.m4. We could compile the gtk-doc package for the host, but it depends on gnome-doc-utils, which depends on libxml2, libxslt, and other packages as well.
Since we don't care about the documentation, all is needed is in fact the gtk-doc.m4, so that the configure script can be generated, and we can use the --disable-gtk-doc to not generate the documentation.
To solve this, we include a gtk-doc.m4 file in package/automake/, and it gets installed in $(STAGING_DIR)/usr/share/aclocal/ during the installation of the host automake (used for autoreconfiguration of packages).
--- package/automake/automake.mk | 6 ++++ package/automake/gtk-doc.m4 | 61 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 0 deletions(-) create mode 100644 package/automake/gtk-doc.m4
package/automake/automake.mk +6 -0
@@ -15,6 +15,12 @@ AUTOMAKE_DEPENDENCIES = autoconf microperl HOST_AUTOMAKE_DEPENDENCIES = host-autoconf +define GTK_DOC_M4_INSTALL + $(INSTALL) -m 0644 package/automake/gtk-doc.m4 $(STAGING_DIR)/usr/share/aclocal/ +endef + +HOST_AUTOMAKE_POST_INSTALL_HOOKS += GTK_DOC_M4_INSTALL + $(eval $(call AUTOTARGETS,package,automake)) $(eval $(call AUTOTARGETS,package,automake,host))
package/automake/gtk-doc.m4 new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 1/3 gtk-doc: add gtk-doc.m4 to satisfy aclocal
Le samedi 13 f?vrier 2010 ? 16:13 +0100, Thomas Petazzoni a ?crit :
Quoted 10 lines
When packages using gtk-doc are autoreconfigured, aclocal complains because it cannot find the macros defined in gtk-doc.m4. We could compile the gtk-doc package for the host, but it depends on gnome-doc-utils, which depends on libxml2, libxslt, and other packages as well.
Since we don't care about the documentation, all is needed is in fact the gtk-doc.m4, so that the configure script can be generated, and we can use the --disable-gtk-doc to not generate the documentation.
Quoted 6 lines
To solve this, we include a gtk-doc.m4 file in package/automake/, and it gets installed in $(STAGING_DIR)/usr/share/aclocal/ during the installation of the host automake (used for autoreconfiguration of packages).
Signed-off-by Thomas Petazzoni <[email protected]>
PATCH 2/3 Fix dependencies for TrapProto
In reply to Thomas PetazzoniThe .pc file of TrapProto says that it depends on xt, even through it doesn't depend on it at compile time. However, if xt isn't present when TrapProto has been installed, the compilation of Xserver fails telling that there is a missing dependency in TrapProto on Xt.
--- package/x11r7/xproto_trapproto/Config.in | 1 + package/x11r7/xproto_trapproto/xproto_trapproto.mk | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
package/x11r7/xproto_trapproto/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_XPROTO_TRAPPROTO bool "trapproto" + select BR2_PACKAGE_XLIB_LIBXT help trapproto 3.4.3 X.Org Trap protocol headers
package/x11r7/xproto_trapproto/xproto_trapproto.mk +1 -0
@@ -10,5 +10,6 @@ XPROTO_TRAPPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto XPROTO_TRAPPROTO_AUTORECONF = NO XPROTO_TRAPPROTO_INSTALL_STAGING = YES XPROTO_TRAPPROTO_INSTALL_TARGET = NO +XPROTO_TRAPPROTO_DEPENDENCIES = xlib_libXt $(eval $(call AUTOTARGETS,package/x11r7,xproto_trapproto))
Signature · 1 line
1.6.3.3
PATCH 3/3 Bump TCL version and switch to the autotools infrastructure
In reply to Thomas PetazzoniThe version of TCL is bumped from 8.4.9 to 8.4.19, which fixes the build breakage reported by Maxime Ripard <[email protected]> on January, 6th, 2010.
The tcl-strtod patch is kept since it is still needed, the two other patches are no longer useful.
At the same time, the package is converted to the autotools infrastructure.
---
.../{tcl-strtod.patch => tcl-8.4.19-strtod.patch} | 0
package/tcl/tcl-configure-syntax-error.patch | 42 ---------------
package/tcl/tcl-strstr.patch | 11 ----
package/tcl/tcl.mk | 56 +++-----------------
4 files changed, 8 insertions(+), 101 deletions(-)
rename package/tcl/{tcl-strtod.patch => tcl-8.4.19-strtod.patch} (100%)
delete mode 100644 package/tcl/tcl-configure-syntax-error.patch
delete mode 100644 package/tcl/tcl-strstr.patchpackage/tcl/tcl-8.4.19-strtod.patch renamed from package/tcl/tcl-strtod.patch +0 -0
package/tcl/tcl-configure-syntax-error.patch deleted +0 -42
42 lines not on this page · raw message
package/tcl/tcl-strstr.patch deleted +0 -11
@@ -1,11 +0,0 @@ ---- tcl8.4.9/compat/strstr.c 2002-01-26 03:10:08.000000000 +0200 -+++ tcl8.4.9/compat/strstr.c 2005-05-30 06:53:40.000000000 +0300 -@@ -33,6 +33,8 @@ - *---------------------------------------------------------------------- - */ - -+#include <unistd.h> -+ - char * - strstr(string, substring) - register char *string; /* String to search. */
package/tcl/tcl.mk +8 -48
74 lines not on this page · raw message
Signature · 1 line
1.6.3.3
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> The following changes since commit f0bdacdb5b8fe0fbc276ed510fc58e9a219f5cf8:
Thomas> Peter Korsgaard (1):
Thomas> update for 2010.02-rc1
Thomas> are available in the git repository at:
Thomas> git://git.busybox.net/~tpetazzoni/git/buildroot misc-fixes1
Thomas> Thomas Petazzoni (3):
Thomas> gtk-doc: add gtk-doc.m4 to satisfy aclocal Thomas> Fix dependencies for TrapProto Thomas> Bump TCL version and switch to the autotools infrastructure
Committed, thanks - Much appreciated.
Signature · 1 line
Bye, Peter Korsgaard