* [Buildroot] [git commit master 1/1] news.html: Announce developer day in Cambridge, UK
From: Peter Korsgaard @ 2010-09-28 10:06 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=332ec387e2743b35550a11ebd555c4babfb135ee
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
docs/news.html | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/docs/news.html b/docs/news.html
index 9545b86..8bfc226 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -6,6 +6,20 @@
<ul>
+ <li><b>28 September 2010 - Buildroot Developer Day</b>
+
+ <p>A <i>Buildroot Developer Day</i> will take place on
+ Friday, October 29th in Cambridge, UK - Just the day after the
+ <a href="http://www.embeddedlinuxconference.com/elc_europe10/">Embedded
+ Linux Conference Europe</a>. This <i>Developer Day</i> aims
+ at allowing Buildroot developers to meet and exchange ideas on the
+ project and its future. See the
+ <a href="http://lists.busybox.net/pipermail/buildroot/2010-September/037930.html">announcement</a>
+ for more info.</p>
+
+ <p>Thanks to Thomas Petazzon for taking care of the practical
+ arrangements.</p>
+
<li><b>31 August 2010 -- 2010.08 released</b>
<p>The stable 2010.08 release is out - Thanks to everyone
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH] package/config: .gitignore cleanup
From: Paulius Zaleckas @ 2010-09-28 11:34 UTC (permalink / raw)
To: buildroot
Now all configure generated files go to output directory.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
---
package/config/.gitignore | 24 ------------------------
1 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/package/config/.gitignore b/package/config/.gitignore
index 106bc12..2694c9a 100644
--- a/package/config/.gitignore
+++ b/package/config/.gitignore
@@ -1,28 +1,4 @@
#
-# Generated files
-#
-config*
-lex.*.c
-*.tab.c
-*.tab.h
-zconf.hash.c
-*.moc
-lkc_defs.h
-gconf.glade.h
-*.pot
-*.mo
-
-#
-# configuration programs
-#
-conf
-mconf
-nconf
-qconf
-gconf
-kxgettext
-
-#
# Quilt is being used to handle the patch series
#
.pc
^ permalink raw reply related
* [Buildroot] [PATCH] xterm: should select libXaw and bump to latest version
From: Paulius Zaleckas @ 2010-09-28 11:52 UTC (permalink / raw)
To: buildroot
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
---
package/xterm/Config.in | 1 +
package/xterm/xterm.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/xterm/Config.in b/package/xterm/Config.in
index da3e9fe..9473fad 100644
--- a/package/xterm/Config.in
+++ b/package/xterm/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_XTERM
bool "xterm"
+ select BR2_PACKAGE_XLIB_LIBXAW
depends on BR2_PACKAGE_XORG7
help
xterm terminal emulator
diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
index b07eda4..8952e24 100644
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -4,10 +4,10 @@
#
#############################################################
-XTERM_VERSION:=259
+XTERM_VERSION:=262
XTERM_SOURCE:=xterm-$(XTERM_VERSION).tgz
XTERM_SITE:=ftp://invisible-island.net/xterm
-XTERM_DEPENDENCIES = xserver_xorg-server
+XTERM_DEPENDENCIES = xserver_xorg-server xlib_libXaw
XTERM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
$(eval $(call AUTOTARGETS,package,xterm))
^ permalink raw reply related
* [Buildroot] [PATCH] matchbox-common was missing in Config.in
From: Paulius Zaleckas @ 2010-09-28 11:52 UTC (permalink / raw)
To: buildroot
While at it add option to install PDA style desktop folders.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
---
package/matchbox/Config.in | 10 ++++++++++
.../matchbox/matchbox-common/matchbox-common.mk | 4 ++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 43189ca..e4b6149 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -22,6 +22,16 @@ config BR2_PACKAGE_MATCHBOX_DESKTOP
help
A PDA style application launcher or 'item browser'.
+config BR2_PACKAGE_MATCHBOX_COMMON
+ bool "Matchbox session common files"
+ depends on BR2_PACKAGE_MATCHBOX && BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP
+ help
+ Common desktop folders and matchbox-session script.
+
+config BR2_PACKAGE_MATCHBOX_COMMON_PDA
+ bool "PDA style desktop folders"
+ depends on BR2_PACKAGE_MATCHBOX_COMMON
+
config BR2_PACKAGE_MATCHBOX_KEYBOARD
bool "Matchbox Virtual Keyboard"
depends on BR2_PACKAGE_MATCHBOX
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 81a1729..d35d11b 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -9,6 +9,10 @@ MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION)
MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
+ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
+ MATCHBOX_COMMON_CONF_OPT += --enable-pda-folders
+endif
+
#############################################################
$(eval $(call AUTOTARGETS,package/matchbox,matchbox-common))
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] docs/news.html: typo, fix Thomas' family name
From: Peter Korsgaard @ 2010-09-28 12:03 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a70d443483b360a0cc0ca1759e9a410b7855dbe8
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
docs/news.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/docs/news.html b/docs/news.html
index 8bfc226..43beac8 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -17,7 +17,7 @@
<a href="http://lists.busybox.net/pipermail/buildroot/2010-September/037930.html">announcement</a>
for more info.</p>
- <p>Thanks to Thomas Petazzon for taking care of the practical
+ <p>Thanks to Thomas Petazzoni for taking care of the practical
arrangements.</p>
<li><b>31 August 2010 -- 2010.08 released</b>
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH] fix buildroot.html typos
From: Yegor Yefremov @ 2010-09-28 12:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Index: b/docs/buildroot.html
===================================================================
--- a/docs/buildroot.html 2010-09-28 11:22:51.000000000 +0200
+++ b/docs/buildroot.html 2010-09-28 14:24:37.000000000 +0200
@@ -171,7 +171,7 @@
<p>All of these "make" commands will need to build a configuration
utility, so you may need to install "development" packages for
- relevent libraries used by the configuration utilities.
+ relevant libraries used by the configuration utilities.
On Debian-like systems, the
<code>libncurses5-dev</code> package is required to use the
<i>menuconfig</i> interface, <code>libqt3-mt-dev</code> is
@@ -345,7 +345,7 @@
toolchain and tools, these changes will be lost. </li>
<li>Customize the target filesystem skeleton available under
- <code>target/generic/target_skeleton/</code>. You can customize
+ <code>fs/skeleton/</code>. You can customize
configuration files or other stuff here. However, the full file hierarchy
is not yet present because it's created during the compilation process.
Therefore, you can't do everything on this target filesystem skeleton, but
@@ -486,12 +486,12 @@
and which steps remain to be done, Buildroot maintains stamp
files (empty files that just tell whether this or that action
has been done). The problem is that these stamp files are not
- uniformely named and handled by the different packages, so some
+ uniformly named and handled by the different packages, so some
understanding of the particular package is needed.</p>
<p>For packages relying on Buildroot packages infrastructures (see
<a href="#add_packages">this section</a> for details), the
- following stamp files are relevent:</p>
+ following stamp files are relevant:</p>
<ul>
@@ -704,7 +704,7 @@
<p>The toolchain generated by Buildroot is located by default in
<code>output/staging/</code>. The simplest way to use it
is to add <code>output/staging/usr/bin/</code> to your PATH
- environnement variable and then to use
+ environment variable and then to use
<code>ARCH-linux-gcc</code>, <code>ARCH-linux-objdump</code>,
<code>ARCH-linux-ld</code>, etc. </p>
@@ -885,7 +885,7 @@
href="#generic-reference">reference</a>.</li>
<li>Makefiles for autotools-based (autoconf, automake, etc.)
- softwares. We provide a dedicated infrastructure for such
+ software. We provide a dedicated infrastructure for such
packages, since autotools is a very common build system. This
infrastructure <i>must</i> be used for new packages that rely on
the autotools as their build system.<br/>We cover them through a
@@ -1614,8 +1614,8 @@
gettext library should not be compiled, because it creates various
kind of build failures.</p>
- <p>Additionnaly, some packages (such as libglib2) do require
- gettext unconditionnally, while other packages (those who
+ <p>Additionally, some packages (such as libglib2) do require
+ gettext unconditionally, while other packages (those who
support <code>--disable-nls</code> in general) only require
gettext when locale support is enabled.</p>
@@ -1631,7 +1631,7 @@
</ul>
- <p>Therefore, packages that unconditionnally need gettext should:</p>
+ <p>Therefore, packages that unconditionally need gettext should:</p>
<ol>
<li>Use <code>select BR2_PACKAGE_GETTEXT if
^ permalink raw reply
* [Buildroot] [git commit master 1/1] barebox/u-boot/linux: don't error out on missing config when make source
From: Peter Korsgaard @ 2010-09-28 12:43 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=3e5e39a8a25a4a085afe08bdcf46933c8d569ed7
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
As it breaks 'make allyesconfig; make source', used for the source mirror.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
boot/barebox/barebox.mk | 4 +++-
boot/u-boot/u-boot.mk | 4 +++-
linux/linux.mk | 5 ++++-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 7c2cbc1..85224ca 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -53,9 +53,11 @@ barebox: $(BAREBOX_DIR)/.installed
ifeq ($(BR2_TARGET_BAREBOX),y)
TARGETS+=barebox
-# we NEED a board defconfig file
+# we NEED a board defconfig file unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
ifeq ($(BAREBOX_BOARD_DEFCONFIG),)
$(error No Barebox defconfig file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG setting)
endif
+endif
endif
diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk
index f97674a..9719207 100644
--- a/boot/u-boot/u-boot.mk
+++ b/boot/u-boot/u-boot.mk
@@ -193,9 +193,11 @@ u-boot-configured: $(U_BOOT_DIR)/.header_modified
ifeq ($(BR2_TARGET_UBOOT),y)
TARGETS+=u-boot
-# we NEED a board name
+# we NEED a board name unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
ifeq ($(U_BOOT_BOARD_NAME),)
$(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)
endif
+endif
endif
diff --git a/linux/linux.mk b/linux/linux.mk
index ea338fc..aabecc1 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -159,6 +159,7 @@ TARGETS+=linux26
endif
# Checks to give errors that the user can understand
+ifeq ($(filter source,$(MAKECMDGOALS)),)
ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG)),)
$(error No kernel defconfig name specified, check your BR2_LINUX_KERNEL_DEFCONFIG setting)
@@ -169,4 +170,6 @@ ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)),)
$(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE setting)
endif
-endif
\ No newline at end of file
+endif
+
+endif
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH] fix buildroot.html typos
From: Peter Korsgaard @ 2010-09-28 12:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4CA1DF87.1000000@visionsystems.de>
>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:
Yegor> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Yegor> Index: b/docs/buildroot.html
Yegor> ===================================================================
Yegor> --- a/docs/buildroot.html 2010-09-28 11:22:51.000000000 +0200
Yegor> +++ b/docs/buildroot.html 2010-09-28 14:24:37.000000000 +0200
Yegor> @@ -171,7 +171,7 @@
Thanks, committed!
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] add lzop dependency
From: Peter Korsgaard @ 2010-09-28 12:48 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4CA0542C.4080400@visionsystems.de>
>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:
Yegor> lzop will be required to compress Linux kernel via lzo compression method.
Yegor> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Lzop isn't that common and it's only needed for a fairly specific setup,
wouldn't it make more sense to build it if needed using the host
infrastructure we have instead?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] add lzop dependency
From: Yegor Yefremov @ 2010-09-28 13:32 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87aan211an.fsf@macbook.be.48ers.dk>
> Yegor> lzop will be required to compress Linux kernel via lzo compression method.
> Yegor> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
>
> Lzop isn't that common and it's only needed for a fairly specific setup,
> wouldn't it make more sense to build it if needed using the host
> infrastructure we have instead?
Yes, it makes sense. I'll rewrite the patch. What do you think about letting user to specify kernel compression:
Kernel->Compression method->gzip
->lzma
->lzo
Then I could combine these two issues.
Regards,
Yegor
^ permalink raw reply
* [Buildroot] [PATCH] add lzop dependency
From: Peter Korsgaard @ 2010-09-28 13:48 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4CA1EE76.9090605@visionsystems.de>
>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:
Hi,
>> Lzop isn't that common and it's only needed for a fairly specific setup,
>> wouldn't it make more sense to build it if needed using the host
>> infrastructure we have instead?
Yegor> Yes, it makes sense. I'll rewrite the patch. What do you think
Yegor> about letting user to specify kernel compression:
That makes sense on ARM when zImage is selected, but might not for other
archs. From a quick look in the kernel sources it seems to be available
on:
arm, blackfin, mips, s390, sh, x86
So atleast ppc, avr32 and sparc are missing.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] Option to disable mouse cursor in QT
From: jean at iddad.fr @ 2010-09-28 15:18 UTC (permalink / raw)
To: buildroot
Hi,
My company is developing a touch screen product and we are using QT. Because of the touch screen, I don't want to display any mouse pointer/cursor so I patched buildroot to disable it at configuration time.
As touchscreens become more and more common some other people may need this patch as well, so here it is:
diff -crB buildroot-2010.08/package/qt/Config.in buildroot-2010.08-patched/package/qt/Config.in
*** buildroot-2010.08/package/qt/Config.in 2010-08-31 23:07:06.000000000 +0100
--- buildroot-2010.08-patched/package/qt/Config.in 2010-09-28 08:56:31.000000000 +0100
***************
*** 373,376 ****
--- 373,384 ----
Build the Qt Script Tools module.
if unsure, say n.
+ config BR2_PACKAGE_QT_CURSOR
+ bool "Mouse Cursor"
+ default y
+ help
+ Enables the mouse cursor.
+ If using a touchscreen, say n to prevent the cursor from being displayed.
+
+
endif # BR2_PACKAGE_QT
diff -crB buildroot-2010.08/package/qt/qt.mk buildroot-2010.08-patched/package/qt/qt.mk
*** buildroot-2010.08/package/qt/qt.mk 2010-08-31 23:07:06.000000000 +0100
--- buildroot-2010.08-patched/package/qt/qt.mk 2010-09-28 08:56:54.000000000 +0100
***************
*** 371,376 ****
--- 371,382 ----
QT_CONFIGURE += -no-pch
endif
+ ifeq ($(BR2_PACKAGE_QT_CURSOR),y)
+ QT_CONFIGURE+= -feature-CURSOR
+ else
+ QT_CONFIGURE+= -no-feature-CURSOR
+ endif
+
BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
# x86x86fix
Regards,
Jean
^ permalink raw reply
* [Buildroot] [PATCH 2/2] toolchain: add new toolchain backend: crosstool-NG
From: Yann E. MORIN @ 2010-09-28 16:25 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1284926049-9882-3-git-send-email-yann.morin.1998@anciens.enib.fr>
All,
On Sunday 19 September 2010 21:54:09 Yann E. MORIN wrote:
> Signed-off-by: Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
> ---
> Makefile | 4 +-
> package/Makefile.in | 2 +
> toolchain/Config.in | 9 +
> ...chain-external.mk => toolchain-crosstool-ng.mk} | 4 +-
> toolchain/toolchain-crosstool-ng/Config.in | 60 +++
> .../toolchain-crosstool-ng/crosstool-ng.config | 360 +++++++++++++++
> toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 275 +++++++++++
> .../uClibc.config} | 126 +++---
> 8 files changed, 773 insertions(+), 67 deletions(-)
Ping? ;-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH] Makefile: generate a Makefile wrapper in $(O)
From: Yann E. MORIN @ 2010-09-28 16:36 UTC (permalink / raw)
To: buildroot
In-Reply-To: <8739sw41n7.fsf@macbook.be.48ers.dk>
On Sunday 26 September 2010 23:48:28 Peter Korsgaard wrote:
> Yann> - the kernel always overwrites the wrapper at each call: doing so in
> Yann> buildroot makes the kconfig stuff be rebuilt every time;
> Huh? We do call mkmakefile every time, but you do the extra trick about
> .Makefile (why?). I guess the reason why you have the kconfig stuff
> rebuilding is that you added the phony outputmake dependency to the
> kconfig binaries rather than the phony menuconfig/oldconfig/.. targets.
Ah, right, most probably.
> Yann> - the script writing the wrapper has been expunged of the few lines
> Yann> that were too kernel-related: in buildroot we do not need the version
> Yann> string in the wrapper, and we do not have a patchlevel version;
>
> Yann> +
> Yann> +ifeq ($(NEED_WRAPPER),y)
> Yann> +# outputmakefile generates a Makefile in the output directory, if using a
> Yann> +# separate output directory. This allows convenient use of make in the
> Yann> +# output directory.
> Yann> +outputmakefile:
> Yann> + $(Q)$(SHELL) $(TOPDIR)/scripts/mkmakefile $(CURDIR) $(O)
> Yann> +else
> Yann> +outputmakefile:
> Yann> + @true
> Yann> +endif
>
> A makefile target without any rules is OK, so you could get rid of the
> true.
The issue with an no-rule target is that it is considered to be always re-done.
But that's no issue now the kconfig is not re-built every time.
> We use TOPDIR everywhere else instead of CURDIR, so I would prefer
> to use it here.
I see. I used CURDIR as this is set by make, so it is sure set. But TOPDIR
is better indeed, as it makes it homogenous with the rest of the Makefiles.
> It also makes more sense to make mkmakefile executable
> and get rid of the SHELL.
I used $(SHELL) because I was too often bitten by scripts that lacked the
execution bit set. Using $(SHELL) is a way to not care about it.
> Yann> +
> Yann> +if ! cmp $2/.Makefile $2/Makefile >/dev/null 2>&1; then
> Yann> + echo " GEN Makefile"
> Yann> + rm -f $2/Makefile
> Yann> + mv $2/.Makefile $2/Makefile
> Yann> +else
> Yann> + rm -f $2/.Makefile
> Yann> +fi
> I would prefer to stick as close as possible to the version in the
> kernel sources, so I'll remove this. What is the reason for it? You
> already created the Makefile, so it cannot be because of performance.
It was in order not too touch the wrapper in case it did not change, so
the kconfig was not rebuilt. With the new dependencies you fixed, it is
indeed no longer needed, and we can always overwrite it.
> I've committed a slightly tweaked version of it, thanks.
Thank you for the fixes! :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [ Patch 0/4] Fix for POSIX compliance
From: Yann E. MORIN @ 2010-09-28 16:38 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285017969-32280-1-git-send-email-yann.morin.1998@anciens.enib.fr>
All,
On Monday 20 September 2010 23:26:05 Yann E. MORIN wrote:
> This series adds fixes for POSIX 1003.1-2008 compliance in some shell
> scripts, with respect to string comparison. POSIX says that string
> comparison in test(1) is done using a sing '='; using two is a bashism.
Ping? ;-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH] Option to disable mouse cursor in QT
From: Thomas Petazzoni @ 2010-09-28 17:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <39650.1285687128@iddad.fr>
Hello Jean,
On Tue, 28 Sep 2010 17:18:48 +0200
<jean@iddad.fr> wrote:
> My company is developing a touch screen product and we are using QT. Because of the touch
> screen, I don't want to display any mouse pointer/cursor so I patched
> buildroot to disable it at configuration time. As touchscreens become more and more common
> some other people may need this patch as well, so here it is:
Sounds like a good thing to have.
Could you format your patch as an unified diff, and add the proper
description + signed-off-by-line ? This would allow us to keep proper
attribution on the patch. If you're not interested by being directly
attributed the work of this patch, I can also merge it manually.
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 1/4] Added new menu item to specify a custom port for /etc/inittab
From: Thomas Petazzoni @ 2010-09-28 17:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4CA05B90.30704@visionsystems.de>
Hello,
Would people cry/complain if instead of the following patch we simply
replace the TARGET_GENERIC_GETTY_PORT parameter by a single free-form
text-field ?
Thomas
On Mon, 27 Sep 2010 10:53:36 +0200
Yegor Yefremov <yegor_sub1@visionsystems.de> wrote:
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
>
> ---
> target/generic/Config.in | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/target/generic/Config.in b/target/generic/Config.in
> index 54ff1d6..286b0a3 100644
> --- a/target/generic/Config.in
> +++ b/target/generic/Config.in
> @@ -102,8 +102,16 @@ config BR2_TARGET_GENERIC_GETTY_TTYCPM2
> config BR2_TARGET_GENERIC_GETTY_TTYCPM3
> bool "ttyCPM3"
> depends on BR2_powerpc
> +config BR2_TARGET_GENERIC_GETTY_CUSTOM
> + bool "Select custom port"
> +
> endchoice
>
> +config BR2_TARGET_GENERIC_GETTY_CUSTOM_PORT
> + string "Port"
> + depends on BR2_TARGET_GENERIC_GETTY_CUSTOM
> + default ""
> +
> config BR2_TARGET_GENERIC_GETTY_PORT
> string
> default "#ttyS0" if BR2_TARGET_GENERIC_GETTY_NONE
> @@ -134,6 +142,7 @@ config BR2_TARGET_GENERIC_GETTY_PORT
> default "ttyCPM1" if BR2_TARGET_GENERIC_GETTY_TTYCPM1
> default "ttyCPM2" if BR2_TARGET_GENERIC_GETTY_TTYCPM2
> default "ttyCPM3" if BR2_TARGET_GENERIC_GETTY_TTYCPM3
> + default $(BR2_TARGET_GENERIC_GETTY_CUSTOM_PORT) if BR2_TARGET_GENERIC_GETTY_CUSTOM
>
> choice
> prompt "Baudrate to use"
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 2/4] Enable terminal type configuration for /etc/inittab
From: Thomas Petazzoni @ 2010-09-28 17:28 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4C9C553E.8040105@visionsystems.de>
On Fri, 24 Sep 2010 09:37:34 +0200
Yegor Yefremov <yegor_sub1@visionsystems.de> wrote:
> diff --git a/target/generic/Config.in b/target/generic/Config.in
> index 286b0a3..e7b2c9f 100644
> --- a/target/generic/Config.in
> +++ b/target/generic/Config.in
> @@ -164,6 +164,12 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200
> bool "115200"
> endchoice
>
> +config BR2_TARGET_GENERIC_GETTY_TERMINAL_TYPE
> + string "Terminal type"
> + default "vt100"
> + help
> + Specify a terminal type like vt100, linux etc.
Need only one tab + 2 spaces for the indentation of the help text.
Just out of curiosity, in what cases isn't vt100 an appropriate value ?
Once the minor tab+spaces issue is fixed:
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
I can merge this patch (and the other patches in this patch set into my
boards-cleanup work, as it is somewhat related to board-level
configuration options).
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 3/4] Create menu entry to select device creation method
From: Thomas Petazzoni @ 2010-09-28 17:35 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4C9C558A.7050009@visionsystems.de>
On Fri, 24 Sep 2010 09:38:50 +0200
Yegor Yefremov <yegor_sub1@visionsystems.de> wrote:
> +choice
> + prompt "Device Creation"
> + default BR2_ROOTFS_DEVICE_CREATION_STATIC
I would probably name this "/dev management" or something similar. In
my boards-cleanup work, I'm creating a new top-level "System
configuration" menu. Maybe this should belong to this place instead,
but this is something I can handle if I merge this patch into my
boards-cleanup branch.
> +config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV
> + bool "Dynamic using mdev"
Maybe this should "select BR2_PACKAGE_BUSYBOX" ?
> config BR2_ROOTFS_DEVICE_TABLE
> - string "Path to the device table"
> - default "target/generic/device_table.txt"
> - help
> - Specify the location of a device table, that will be passed
> - to the makedevs utility to create all the special device
> - files in the target filesystem.
> + string "Path to the device table"
> + depends on BR2_ROOTFS_DEVICE_CREATION_STATIC
> + default "target/generic/device_table.txt"
> + help
> + Specify the location of a device table, that will be passed
> + to the makedevs utility to create all the special device
> + files in the target filesystem.
Something odd here with the indentation. We should only see the new
line "depends on BR2_ROOTFS_DEVICE_CREATION_STATIC" and no other change.
> +ifneq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
> + $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
> + $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config)
> +endif
So devtmpfs is used even when mdev or udev are used ?
> index 0000000..943b73b
> --- /dev/null
> +++ b/package/busybox/S10mdev
> @@ -0,0 +1,26 @@
> +#!/bin/sh
> +#
> +# Start the mdev....
s/the//
> +#
> +
> +case "$1" in
> + start)
> + echo "Starting mdev..."
> + /sbin/mdev -s
This is not sufficient as far as I remember: this will only
populate /dev with the existing devices. mdev also needs to be
registered as a hotplug event handler by writing to some /proc/sys
file. See mdev documentation for details (docs/mdev.txt in Busybox
sources).
> + stop)
> + echo -n "Stopping mdev..."
> + killall mdev
mdev is not a daemon, so there's no point in killing it.
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index b7f4740..d4b04a9 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -20,6 +20,19 @@ ifndef BUSYBOX_CONFIG_FILE
> BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
> endif
>
> +# If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
> +ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
> +define BUSYBOX_INSTALL_MDEV_SCRIPT
> + install -m 0755 package/busybox/S10mdev $(TARGET_DIR)/etc/init.d
> +endef
> +define BUSYBOX_SET_MDEV
> + $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG))
> + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_CONF,$(BUSYBOX_BUILD_CONFIG))
> + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_EXEC,$(BUSYBOX_BUILD_CONFIG))
> + $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_LOAD_FIRMWARE,$(BUSYBOX_BUILD_CONFIG))
> +endef
> +endif
> +
> # If we have external syslogd, force busybox to use it
> ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
> define BUSYBOX_SET_SYSKLOGD
> @@ -114,6 +127,7 @@ define BUSYBOX_CONFIGURE_CMDS
> $(BUSYBOX_SET_IPV6)
> $(BUSYBOX_SET_RPC)
> $(BUSYBOX_PREFER_STATIC)
> + $(BUSYBOX_SET_MDEV)
> $(BUSYBOX_NETKITBASE)
> $(BUSYBOX_NETKITTELNET)
> @yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
> @@ -142,6 +156,7 @@ endif
> define BUSYBOX_INSTALL_TARGET_CMDS
> $(BUSYBOX_INSTALL_BINARY)
> -chmod a+rx $(TARGET_DIR)/usr/share/udhcpc/default.script
> + $(BUSYBOX_INSTALL_MDEV_SCRIPT)
> endef
This part sounds good to me.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 4/4] Add network scripting folders to fs/skeleton
From: Thomas Petazzoni @ 2010-09-28 17:40 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4C9C55C5.907@visionsystems.de>
On Fri, 24 Sep 2010 09:39:49 +0200
Yegor Yefremov <yegor_sub1@visionsystems.de> wrote:
> Those folders by device_table.txt. If using the dynamic device creation method
> these folders will be missing.
"Those folders are currently created by device_table.txt"...
Ok on the principle, but if those directories are now part of the
skeleton, they should be removed from the device_table.txt file.
However, looking at device_table.txt, I also see that it does a few
things not related to device files :
/dev d 755 0 0 - - - - -
/dev/pts d 755 0 0 - - - - -
/dev/shm d 755 0 0 - - - - -
/tmp d 1777 0 0 - - - - -
/etc d 755 0 0 - - - - -
/home/default d 2755 1000 1000 - - - - -
#<name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
/bin/busybox f 4755 0 0 - - - - -
/etc/shadow f 600 0 0 - - - - -
/etc/passwd f 644 0 0 - - - - -
/etc/network/if-up.d d 755 0 0 - - - - -
/etc/network/if-pre-up.d d 755 0 0 - - - - -
/etc/network/if-down.d d 755 0 0 - - - - -
/etc/network/if-post-down.d d 755 0 0 - - - - -
/usr/share/udhcpc/default.script f 755 0 0 - - - - -
For each of those lines, what will replace the usage of the device
table ? For things like proper access rights
for /etc/shadow, /etc/passwd, setuid for Busybox binary, proper flags
for /tmp, maybe we have no other choices than using a device table.
In that case, we could use a split device table :
* One used in all cases
* One used only in the static device case. Buildroot would concatenate
this one to the previous one before doing the root filesystem generation.
Thoughts ?
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] Libtool work: a tentative summary
From: Thomas Petazzoni @ 2010-09-28 20:36 UTC (permalink / raw)
To: buildroot
Hello,
There has recently been quite some work done around libtool handling in
Buildroot, in the form of two proposals done by Martin Banky and Lionel
Landwerlin. Those two proposals are quite different and we need to make
a choice between them. This e-mail tries to summarize the libtool
problem, how it is currently handled in Buildroot, the technical
proposals made by Martin and Lionel with their respective advantages
and drawbacks. Martin and Lionel are obviously invited to comment on
those (and the rest of this e-mail as well).
Libtool problems
================
Libtool problems in cross-compilation mode are well-known. The
famous http://www.metastatic.org/text/libtool.html lists most of the
problems, and some hacks to solve them.
Basically, Libtool does not understand the fact that we may be building
a root filesystem in a different place than "/", and keeps looking
in /usr/lib for libraries.
It is worth noting that libtool 2.4 has finally introduced a --sysroot
argument which should finally solve those problems. However, until
libtool 2.4 is picked up by most packages, we will have to live with
the libtool problems for quite some time. See
http://lists.gnu.org/archive/html/libtool/2010-09/msg00082.html.
Current Buildroot solution
==========================
The current Buildroot solution consists in two mechanisms :
*) Apply the package/buildroot-libtool.patch to packages when
<pkg>_LIBTOOL_PATCH is YES. This is the default value for
autotools-based packages.
This patch directly modifies the ltmain.sh script, which will be
used to generate the libtool script in the package as configure
time.
This patch only works with libtool 1.5.x, but a number of packages
are now using libtool 2.2.x, so more and more packages are doing
<pkg>_LIBTOOL_PATCH=NO to disable the patch. This works for most
packages but not for others (example: I'm bumping GTK to 2.20 and
it needs a patch for the ltmain.sh script which has been generated
by libtool 2.2.x)
*) Modify the .la files installed by Buildroot in order to add
$(STAGING_DIR) at the beginning of the "libdir" paths.
Martin Banky proposal
=====================
Martin Banky has sent a proposal to improve libtool handling in
Buildroot on September 16th. See
http://lists.busybox.net/pipermail/buildroot/2010-September/037505.html
and the following 4 e-mails from Martin.
Basically, Martin's proposal is to continue with the current solution
to the libtool problem, but to clean it up a bit and to extend it to
libtool 2.2.
This patch set has 3 main components :
*) Simplify the existing package/buildroot-libtool.patch by removing
useless chunks
*) Rename package/buildroot-libtool.patch to
package/buildroot-libtool-v1.5.patch, add a new
package/buildroot-libtool-v2.2.patch. Those two patches
respectively modify the ltmain.sh generated by libtool 1.5 and 2.2.
Then the Autotools infrastructure is modified to apply one patch or
the other depending on which libtool version the package is using.
*) The remaining modifications remove libtool-related patches in
various packages that have become useless thanks to the previous
patches.
Advantages of this approach :
*) We're keeping the current solution and only cleanup/extend it to
work with recent libtool versions. This is good from a
"conservative" point of view.
*) As today, we don't need to autoreconf all autotools-based packages
just to fix the libtool issue.
Drawbacks of this approach :
*) We may have similar issues with future versions of libtool, even if
the addition of --sysroot to libtool 2.4 probably means that libtool
1.5 and 2.2 will remain the only two versions of libtool causing
problems in widespread use.
*) It keeps the current solution, which is a bit ugly: modify scripts
that are generated, and hack the .la files.
*) It modifies the .la by adding informations relative to
$(STAGING_DIR), which may cause problems if we want to generate
packages (.ipkg) or if we would like to allow users to relocate the
Buildroot staging directory.
Lionel Landwerlin proposal
==========================
Lionel Landwerlin has sent a proposal to improve libtool handling in
Buildroot on September, 18th. See
http://lists.busybox.net/pipermail/buildroot/2010-September/037663.html
for the mailing list post.
Basically, Lionel's proposal is to patch libtool itself to make it
sysroot-capable and then autoreconfigure all autotools-based packages
to make them use the fixed libtool version.
Lionel's proposal is relatively complicated because in order for the
patch on libtool to take effect, libtool itself needs to be
autoreconfigured, which in turn requires libtool. So Lionel has
introduced a host-libtool-host package, which is an unmodified libtool,
installed in a new $(HOST_HOST_DIR) directory. He later uses that
host-libtool-host to autoreconfigure the host-libtool (which has been
previously patched to understand sysroot related things).
host-libtool-host will be kept for the autoreconfiguration of host
packages, while host-libtool is used for the autoreconfiguration of
target packages. (If your head hasn't exploded yet, keep reading,
otherwise, take a break and come back in 10 minutes). This is what the
first patch in Lionel patch set does. The other patches are only minor
related changes.
Advantages of this approach :
*) We no longer arbitrarly patch ltmain.sh in every package, with the
need to carry libtool-version-specific patches.
*) We no longer need to modify the .la files.
*) The approach seems cleaner.
*) It is closer to what we could have with libtool 2.4, except that
libtool 2.4 wouldn't need to be patch as it already supports
--sysroot by default. Therefore, a large part of the complexity of
this patch set could be removed (since we wouldn't have to
autoreconfigure libtool itself). However, we'd still need to
autoreconfigure all autotools-based packages (see below). I know
Lionel has started experimenting with libtool 2.4, as can be seen
on
http://lists.gnu.org/archive/html/bug-libtool/2010-09/msg00064.html
Drawbacks of this approach :
*) We need to autoreconfigure *ALL* autotools-based packages. This may
be an issue for two reasons: 1/ speed, 2/ packages for which
autoreconfiguration does not work properly (yes those packages
should be fixed, but anyway, this may add some work to us).
Obviously, as packages will start using libtool 2.4 by default,
this shouldn't be a problem, but we all know that it's going to
take years before everybody moves to that newer libtool version.
*) The HOST_HOST_DIR thing and the host-libtool-host as it is
implemented today is pretty ugly. I'd rather have a either single
libtool installed in $(HOST_DIR), which work for both the
autoreconfiguration of host and target packages, or have two
libtools installed in $(HOST_DIR), on for host packages (just named
'libtool') and another for target packages (named 'cross-libtool'
or something similar).
Conclusion
==========
Therefore, the choice seems to be between :
* A conservative solution, only extending what we have today, with
limited changes and impact, but keeping the existing hacks in place.
* A radically different solution, with wider changes, more in line
with libtool future, but requiring an autoreconfiguration of all
packages that will not have libtool 2.4 by default.
In my opinion, we should settle on a solution before mid-october, in
order to merge it before the end of october and give us enough time for
testing before the release at the end of november. Considering how much
time Martin and Lionel have dedicated to this issue, I think that their
respective work deserve some attention.
Thoughts ? Comments ?
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH] Makefile: Force make to run serially in the top-level Makefile
From: Yann E. MORIN @ 2010-09-28 21:50 UTC (permalink / raw)
To: buildroot
The top-level Makefile can be executed in parallel, as it causes problems.
We can force make to be not parallel.
It's been reported many times, and recent discussions on IRC with kos_tom,
and user nick-named knee, led to this patch.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
Makefile | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index faa802b..e0cde26 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,9 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+# This top-level Makefile can *not* be executed in parallel
+.NOTPARALLEL:
+
#--------------------------------------------------------------
# Just run 'make menuconfig', configure stuff, then run 'make'.
# You shouldn't need to mess with anything beyond this point...
--
1.7.1
^ permalink raw reply related
* [Buildroot] [pull request] Pull request for branch for-2010.11/gtk-bump
From: Thomas Petazzoni @ 2010-09-28 22:12 UTC (permalink / raw)
To: buildroot
Hello,
Here is a set of patches that bump components of the Gtk stack. The
most important bump is Gtk itself, bumped from the old 2.12 to
2.20. The result is that Gtk can no longer be built with DirectFB as
the backend, as announced during the 2010.08 cycle.
I've tested these changes by running the gtkperf application on top of
the Xfbdev server in a Qemu ARM system.
Thanks,
Thomas
The following changes since commit 3e5e39a8a25a4a085afe08bdcf46933c8d569ed7:
Peter Korsgaard (1):
barebox/u-boot/linux: don't error out on missing config when make source
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot for-2010.11/gtk-bump
Thomas Petazzoni (3):
libgtk2: bump to version 2.20.1 and mark Gtk/DirectFB as broken
libglib2: bump version to 2.24.2
pango: bump version to 1.28.2
package/libglib2/libglib2.mk | 2 +-
package/libgtk2/Config.in | 12 +-
... host-libgtk2-2.20.1-reduce-dependencies.patch} | 123 ++++------
package/libgtk2/libgtk2-2.12.6-configure.patch | 256 --------------------
package/libgtk2/libgtk2-2.12.6-no-tests.patch | 11 -
package/libgtk2/libgtk2-2.20.1-libtool.patch | 60 +++++
package/libgtk2/libgtk2.mk | 14 +-
package/pango/pango.mk | 2 +-
8 files changed, 120 insertions(+), 360 deletions(-)
rename package/libgtk2/{host-libgtk2-2.12.12-reduce-dependencies.patch => host-libgtk2-2.20.1-reduce-dependencies.patch} (58%)
delete mode 100644 package/libgtk2/libgtk2-2.12.6-configure.patch
delete mode 100644 package/libgtk2/libgtk2-2.12.6-no-tests.patch
create mode 100644 package/libgtk2/libgtk2-2.20.1-libtool.patch
Thanks,
--
Thomas Petazzoni
^ permalink raw reply
* [Buildroot] [PATCH 1/3] libgtk2: bump to version 2.20.1 and mark Gtk/DirectFB as broken
From: Thomas Petazzoni @ 2010-09-28 22:12 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1285711882.git.thomas.petazzoni@free-electrons.com>
Finally, we bump Gtk from the old and ancient 2.12 version to the
latest 2.20.1 version currently available.
As noted in the 2010.08 release, the DirectFB back-end is broken in
Gtk, so libgtk2 cannot be selected anymore with the DirectFB
back-end. For the moment, we keep the Gtk/DirectFB code around, as
it's possible that a fixed DirectFB back-end will be part of Gtk 2.22.
In addition to this, we :
* Upgrade the "reduce-dependencies" patch
* Remove the "configure" and "no-tests" patches which do not seem to
be useful anymore
* Add a libtool patch
We also remove references to a non-existant 2.15 gtk version in
libgtk2.mk.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libgtk2/Config.in | 12 +-
... host-libgtk2-2.20.1-reduce-dependencies.patch} | 123 ++++------
package/libgtk2/libgtk2-2.12.6-configure.patch | 256 --------------------
package/libgtk2/libgtk2-2.12.6-no-tests.patch | 11 -
package/libgtk2/libgtk2-2.20.1-libtool.patch | 60 +++++
package/libgtk2/libgtk2.mk | 14 +-
6 files changed, 118 insertions(+), 358 deletions(-)
rename package/libgtk2/{host-libgtk2-2.12.12-reduce-dependencies.patch => host-libgtk2-2.20.1-reduce-dependencies.patch} (58%)
delete mode 100644 package/libgtk2/libgtk2-2.12.6-configure.patch
delete mode 100644 package/libgtk2/libgtk2-2.12.6-no-tests.patch
create mode 100644 package/libgtk2/libgtk2-2.20.1-libtool.patch
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index bc4ca9d..d578f33 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -4,14 +4,14 @@ config BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_CAIRO
select BR2_PACKAGE_CAIRO_PS
select BR2_PACKAGE_CAIRO_PDF
+ select BR2_PACKAGE_CAIRO_SVG
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_PANGO
- # libgtk2 on DirectFB is deprecated because it is no longer
- # supported in recent versions of Gtk. We will remove support
- # for Gtk over DirectFB in the next Buildroot version unless
- # support for DirectFB in mainline Gtk is improved in the mean
- # time.
- depends on BR2_PACKAGE_XORG7||(BR2_PACKAGE_DIRECTFB && BR2_DEPRECATED)
+ # libgtk2 on DirectFB is broken because it is no longer
+ # supported in recent versions of Gtk. However, as it is
+ # likely that support for DirectFB will be re-added in Gtk
+ # 2.22, we are keeping this around until Gtk 2.22 is released.
+ depends on BR2_PACKAGE_XORG7||(BR2_PACKAGE_DIRECTFB && BR2_BROKEN)
depends on BR2_USE_WCHAR # glib2
depends on BR2_INSTALL_LIBSTDCPP # pango
help
diff --git a/package/libgtk2/host-libgtk2-2.12.12-reduce-dependencies.patch b/package/libgtk2/host-libgtk2-2.20.1-reduce-dependencies.patch
similarity index 58%
rename from package/libgtk2/host-libgtk2-2.12.12-reduce-dependencies.patch
rename to package/libgtk2/host-libgtk2-2.20.1-reduce-dependencies.patch
index f0ac6bf..7e463a9 100644
--- a/package/libgtk2/host-libgtk2-2.12.12-reduce-dependencies.patch
+++ b/package/libgtk2/host-libgtk2-2.20.1-reduce-dependencies.patch
@@ -1,18 +1,18 @@
-Index: gtk+-2.12.12/configure.in
+Hack the configure.in file to add a "none" gdktarget which removes
+dependencies on graphic backends such as X.org or DirectFB. Gtk does
+not fully build in this mode, but it builds sufficiently to build the
+host tools that are needed to build the target Gtk.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.in | 101 ++---------------------------------------------------------
+ 1 file changed, 5 insertions(+), 96 deletions(-)
+
+Index: gtk+-2.20.1/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 @@
+--- gtk+-2.20.1.orig/configure.in
++++ gtk+-2.20.1/configure.in
+@@ -270,12 +270,12 @@
gdktarget=x11
fi
@@ -27,7 +27,7 @@ Index: gtk+-2.12.12/configure.in
*) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
esac
-@@ -349,10 +346,7 @@
+@@ -384,10 +384,7 @@
## the version requirements since those make the module lists
## annoying to construct
PKG_CHECK_MODULES(BASE_DEPENDENCIES,
@@ -37,54 +37,21 @@ Index: gtk+-2.12.12/configure.in
- cairo >= cairo_required_version])
+ [glib-2.0 >= glib_required_version])
+ ## In addition to checking that cairo is present, we also need to
+ ## check that the correct cairo backend is there. E.g. if the GDK
+@@ -399,8 +396,6 @@
+ if test "x$cairo_backend" = "xx11"; then
+ cairo_backend=xlib
+ fi
+-PKG_CHECK_MODULES(CAIRO_BACKEND,
+- [cairo-$cairo_backend >= cairo_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)
+@@ -1682,50 +1677,6 @@
fi
--
+
-# Check for Pango flags
-
-if test "x$gdktarget" = "xwin32"; then
@@ -122,14 +89,17 @@ Index: gtk+-2.12.12/configure.in
-CFLAGS="$saved_cflags"
-LDFLAGS="$saved_ldflags"
-
--GDK_PACKAGES="$PANGO_PACKAGES"
+-# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
-if test "x$gdktarget" = "xx11"; then
-- GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
+- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
+-else
+- GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend"
-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 @@
+ #
+@@ -1733,7 +1684,7 @@
# into the pkg-config files
#
if test $enable_explicit_deps != yes ; then
@@ -138,14 +108,14 @@ Index: gtk+-2.12.12/configure.in
GDK_EXTRA_LIBS=
fi
-@@ -1479,39 +1413,10 @@
+@@ -1744,36 +1695,8 @@
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
@@ -171,20 +141,15 @@ Index: gtk+-2.12.12/configure.in
- LIBS="$gtk_save_LIBS"
-fi
-
--GTK_PACKAGES="atk cairo"
+-GTK_PACKAGES="atk cairo gio-2.0"
+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 @@
-
+ if test "x$gdktarget" = "xx11"; then
+ GTK_PACKAGES="$GTK_PACKAGES pangoft2"
+ fi
+@@ -1936,20 +1859,6 @@
gtk_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
--
+ CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_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.]))
@@ -193,6 +158,10 @@ Index: gtk+-2.12.12/configure.in
- AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
-*** Can't find cairo-ps.h. You must build Cairo with the
-*** postscript backend enabled.]))
+-
+- AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([
+-*** Can't find cairo-svg.h. You must build Cairo with the
+-*** svg backend enabled.]))
-fi
-
CPPFLAGS="$gtk_save_cppflags"
diff --git a/package/libgtk2/libgtk2-2.12.6-configure.patch b/package/libgtk2/libgtk2-2.12.6-configure.patch
deleted file mode 100644
index ea60d2d..0000000
--- a/package/libgtk2/libgtk2-2.12.6-configure.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-diff -urN libgtk2-2.12.6-0rig/configure libgtk2-2.12.6/configure
---- libgtk2-2.12.6-0rig/configure 2008-01-29 04:38:14.000000000 +0100
-+++ libgtk2-2.12.6/configure 2008-07-08 10:54:39.000000000 +0200
-@@ -5094,7 +5094,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+*-linux-gnu | linux* | k*bsd*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-@@ -6973,7 +6973,7 @@
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
--linux* | k*bsd*-gnu)
-+*-linux-gnu | linux* | k*bsd*-gnu)
- if test "$host_cpu" = ia64; then
- symcode='[ABCDGIRSTW]'
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -7943,7 +7943,7 @@
- lt_prog_compiler_static='-Bstatic'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ *-linux-gnu | linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- lt_prog_compiler_wl='-Wl,'
-@@ -8402,7 +8402,7 @@
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | k*bsd*-gnu)
-+ *-linux-gnu | gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -9336,6 +9336,7 @@
- if (lt_freq[lt_foo] == 1) { print lt_foo; }
- }'`
- sys_lib_search_path_spec=`echo $lt_search_path_spec`
-+
- else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
-@@ -9667,8 +9668,9 @@
- dynamic_linker=no
- ;;
-
-+
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+*-linux-gnu | linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -9681,8 +9683,22 @@
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ # sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ # Buildroot: New sys_lib_search_path_spec taken from atk!
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-@@ -10780,6 +10796,7 @@
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
-+
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-@@ -12109,7 +12126,7 @@
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
- ;;
-- linux* | k*bsd*-gnu)
-+ *-linux-gnu | linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -12680,7 +12697,7 @@
- postdeps_CXX=
- ;;
-
--linux*)
-+*-linux-gnu | linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-@@ -12884,7 +12901,7 @@
- ;;
- esac
- ;;
-- linux* | k*bsd*-gnu)
-+ *-linux-gnu | linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -13636,7 +13653,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+*-linux-gnu | linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -13649,7 +13666,24 @@
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+
-+ # sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ # Buildroot: New sys_lib_search_path_spec taken from atk!
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
-+
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
-@@ -14586,7 +14620,7 @@
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ *-linux-gnu | linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- lt_prog_compiler_wl_F77='-Wl,'
-@@ -15045,7 +15079,7 @@
- archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | k*bsd*-gnu)
-+ gnu* | *-linux-gnu | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -16239,7 +16273,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+*-linux-gnu | linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -16252,7 +16286,23 @@
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ # sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ # Buildroot: New sys_lib_search_path_spec taken from atk!
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
-+
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
-@@ -17169,7 +17219,7 @@
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ *-linux-gnu | linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -17628,7 +17678,7 @@
- archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | k*bsd*-gnu)
-+ gnu* | *-linux-gnu | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -18842,7 +18892,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+*-linux-gnu | linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -18855,7 +18905,22 @@
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ #sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ # Buildroot: New sys_lib_search_path_spec taken from atk!
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
diff --git a/package/libgtk2/libgtk2-2.12.6-no-tests.patch b/package/libgtk2/libgtk2-2.12.6-no-tests.patch
deleted file mode 100644
index ea92433..0000000
--- a/package/libgtk2/libgtk2-2.12.6-no-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in 2008-01-28 22:38:09.000000000 -0500
-+++ b/Makefile.in 2008-02-11 12:52:45.000000000 -0500
-@@ -330,7 +330,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
-
- # require automake 1.4
diff --git a/package/libgtk2/libgtk2-2.20.1-libtool.patch b/package/libgtk2/libgtk2-2.20.1-libtool.patch
new file mode 100644
index 0000000..12b69a4
--- /dev/null
+++ b/package/libgtk2/libgtk2-2.20.1-libtool.patch
@@ -0,0 +1,60 @@
+Fix the usual libtool-related problems, but since libgtk2 uses libtool
+2.2, we need a specific patch.
+
+This is an exact copy of the patch proposed by Martin Banky.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+--- a/ltmain.sh 2006-03-11 13:49:04.000000000 -0500
++++ b/ltmain.sh 2008-04-30 09:55:28.000000000 -0400
+@@ -2239,8 +2239,11 @@ func_mode_install ()
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+- test "$inst_prefix_dir" = "$destdir" && \
+- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++ #
++ # This breaks install into our staging area. -PB
++ #
++ # test "$inst_prefix_dir" = "$destdir" && \
++ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+@@ -5739,8 +5742,14 @@ func_mode_link ()
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+- dir="$libdir"
+- absdir="$libdir"
++ # Adding 'libdir' from the .la file to our library search paths
++ # breaks crosscompilation horribly. We cheat here and don't add
++ # it, instead adding the path where we found the .la. -CL
++ dir="$abs_ladir"
++ absdir="$abs_ladir"
++ libdir="$abs_ladir"
++ #dir="$libdir"
++ #absdir="$libdir"
+ fi
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+@@ -5891,7 +5900,7 @@ func_mode_link ()
+ *)
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+- need_relink=yes
++ need_relink=no
+ fi
+ ;;
+ esac
+@@ -8373,6 +8382,10 @@ func_mode_link ()
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
++ # Replacing uninstalled with installed can easily break crosscompilation,
++ # since the installed path is generally the wrong architecture. -CL
++ newdependency_libs="$newdependency_libs $deplib"
++ continue
+ case $deplib in
+ *.la)
+ func_basename "$deplib"
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index d669622..a2321d1 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -3,8 +3,8 @@
# libgtk2.0
#
#############################################################
-LIBGTK2_VERSION_MAJOR:=2.12
-LIBGTK2_VERSION_MINOR:=12
+LIBGTK2_VERSION_MAJOR:=2.20
+LIBGTK2_VERSION_MINOR:=1
LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2
@@ -12,6 +12,7 @@ LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/$(LIBGTK2_VERSION_MAJOR)
LIBGTK2_AUTORECONF = NO
LIBGTK2_INSTALL_STAGING = YES
LIBGTK2_INSTALL_TARGET = YES
+LIBGTK2_LIBTOOL_PATCH = NO
LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
glib_cv_uscore=no \
@@ -64,7 +65,8 @@ LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
ac_cv_prog_F77=no \
- ac_cv_path_CUPS_CONFIG=no
+ ac_cv_path_CUPS_CONFIG=no \
+ gio_can_sniff=no
LIBGTK2_CONF_OPT = --enable-shared \
--enable-static \
@@ -90,11 +92,6 @@ else
LIBGTK2_CONF_OPT += --without-x
endif
-# Buildroot does not support JPEG2000 library
-ifeq ($(LIBGTK2_VERSION_MAJOR),2.15)
-LIBGTK2_CONF_OPT += --without-libjasper
-endif
-
ifeq ($(BR2_PACKAGE_LIBPNG),y)
LIBGTK2_DEPENDENCIES += libpng
else
@@ -135,6 +132,7 @@ LIBGTK2_POST_INSTALL_TARGET_HOOKS += LIBGTK_POST_INSTALL_TWEAKS
HOST_LIBGTK2_DEPENDENCIES = host-libglib2 host-libpng
HOST_LIBGTK2_AUTORECONF = YES
+HOST_LIBGTK2_LIBTOOL_PATCH = NO
HOST_LIBGTK2_CONF_OPT = \
--disable-static \
--disable-glibtest \
--
1.7.0.4
^ permalink raw reply related
* [Buildroot] [PATCH 2/3] libglib2: bump version to 2.24.2
From: Thomas Petazzoni @ 2010-09-28 22:12 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1285711882.git.thomas.petazzoni@free-electrons.com>
This is a mechanical bump, no other changes involved.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libglib2/libglib2.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 61e8c1c..e45e89c 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -4,7 +4,7 @@
#
#############################################################
LIBGLIB2_VERSION_MAJOR = 2.24
-LIBGLIB2_VERSION_MINOR = 1
+LIBGLIB2_VERSION_MINOR = 2
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
--
1.7.0.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox