* [Buildroot] [PATCH 01/41] package: Force copy of .la files at the post install hook (readonly files might be problematic)
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 13:11 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure llandwerlin at gmail.com
` (39 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/Makefile.autotools.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index a4be8c8..38e57cd 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -200,7 +200,7 @@ ifndef $(2)_INSTALL_STAGING_CMDS
define $(2)_INSTALL_STAGING_CMDS
$$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
for i in $$$$(find $(STAGING_DIR)/usr/lib* -name "*.la"); do \
- cp $$$$i $$$$i~; \
+ cp -f $$$$i $$$$i~; \
$$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$$$i; \
done
endef
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 01/41] package: Force copy of .la files at the post install hook (readonly files might be problematic) llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 7:41 ` Peter Korsgaard
` (2 more replies)
2010-04-13 23:05 ` [Buildroot] [PATCH 03/41] ncurses: fix path to patch ncurses5-config llandwerlin at gmail.com
` (38 subsequent siblings)
40 siblings, 3 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/ncurses/ncurses.mk | 187 +++++++++++++++-----------------------------
1 files changed, 64 insertions(+), 123 deletions(-)
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index fb22c6c..944fcdb 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -23,99 +23,83 @@
# USA
# TARGETS
-NCURSES_VERSION:=5.6
-NCURSES_SITE:=$(BR2_GNU_MIRROR)/ncurses
-NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VERSION)
-NCURSES_SOURCE:=ncurses-$(NCURSES_VERSION).tar.gz
-NCURSES_CAT:=$(ZCAT)
+NCURSES_VERSION = 5.6
+NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
+NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
+NCURSES_INSTALL_STAGING = YES
+
+NCURSES_CONF_OPT = \
+ --with-shared \
+ --without-cxx \
+ --without-cxx-binding \
+ --without-ada \
+ --without-progs \
+ --disable-big-core \
+ --without-profile \
+ --disable-rpath \
+ --enable-echo \
+ --enable-const \
+ --enable-overwrite \
+ --enable-broken_linker
ifneq ($(BR2_PACKAGE_NCURSES_TARGET_HEADERS),y)
-NCURSES_WANT_STATIC=--disable-static
+NCURSES_CONF_OPT += --disable-static
endif
-$(DL_DIR)/$(NCURSES_SOURCE):
- $(call DOWNLOAD,$(NCURSES_SITE),$(NCURSES_SOURCE))
-
-$(NCURSES_DIR)/.patched: $(DL_DIR)/$(NCURSES_SOURCE)
- $(NCURSES_CAT) $(DL_DIR)/$(NCURSES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- #use the local tic and not whatever the build system was going to find.
- $(SED) 's~\$$srcdir/shlib tic\$$suffix~/usr/bin/tic~' \
- $(NCURSES_DIR)/misc/run_tic.in
- toolchain/patch-kernel.sh $(NCURSES_DIR) package/ncurses/ ncurses\*.patch
- $(CONFIG_UPDATE) $(NCURSES_DIR)
- touch $@
-
-$(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.patched
- (cd $(NCURSES_DIR); rm -rf config.cache; \
- BUILD_CC="$(HOSTCC)" \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(REAL_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/man \
- --infodir=/usr/info \
- --with-terminfo-dirs=/usr/share/terminfo \
- --with-default-terminfo-dir=/usr/share/terminfo \
- --with-shared --without-cxx --without-cxx-binding \
- --without-ada --without-progs --disable-big-core \
- $(DISABLE_NLS) $(DISABLE_LARGEFILE) \
- --without-profile --without-debug --disable-rpath \
- --enable-echo --enable-const --enable-overwrite \
- --enable-broken_linker \
- $(NCURSES_WANT_STATIC) \
- )
- touch $@
-
-$(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/.configured
- $(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \
- libs panel menu form headers
+ifneq ($(BR2_ENABLE_DEBUG),y)
+NCURSES_CONF_OPT += --without-debug
+endif
-$(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
- $(MAKE1) \
- prefix=$(STAGING_DIR)/usr/ \
- exec_prefix=$(STAGING_DIR) \
- bindir=$(STAGING_DIR)/bin \
- sbindir=$(STAGING_DIR)/sbin \
- libexecdir=$(STAGING_DIR)/usr/lib \
- datadir=$(STAGING_DIR)/usr/share \
- sysconfdir=$(STAGING_DIR)/etc \
- localstatedir=$(STAGING_DIR)/var \
- libdir=$(STAGING_DIR)/usr/lib \
- infodir=$(STAGING_DIR)/usr/info \
- mandir=$(STAGING_DIR)/usr/man \
- includedir=$(STAGING_DIR)/usr/include \
- gxx_include_dir=$(STAGING_DIR)/usr/include/c++ \
- ticdir=$(STAGING_DIR)/usr/share/terminfo \
- -C $(NCURSES_DIR) install
- chmod a-x $(NCURSES_DIR)/lib/libncurses.so*
+define NCURSES_PATCH_NCURSES_CONFIG
$(SED) 's^prefix="^prefix="$(STAGING_DIR)^' \
$(STAGING_DIR)/bin/ncurses5-config
- touch -c $@
+endef
+
+NCURSES_POST_BUILD_HOOKS += NCURSES_PATCH_NCURSES_CONFIG
+
+ifeq ($(BR2_HAVE_DEVFILES),y)
+define NCURSES_INSTALL_TARGET_DEVFILES
+ mkdir -p $(TARGET_DIR)/usr/include
+ cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/curses.h
+ cp -dpf $(NCURSES_DIR)/include/ncurses_dll.h $(TARGET_DIR)/usr/include/ncurses_dll.h
+ cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/
+ cp -dpf $(NCURSES_DIR)/include/unctrl.h $(TARGET_DIR)/usr/include/
+ cp -dpf $(NCURSES_DIR)/include/termcap.h $(TARGET_DIR)/usr/include/
+ cp -dpf $(NCURSES_DIR)/lib/libncurses.a $(TARGET_DIR)/usr/lib/
+ (cd $(TARGET_DIR)/usr/lib; \
+ ln -fs libncurses.a libcurses.a; \
+ ln -fs libncurses.a libtermcap.a; \
+ )
+ (cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
+ rm -f $(TARGET_DIR)/usr/lib/libncurses.so
+ (cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.so.$(NCURSES_VERSION) libncurses.so)
+endef
+endif
-$(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
- mkdir -p $(TARGET_DIR)/usr/lib
- cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y)
+define NCURSES_INSTALL_TARGET_PANEL
cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/usr/lib/
+endef
endif
+
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_FORM),y)
+define NCURSES_INSTALL_TARGET_FORM
cp -dpf $(NCURSES_DIR)/lib/libform.so* $(TARGET_DIR)/usr/lib/
+endef
endif
+
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_MENU),y)
+define NCURSES_INSTALL_TARGET_MENU
cp -dpf $(NCURSES_DIR)/lib/libmenu.so* $(TARGET_DIR)/usr/lib/
+endef
endif
+
+define NCURSES_INSTALL_TARGET_CMDS
+ mkdir -p $(TARGET_DIR)/usr/lib
+ cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
+ $(NCURSES_INSTALL_TARGET_PANEL)
+ $(NCURSES_INSTALL_TARGET_FORM)
+ $(BR2_PACKAGE_NCURSES_TARGET_MENU)
ln -snf /usr/share/terminfo $(TARGET_DIR)/usr/lib/terminfo
mkdir -p $(TARGET_DIR)/usr/share/terminfo/x
cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm $(TARGET_DIR)/usr/share/terminfo/x
@@ -130,51 +114,8 @@ endif
cp -dpf $(STAGING_DIR)/usr/share/terminfo/a/ansi $(TARGET_DIR)/usr/share/terminfo/a
mkdir -p $(TARGET_DIR)/usr/share/terminfo/l
cp -dpf $(STAGING_DIR)/usr/share/terminfo/l/linux $(TARGET_DIR)/usr/share/terminfo/l
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
- touch -c $@
-
-$(NCURSES_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libncurses.so*
+ $(NCURSES_INSTALL_TARGET_DEVFILES)
+endef # NCURSES_INSTALL_TARGET_CMDS
-$(TARGET_DIR)/usr/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.a
- mkdir -p $(TARGET_DIR)/usr/include
- cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/curses.h
- cp -dpf $(NCURSES_DIR)/include/ncurses_dll.h $(TARGET_DIR)/usr/include/ncurses_dll.h
- cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/
- cp -dpf $(NCURSES_DIR)/include/unctrl.h $(TARGET_DIR)/usr/include/
- cp -dpf $(NCURSES_DIR)/include/termcap.h $(TARGET_DIR)/usr/include/
- cp -dpf $(NCURSES_DIR)/lib/libncurses.a $(TARGET_DIR)/usr/lib/
- (cd $(TARGET_DIR)/usr/lib; \
- ln -fs libncurses.a libcurses.a; \
- ln -fs libncurses.a libtermcap.a; \
- )
- (cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
- rm -f $(TARGET_DIR)/usr/lib/libncurses.so
- (cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.so.$(NCURSES_VERSION) libncurses.so)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
- touch -c $@
-
-ncurses: $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION) \
- $(if $(BR2_HAVE_DEVFILES),$(TARGET_DIR)/usr/lib/libncurses.a)
-
-ncurses-unpacked: $(NCURSES_DIR)/.patched
-
-ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE)
-
-ncurses-clean:
- rm -f $(STAGING_DIR)/usr/lib/libncurses.so* $(TARGET_DIR)/usr/lib/libncurses.so*
- rm -rf $(STAGING_DIR)/usr/share/tabset $(TARGET_DIR)/usr/share/tabset
- rm -rf $(STAGING_DIR)/usr/share/terminfo $(TARGET_DIR)/usr/share/terminfo
- rm -rf $(TARGET_DIR)/usr/lib/terminfo
- -$(MAKE) -C $(NCURSES_DIR) clean
-
-ncurses-dirclean:
- rm -rf $(NCURSES_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NCURSES),y)
-TARGETS+=ncurses
-endif
+$(eval $(call AUTOTARGETS,package,ncurses))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure
2010-04-13 23:05 ` [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure llandwerlin at gmail.com
@ 2010-04-14 7:41 ` Peter Korsgaard
2010-04-14 8:39 ` Lionel Landwerlin
2010-04-14 13:15 ` Thomas Petazzoni
2010-04-14 13:17 ` Thomas Petazzoni
2 siblings, 1 reply; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 7:41 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> +
llandwerlin> +define NCURSES_INSTALL_TARGET_CMDS
llandwerlin> + mkdir -p $(TARGET_DIR)/usr/lib
llandwerlin> + cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
llandwerlin> + $(NCURSES_INSTALL_TARGET_PANEL)
llandwerlin> + $(NCURSES_INSTALL_TARGET_FORM)
llandwerlin> + $(BR2_PACKAGE_NCURSES_TARGET_MENU)
Don't you mean NCURSES_INSTALL_TARGET_MENU here?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure
2010-04-14 7:41 ` Peter Korsgaard
@ 2010-04-14 8:39 ` Lionel Landwerlin
0 siblings, 0 replies; 73+ messages in thread
From: Lionel Landwerlin @ 2010-04-14 8:39 UTC (permalink / raw)
To: buildroot
On Wed, Apr 14, 2010 at 9:41 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "llandwerlin" == llandwerlin ?<llandwerlin@gmail.com> writes:
>
> ?llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> ?llandwerlin> +
> ?llandwerlin> +define NCURSES_INSTALL_TARGET_CMDS
> ?llandwerlin> + mkdir -p $(TARGET_DIR)/usr/lib
> ?llandwerlin> + cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
> ?llandwerlin> + $(NCURSES_INSTALL_TARGET_PANEL)
> ?llandwerlin> + $(NCURSES_INSTALL_TARGET_FORM)
> ?llandwerlin> + $(BR2_PACKAGE_NCURSES_TARGET_MENU)
>
> Don't you mean NCURSES_INSTALL_TARGET_MENU here?
>
Exact, thx !
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure
2010-04-13 23:05 ` [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure llandwerlin at gmail.com
2010-04-14 7:41 ` Peter Korsgaard
@ 2010-04-14 13:15 ` Thomas Petazzoni
2010-04-14 13:17 ` Thomas Petazzoni
2 siblings, 0 replies; 73+ messages in thread
From: Thomas Petazzoni @ 2010-04-14 13:15 UTC (permalink / raw)
To: buildroot
On Wed, 14 Apr 2010 01:05:35 +0200
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Except Peter's comment:
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
I think the mess to install development files on the target should be
changed to just use "make DESTDIR=$(TARGET_DIR) install" and then let
the main Buildroot Makefile remove /usr/include, .a and .la files and
all the like. However, this patch is just a conversion to the autotools
infrastructure, you kept the existing behaviour, which is ok. We can
later change this development file installation thing.
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 [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure
2010-04-13 23:05 ` [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure llandwerlin at gmail.com
2010-04-14 7:41 ` Peter Korsgaard
2010-04-14 13:15 ` Thomas Petazzoni
@ 2010-04-14 13:17 ` Thomas Petazzoni
2 siblings, 0 replies; 73+ messages in thread
From: Thomas Petazzoni @ 2010-04-14 13:17 UTC (permalink / raw)
To: buildroot
Hello,
Oops, I missed something here.
On Wed, 14 Apr 2010 01:05:35 +0200
llandwerlin at gmail.com wrote:
> +define NCURSES_PATCH_NCURSES_CONFIG
> $(SED) 's^prefix="^prefix="$(STAGING_DIR)^' \
> $(STAGING_DIR)/bin/ncurses5-config
> - touch -c $@
> +endef
> +
> +NCURSES_POST_BUILD_HOOKS += NCURSES_PATCH_NCURSES_CONFIG
I don't understand how this can be a post-build hook. After build,
ncurses is not yet installed in $(STAGING_DIR). Shouldn't this be a
post-staging-install hook instead ?
And BTW, your patch 3/41 should probably be just folded into this 2/41
patch. But it's not really important.
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] 73+ messages in thread
* [Buildroot] [PATCH 03/41] ncurses: fix path to patch ncurses5-config
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 01/41] package: Force copy of .la files at the post install hook (readonly files might be problematic) llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 04/41] lua: conversion to new package infrastructure llandwerlin at gmail.com
` (37 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/ncurses/ncurses.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 944fcdb..8413672 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -52,10 +52,10 @@ endif
define NCURSES_PATCH_NCURSES_CONFIG
$(SED) 's^prefix="^prefix="$(STAGING_DIR)^' \
- $(STAGING_DIR)/bin/ncurses5-config
+ $(STAGING_DIR)/usr/bin/ncurses5-config
endef
-NCURSES_POST_BUILD_HOOKS += NCURSES_PATCH_NCURSES_CONFIG
+NCURSES_POST_STAGING_INSTALL_HOOKS += NCURSES_PATCH_NCURSES_CONFIG
ifeq ($(BR2_HAVE_DEVFILES),y)
define NCURSES_INSTALL_TARGET_DEVFILES
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 04/41] lua: conversion to new package infrastructure
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (2 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 03/41] ncurses: fix path to patch ncurses5-config llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 13:19 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 05/41] package: Add $(HOST_DIR)/usr/lib to LD_LIBRARY_PATH for host but not target llandwerlin at gmail.com
` (36 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Also install development files to staging by default and to target if
requested.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/lua/lua.mk | 124 +++++++++++++++++++++++++--------------------------
1 files changed, 61 insertions(+), 63 deletions(-)
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index aeb6c82..9cb1675 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -5,77 +5,75 @@
#############################################################
LUA_VERSION=5.1.4
-
LUA_SOURCE=lua-$(LUA_VERSION).tar.gz
-LUA_CAT:=$(ZCAT)
LUA_SITE=http://www.lua.org/ftp
+LUA_INSTALL_STAGING=YES
+LUA_DEPENDENCIES = readline ncurses
-LUA_DIR=$(BUILD_DIR)/lua-$(LUA_VERSION)
-
+#
LUA_CFLAGS=-DLUA_USE_LINUX
LUA_MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
-$(DL_DIR)/$(LUA_SOURCE):
- $(call DOWNLOAD,$(LUA_SITE),$(LUA_SOURCE))
-
-$(LUA_DIR)/.unpacked: $(DL_DIR)/$(LUA_SOURCE)
- $(LUA_CAT) $(DL_DIR)/$(LUA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(LUA_DIR)/.unpacked
-
-$(LUA_DIR)/src/lua: $(LUA_DIR)/.unpacked
- rm -f $@
+define LUA_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) \
MYCFLAGS=$(LUA_CFLAGS) \
MYLIBS=$(LUA_MYLIBS) \
AR="$(TARGET_CROSS)ar rcu" \
- -C $(LUA_DIR)/src all
-
-$(LUA_DIR)/src/luac: $(LUA_DIR)/src/lua
-
-$(LUA_DIR)/src/liblua.a: $(LUA_DIR)/src/lua
-
-$(STAGING_DIR)/usr/lib/liblua.a: $(LUA_DIR)/src/liblua.a
- cp -dpf $(LUA_DIR)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
-
-$(STAGING_DIR)/usr/bin/lua: $(LUA_DIR)/src/lua
- cp -dpf $(LUA_DIR)/src/lua $(STAGING_DIR)/usr/bin/lua
-
-$(STAGING_DIR)/usr/bin/luac: $(LUA_DIR)/src/luac
- cp -dpf $(LUA_DIR)/src/luac $(STAGING_DIR)/usr/bin/luac
-
-$(TARGET_DIR)/usr/lib/liblua.a: $(STAGING_DIR)/usr/lib/liblua.a
- cp -dpf $(STAGING_DIR)/usr/lib/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
-
-$(TARGET_DIR)/usr/bin/lua: $(STAGING_DIR)/usr/bin/lua
- cp -dpf $(STAGING_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/lua
-
-$(TARGET_DIR)/usr/bin/luac: $(STAGING_DIR)/usr/bin/luac
- cp -dpf $(STAGING_DIR)/usr/bin/luac $(TARGET_DIR)/usr/bin/luac
-
-
-lua-bins: $(TARGET_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/luac
-
-lua-libs: $(if $(BR2_HAVE_DEVFILES),$(TARGET_DIR)/usr/lib/liblua.a)
-
-lua: readline ncurses lua-bins lua-libs
-
-lua-source: $(DL_DIR)/$(LUA_SOURCE)
-
-lua-clean:
- rm -f $(STAGING_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/luac
- rm -f $(STAGING_DIR)/usr/lib/liblua.a
- rm -f $(TARGET_DIR)/usr/bin/lua $(TARGET_DIR)/usr/bin/luac
- rm -f $(TARGET_DIR)/usr/lib/liblua.a
- -$(MAKE) -C $(LUA_DIR) clean
-
-lua-dirclean:
- rm -rf $(LUA_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LUA),y)
-TARGETS+=lua
+ -C $(@D)/src all
+endef
+
+define LUA_INSTALL_STAGING_CMDS
+ cat $(@D)/etc/lua.pc | sed -e s/\\/usr\\/local/\\/usr/ > $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
+ $(INSTALL) $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib
+ $(INSTALL) $(@D)/src/lua $(STAGING_DIR)/usr/bin
+ $(INSTALL) $(@D)/src/luac $(STAGING_DIR)/usr/bin
+ $(INSTALL) $(@D)/src/lua.h $(STAGING_DIR)/usr/include
+ $(INSTALL) $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include
+ $(INSTALL) $(@D)/src/lualib.h $(STAGING_DIR)/usr/include
+ $(INSTALL) $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include
+endef
+
+ifeq ($(BR2_HAVE_DEVFILES),y)
+define LUA_INSTALL_TARGET_HEADERS
+ install -D $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc $(TARGET_DIR)/usr/lib/pkgconfig/lua.pc
+ $(INSTALL) $(@D)/src/lua.h $(TARGET_DIR)/usr/include
+ $(INSTALL) $(@D)/src/luaconf.h $(TARGET_DIR)/usr/include
+ $(INSTALL) $(@D)/src/lualib.h $(TARGET_DIR)/usr/include
+ $(INSTALL) $(@D)/src/lauxlib.h $(TARGET_DIR)/usr/include
+endef
endif
+
+define LUA_INSTALL_TARGET_CMDS
+ $(INSTALL) $(@D)/src/lua $(STAGING_DIR)/usr/bin
+ $(INSTALL) $(@D)/src/luac $(STAGING_DIR)/usr/bin
+ $(INSTALL) -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
+ $(LUA_INSTALL_TARGET_HEADERS)
+endef
+
+LUA_INSTALLED_FILES = \
+ /usr/include/lua.h \
+ /usr/include/luaconf.h \
+ /usr/include/lualib.h \
+ /usr/include/lauxlib.h \
+ /usr/lib/pkgconfig/lua.pc \
+ /usr/bin/lua \
+ /usr/bin/luac \
+ /usr/lib/liblua.a
+
+define LUA_UNINSTALL_STAGING_CMDS
+ for i in $(LUA_INSTALLED_FILES); do \
+ rm -f $(STAGING_DIR)$$i; \
+ done
+endef
+
+define LUA_UNINSTALL_TARGET_CMDS
+ for i in $(LUA_INSTALLED_FILES); do \
+ rm -f $(TARGET_DIR)$$i; \
+ done
+endef
+
+define LUA_CLEAN_CMDS
+ -$(MAKE) $(@D) clean
+endef
+
+$(eval $(call GENTARGETS,package,lua))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 04/41] lua: conversion to new package infrastructure
2010-04-13 23:05 ` [Buildroot] [PATCH 04/41] lua: conversion to new package infrastructure llandwerlin at gmail.com
@ 2010-04-14 13:19 ` Thomas Petazzoni
2010-04-14 15:25 ` Thomas Petazzoni
0 siblings, 1 reply; 73+ messages in thread
From: Thomas Petazzoni @ 2010-04-14 13:19 UTC (permalink / raw)
To: buildroot
On Wed, 14 Apr 2010 01:05:37 +0200
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Also install development files to staging by default and to target if
> requested.
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
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] 73+ messages in thread
* [Buildroot] [PATCH 04/41] lua: conversion to new package infrastructure
2010-04-14 13:19 ` Thomas Petazzoni
@ 2010-04-14 15:25 ` Thomas Petazzoni
2010-04-14 17:24 ` Peter Korsgaard
0 siblings, 1 reply; 73+ messages in thread
From: Thomas Petazzoni @ 2010-04-14 15:25 UTC (permalink / raw)
To: buildroot
On Wed, 14 Apr 2010 15:19:57 +0200
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Actually, after discussing with Gustavo on IRC, I think we should first
merge Gustavo's work. It has been sitting in our Bugzilla for way too
long.
See
https://bugs.busybox.net/show_bug.cgi?id=803
https://bugs.busybox.net/show_bug.cgi?id=719
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] 73+ messages in thread
* [Buildroot] [PATCH 05/41] package: Add $(HOST_DIR)/usr/lib to LD_LIBRARY_PATH for host but not target
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (3 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 04/41] lua: conversion to new package infrastructure llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 13:26 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 06/41] Rework icu package on top of the generic infrastructure llandwerlin at gmail.com
` (35 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Some packages like icu requires to be compiled against the host system
first to be able to compile against the target. This is due to the
usage of self generated binaries by the package to build itself. When
the generated tools also depends on generated libraries it is required
to add the path to these libraries in the library path
(LD_LIBRARY_PATH) especially for the configure step.
Adding $(HOST_DIR)/usr/lib to LD_LIBRARY_PATH for target compilation
might break the link step by mixing host libraries and target
binaries.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/Makefile.in | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index 983caf3..66cf61d 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -205,21 +205,20 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
NM_FOR_TARGET="$(TARGET_NM)" \
DEFAULT_ASSEMBLER="$(TARGET_AS)" \
DEFAULT_LINKER="$(TARGET_LD)" \
+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
PERLLIB="$(HOST_DIR)/usr/lib/perl" \
- LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" \
STAGING_DIR="$(STAGING_DIR)"
TARGET_CONFIGURE_ENV=\
CFLAGS="$(TARGET_CFLAGS)" \
CXXFLAGS="$(TARGET_CXXFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
- FCFLAGS="$(TARGET_FCFLAGS)" \
+ FCFLAGS="$(TARGET_FCFLAGS)"
TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \
- LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
PERLLIB="$(HOST_DIR)/usr/lib/perl"
HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
@@ -257,9 +256,11 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
ORIGINAL_LD_FOR_TARGET="$(TARGET_LD)" \
ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \
- PERLLIB="$(HOST_DIR)/usr/lib/perl"
+ PERLLIB="$(HOST_DIR)/usr/lib/perl" \
+ LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"
HOST_MAKE_ENV=PATH=$(HOST_PATH) \
LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
@@ -267,7 +268,6 @@ HOST_MAKE_ENV=PATH=$(HOST_PATH) \
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \
PERLLIB="$(HOST_DIR)/usr/lib/perl"
-
#######################################################################
# settings we need to pass to configure
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 05/41] package: Add $(HOST_DIR)/usr/lib to LD_LIBRARY_PATH for host but not target
2010-04-13 23:05 ` [Buildroot] [PATCH 05/41] package: Add $(HOST_DIR)/usr/lib to LD_LIBRARY_PATH for host but not target llandwerlin at gmail.com
@ 2010-04-14 13:26 ` Thomas Petazzoni
0 siblings, 0 replies; 73+ messages in thread
From: Thomas Petazzoni @ 2010-04-14 13:26 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 14 Apr 2010 01:05:38 +0200
llandwerlin at gmail.com wrote:
> Adding $(HOST_DIR)/usr/lib to LD_LIBRARY_PATH for target compilation
> might break the link step by mixing host libraries and target
> binaries.
I'm sorry but I think that this doesn't work. When you are compiling
target packages, the build process might use host utilities installed
into $(HOST_DIR)/usr/bin, and these host utilities might in turn rely in
libraries installed into $(HOST_DIR)/usr/lib. So even when compiling
target things, $(HOST_DIR)/usr/lib must be in the PATH.
See
http://git.buildroot.net/buildroot/commit/?id=c1b6242fdcf2cff7ebf09fec4cc1be58963e8427
(Another solution might be to try compiling all host binaries with an
rpath set to $(HOST_DIR)/usr/lib, but that may be difficult with
some build systems).
> diff --git a/package/Makefile.in b/package/Makefile.in
> index 983caf3..66cf61d 100644
> --- a/package/Makefile.in
> +++ b/package/Makefile.in
> @@ -205,21 +205,20 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
> NM_FOR_TARGET="$(TARGET_NM)" \
> DEFAULT_ASSEMBLER="$(TARGET_AS)" \
> DEFAULT_LINKER="$(TARGET_LD)" \
> + PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
Why ?
> - LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" \
See above why we need it.
> TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \
> -
> LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
Same thing.
> PERLLIB="$(HOST_DIR)/usr/lib/perl"
> HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
> @@ -257,9 +256,11 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
> ORIGINAL_LD_FOR_TARGET="$(TARGET_LD)" \
> ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
> ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
> + PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
For the host this seems to make sense, but what problem does it fix ?
> +
> LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"
Ok.
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] 73+ messages in thread
* [Buildroot] [PATCH 06/41] Rework icu package on top of the generic infrastructure
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (4 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 05/41] package: Add $(HOST_DIR)/usr/lib to LD_LIBRARY_PATH for host but not target llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 15:18 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 07/41] external toolchain: fix strip of libraries llandwerlin at gmail.com
` (34 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This patch is based on a previous attempt by Thomas Petazzoni.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
...icu-4c-3_8_1-fix-compilation-with-gcc-4.4.patch | 77 +++
.../icu/icu-4c-3_8_1-fix-cross-compilation.patch | 383 +++++++++++
package/icu/icu-4c-3_8_1-lsupc++.patch | 24 +-
package/icu/icu-config | 684 ++++++++++++++++++++
package/icu/icu-cross-compile.patch | 314 ---------
package/icu/icu.mk | 112 ++--
6 files changed, 1215 insertions(+), 379 deletions(-)
create mode 100644 package/icu/icu-4c-3_8_1-fix-compilation-with-gcc-4.4.patch
create mode 100644 package/icu/icu-4c-3_8_1-fix-cross-compilation.patch
create mode 100755 package/icu/icu-config
delete mode 100644 package/icu/icu-cross-compile.patch
diff --git a/package/icu/icu-4c-3_8_1-fix-compilation-with-gcc-4.4.patch b/package/icu/icu-4c-3_8_1-fix-compilation-with-gcc-4.4.patch
new file mode 100644
index 0000000..8c88f1c
--- /dev/null
+++ b/package/icu/icu-4c-3_8_1-fix-compilation-with-gcc-4.4.patch
@@ -0,0 +1,77 @@
+From b515227d0ca1ca61e033645cd2a99e829574c31a Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin@gmail.com>
+Date: Tue, 5 Jan 2010 16:24:57 +0100
+Subject: [PATCH] icu: fix compilation with gcc 4.4
+
+Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
+---
+ source/layoutex/ParagraphLayout.cpp | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/source/layoutex/ParagraphLayout.cpp b/source/layoutex/ParagraphLayout.cpp
+index 5b07e54..62c794b 100644
+--- a/source/layoutex/ParagraphLayout.cpp
++++ b/source/layoutex/ParagraphLayout.cpp
+@@ -326,12 +326,12 @@ ParagraphLayout::ParagraphLayout(const LEUnicode chars[], le_int32 count,
+ le_int32 styleCount = sizeof styleRunArrays / sizeof styleRunArrays[0];
+ StyleRuns styleRuns(styleRunArrays, styleCount);
+ LEErrorCode layoutStatus = LE_NO_ERROR;
+-
++
+ fStyleRunCount = styleRuns.getRuns(NULL, NULL);
+
+ fStyleRunLimits = LE_NEW_ARRAY(le_int32, fStyleRunCount);
+ fStyleIndices = LE_NEW_ARRAY(le_int32, fStyleRunCount * styleCount);
+-
++
+ styleRuns.getRuns(fStyleRunLimits, fStyleIndices);
+
+ // now build a LayoutEngine for each style run...
+@@ -362,7 +362,7 @@ ParagraphLayout::ParagraphLayout(const LEUnicode chars[], le_int32 count,
+ }
+
+ // Make big arrays for the glyph widths, glyph-to-char and char-to-glyph maps,
+- // in logical order. (Both maps need an extra entry for the end of the text.)
++ // in logical order. (Both maps need an extra entry for the end of the text.)
+ //
+ // For each layout get the positions and convert them into glyph widths, in
+ // logical order. Get the glyph-to-char mapping, offset by starting index in the
+@@ -509,7 +509,7 @@ ParagraphLayout::~ParagraphLayout()
+ }
+ }
+
+-
++
+ le_bool ParagraphLayout::isComplex(const LEUnicode chars[], le_int32 count)
+ {
+ UErrorCode scriptStatus = U_ZERO_ERROR;
+@@ -813,7 +813,7 @@ le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)
+
+ return nullLanguageCode;
+ }
+-#elif
++#else
+
+ // TODO - dummy implementation for right now...
+ le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)
+@@ -943,7 +943,7 @@ void ParagraphLayout::appendRun(ParagraphLayout::Line *line, le_int32 run, le_in
+ // previous run, even though this glyph may be in the middle of the
+ // run.
+ fVisualRunLastX -= fStyleRunInfo[run].positions[leftGlyph * 2];
+-
++
+ // Make rightGlyph be the glyph just to the right of
+ // the run's glyphs
+ rightGlyph += 1;
+@@ -1057,7 +1057,7 @@ le_int32 ParagraphLayout::Line::getWidth() const
+
+ le_int32 glyphCount = lastRun->getGlyphCount();
+ const float *positions = lastRun->getPositions();
+-
++
+ return (le_int32) positions[glyphCount * 2];
+ }
+
+--
+1.6.5.7
+
diff --git a/package/icu/icu-4c-3_8_1-fix-cross-compilation.patch b/package/icu/icu-4c-3_8_1-fix-cross-compilation.patch
new file mode 100644
index 0000000..fcfd71b
--- /dev/null
+++ b/package/icu/icu-4c-3_8_1-fix-cross-compilation.patch
@@ -0,0 +1,383 @@
+From 8aefa9fc5d12d8b5e73439ff8a48b3baeeb60125 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin@gmail.com>
+Date: Tue, 26 Jan 2010 17:30:48 +0100
+Subject: [PATCH] Fix cross compilation
+
+Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
+---
+ source/config/Makefile.inc.in | 10 +++---
+ source/data/Makefile.in | 60 +++++++++++++++++-----------------
+ source/data/icupkg.inc.in | 6 ++--
+ source/extra/uconv/Makefile.in | 8 ++--
+ source/extra/uconv/pkgdata.inc.in | 6 ++--
+ source/test/testdata/Makefile.in | 20 ++++++------
+ source/test/testdata/pkgdata.inc.in | 4 +-
+ 7 files changed, 57 insertions(+), 57 deletions(-)
+
+diff --git a/source/config/Makefile.inc.in b/source/config/Makefile.inc.in
+index 02d2205..71618fe 100644
+--- a/source/config/Makefile.inc.in
++++ b/source/config/Makefile.inc.in
+@@ -135,11 +135,11 @@ MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR)
+ # Access to important ICU tools.
+ # Use as follows: $(INVOKE) $(GENRB) arguments ..
+ INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
+-GENCCODE = $(sbindir)/genccode
+-ICUPKG = $(sbindir)/icupkg
+-GENCMN = $(sbindir)/gencmn
+-GENRB = $(bindir)/genrb
+-PKGDATA = $(bindir)/pkgdata
++GENCCODE = $(BINDIR)-host/genccode
++ICUPKG = $(BINDIR)-host/icupkg
++GENCMN = $(BINDIR)-host/gencmn
++GENRB = $(BINDIR)-host/genrb
++PKGDATA = $(BINDIR)-host/pkgdata
+
+ ##################################################################
+ ##################################################################
+diff --git a/source/data/Makefile.in b/source/data/Makefile.in
+index 9abc94b..3395f52 100644
+--- a/source/data/Makefile.in
++++ b/source/data/Makefile.in
+@@ -36,7 +36,7 @@ ICUPKGDATA_OUTDIR = $(OUTDIR)
+ endif
+
+ CURDIR:=$(CURR_FULL_DIR)
+-PKGDATA = $(BINDIR)/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR) -M'PKGDATA_LDFLAGS="$(LDFLAGSICUDT)"'
++PKGDATA = $(BINDIR)-host/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR) -M'PKGDATA_LDFLAGS="$(LDFLAGSICUDT)"'
+
+ ifeq ($(OS390_STUBDATA),1)
+ OS390PKG=package390
+@@ -133,7 +133,7 @@ ICUDATA_ARCHIVE = $(firstword $(wildcard $(srcdir)/in/$(ICUDATA_BASENAME_VERSION
+ ifneq ($(ICUDATA_ARCHIVE),)
+ ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat
+ $(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR)
+- $(INVOKE) $(BINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
++ $(INVOKE) $(BINDIR)-host/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
+ endif
+ else
+ ifneq ($(ENABLE_STATIC),YES)
+@@ -349,7 +349,7 @@ $(PKGDATA_LIST): $(SRCLISTDEPS) $(ICUDATA_SOURCE_ARCHIVE)
+ ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
+ @echo "Unpacking $(ICUDATA_SOURCE_ARCHIVE) and generating $@ (list of data files)"
+ @-$(RMV) $@
+- $(INVOKE) $(BINDIR)/icupkg -d $(BUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) > $@
++ $(INVOKE) $(BINDIR)-host/icupkg -d $(BUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) > $@
+ else
+ @echo "$@" > $@
+ endif
+@@ -378,45 +378,45 @@ endif
+
+ # uprops.icu
+ $(BUILDDIR)/uprops.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/BidiMirroring.txt $(BINDIR)/genprops$(EXEEXT) $(BUILDDIR)/$(ICUDT)pnames.icu
+- $(INVOKE) $(BINDIR)/genprops -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
+- $(INVOKE) $(BINDIR)/genprops --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
++ $(INVOKE) $(BINDIR)-host/genprops -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
++ $(INVOKE) $(BINDIR)-host/genprops --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
+
+ # ubidi.icu
+ $(BUILDDIR)/ubidi.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)/genbidi$(EXEEXT)
+- $(INVOKE) $(BINDIR)/genbidi -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
+- $(INVOKE) $(BINDIR)/genbidi --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
++ $(INVOKE) $(BINDIR)-host/genbidi -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
++ $(INVOKE) $(BINDIR)-host/genbidi --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
+
+ # ucase.icu
+ $(BUILDDIR)/ucase.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)/gencase$(EXEEXT)
+- $(INVOKE) $(BINDIR)/gencase -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
+- $(INVOKE) $(BINDIR)/gencase --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
++ $(INVOKE) $(BINDIR)-host/gencase -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
++ $(INVOKE) $(BINDIR)-host/gencase --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
+
+ # pnames.icu
+ $(BUILDDIR)/pnames.icu: $(UNICODEDATADIR)/PropertyAliases.txt $(UNICODEDATADIR)/PropertyValueAliases.txt $(UNICODEDATADIR)/Blocks.txt $(COMINCDIR)/uscript.h $(COMINCDIR)/uchar.h $(BINDIR)/genpname$(EXEEXT)
+- $(INVOKE) $(BINDIR)/genpname -d $(BUILDDIR)
++ $(INVOKE) $(BINDIR)-host/genpname -d $(BUILDDIR)
+
+ # unorm.icu
+ $(BUILDDIR)/unorm.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/DerivedNormalizationProps.txt $(UNICODEDATADIR)/BidiMirroring.txt $(BINDIR)/gennorm$(EXEEXT) $(BUILDDIR)/$(ICUDT)pnames.icu $(BUILDDIR)/$(ICUDT)uprops.icu $(BUILDDIR)/$(ICUDT)ucase.icu
+- $(INVOKE) $(BINDIR)/gennorm -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
+- $(INVOKE) $(BINDIR)/gennorm --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
++ $(INVOKE) $(BINDIR)-host/gennorm -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
++ $(INVOKE) $(BINDIR)-host/gennorm --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
+
+ # ucadata.icu
+ # used to depend on $(BUILDDIR)/$(ICUDT)unorm.icu $(BUILDDIR)/$(ICUDT)ucase.icu
+ # see Jitterbug 4497
+ $(BUILDDIR)/ucadata.icu $(BUILDDIR)/$(ICUDT)invuca.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(BINDIR)/genuca$(EXEEXT)
+- $(INVOKE) $(BINDIR)/genuca -s $(UNICODEDATADIR) -d $(BUILDDIR) -i $(BUILDDIR)
++ $(INVOKE) $(BINDIR)-host/genuca -s $(UNICODEDATADIR) -d $(BUILDDIR) -i $(BUILDDIR)
+
+ # unames.icu
+ $(BUILDDIR)/unames.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)/gennames$(EXEEXT)
+- $(INVOKE) $(BINDIR)/gennames -1 -d $(BUILDDIR) $(UNICODEDATADIR)/UnicodeData.txt -u $(UNICODE_VERSION)
++ $(INVOKE) $(BINDIR)-host/gennames -1 -d $(BUILDDIR) $(UNICODEDATADIR)/UnicodeData.txt -u $(UNICODE_VERSION)
+
+ # cnvalias.icu
+ $(BUILDDIR)/cnvalias.icu: $(UCMSRCDIR)/convrtrs.txt $(BINDIR)/gencnval$(EXEEXT)
+- $(INVOKE) $(BINDIR)/gencnval -d $(BUILDDIR) $(UCMSRCDIR)/convrtrs.txt
++ $(INVOKE) $(BINDIR)-host/gencnval -d $(BUILDDIR) $(UCMSRCDIR)/convrtrs.txt
+
+ # uidna.spp
+ $(BUILDDIR)/uidna.spp: $(MISCSRCDIR)/NamePrepProfile.txt $(BINDIR)/gensprep$(EXEEXT) $(BUILDDIR)/unames.icu $(BUILDDIR)/pnames.icu
+- $(INVOKE) $(BINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(MISCSRCDIR) -b uidna -n $(UNICODEDATADIR) -u 3.2.0 -k NamePrepProfile.txt
++ $(INVOKE) $(BINDIR)-host/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(MISCSRCDIR) -b uidna -n $(UNICODEDATADIR) -u 3.2.0 -k NamePrepProfile.txt
+
+ #################################################### BRK
+ # BRK FILES
+@@ -425,28 +425,28 @@ $(BUILDDIR)/uidna.spp: $(MISCSRCDIR)/NamePrepProfile.txt $(BINDIR)/gensprep$(EXE
+ # $(RMV) $@ && ln -s $(BUILDDIR) $@
+
+ $(BRKBLDDIR)/%.brk: $(BRKSRCDIR)/%.txt $(BINDIR)/genbrk$(EXEEXT) $(DAT_FILES)
+- $(INVOKE) $(BINDIR)/genbrk -c -i $(BUILDDIR) -r $< -o $@
++ $(INVOKE) $(BINDIR)-host/genbrk -c -i $(BUILDDIR) -r $< -o $@
+
+ #################################################### CTD
+ # CTD FILES
+
+ $(BRKBLDDIR)/%.ctd: $(BRKSRCDIR)/%.txt $(BINDIR)/genctd$(EXEEXT) $(DAT_FILES)
+- $(INVOKE) $(BINDIR)/genctd -c -i $(BUILDDIR) -o $@ $<
++ $(INVOKE) $(BINDIR)-host/genctd -c -i $(BUILDDIR) -o $@ $<
+
+ #################################################### CNV
+ # CNV FILES
+ $(BUILDDIR)/%.cnv: $(UCMSRCDIR)/%.ucm $(BINDIR)/makeconv$(EXEEXT)
+- $(INVOKE) $(BINDIR)/makeconv -c -d $(BUILDDIR) $(UCMSRCDIR)/$(<F)
++ $(INVOKE) $(BINDIR)-host/makeconv -c -d $(BUILDDIR) $(UCMSRCDIR)/$(<F)
+
+ #################################################### RES
+ # RES FILES
+
+ ### collation res
+ $(COLBLDDIR)/%.res: $(COLSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT) $(DAT_FILES)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F)
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F)
+
+ $(COLBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(COLLATION_TREE)/$(INDEX_NAME).txt $(BINDIR)/genrb$(EXEEXT)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt
+
+ $(COLLATION_INDEX_FILE): $(SRCLISTDEPS)
+ @echo "generating $@ (list of installed collation locales)"; \
+@@ -462,10 +462,10 @@ $(COLLATION_INDEX_FILE): $(SRCLISTDEPS)
+
+ ### brk res
+ $(BRKBLDDIR)/%.res: $(BRKSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT) $(BRK_FILES) $(DAT_FILES)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
+
+ $(BRKBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(BREAK_TREE)/$(INDEX_NAME).txt $(BINDIR)/genrb$(EXEEXT)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(BREAK_TREE) -d $(BRKBLDDIR) $(INDEX_NAME).txt
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(BREAK_TREE) -d $(BRKBLDDIR) $(INDEX_NAME).txt
+
+ $(BRK_RES_INDEX_FILE): $(SRCLISTDEPS)
+ @echo "generating $@ (list of installed break locales)"; \
+@@ -481,10 +481,10 @@ $(BRK_RES_INDEX_FILE): $(SRCLISTDEPS)
+
+ ### RBNF res
+ $(RBNFBLDDIR)/%.res: $(RBNFSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT) $(DAT_FILES)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(RBNFSRCDIR) -d $(RBNFBLDDIR) $(<F)
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(RBNFSRCDIR) -d $(RBNFBLDDIR) $(<F)
+
+ $(RBNFBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(RBNF_TREE)/$(INDEX_NAME).txt $(BINDIR)/genrb$(EXEEXT)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(RBNF_TREE) -d $(RBNFBLDDIR) $(INDEX_NAME).txt
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(RBNF_TREE) -d $(RBNFBLDDIR) $(INDEX_NAME).txt
+
+ $(RBNF_INDEX_FILE): $(SRCLISTDEPS)
+ @echo "generating $@ (list of installed RBNF locales)"; \
+@@ -500,13 +500,13 @@ $(RBNF_INDEX_FILE): $(SRCLISTDEPS)
+
+ ### TRANSLIT res
+ $(TRANSLITBLDDIR)/%.res: $(TRANSLITSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT) $(DAT_FILES)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(TRANSLITSRCDIR) -d $(TRANSLITBLDDIR) $(<F)
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(TRANSLITSRCDIR) -d $(TRANSLITBLDDIR) $(<F)
+
+ ### normal (locale) res
+ all-RES: $(RES_FILES)
+
+ $(BUILDDIR)/%.res: $(LOCSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT) $(DAT_FILES)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(LOCSRCDIR) -d $(BUILDDIR) $(<F)
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(LOCSRCDIR) -d $(BUILDDIR) $(<F)
+
+ # if the tzcode directory contains a new tzdata*.tar.gz file, use it for zoneinfo.txt
+ TZDATA = $(firstword $(wildcard $(top_builddir)/tools/tzcode/tzdata*.tar.gz) $(wildcard $(top_srcdir)/tools/tzcode/tzdata*.tar.gz))
+@@ -520,7 +520,7 @@ ZONEINFO=$(TZCODE_DIR)/zoneinfo.txt
+ # icu/source/tools/tzcode/zoneinfo.txt
+ $(BUILDDIR)/zoneinfo.res: $(ZONEINFO) $(BINDIR)/genrb$(EXEEXT)
+ @echo Note: $(MISCSRCDIR)/zoneinfo.txt is IGNORED because $(TZDATA) is present.
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -d $(BUILDDIR) $(ZONEINFO)
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -d $(BUILDDIR) $(ZONEINFO)
+
+ # Create the tzcode tool and zoneinfo.txt as needed.
+ $(ZONEINFO): $(TZDATA)
+@@ -532,7 +532,7 @@ endif
+
+ # zoneinfo has some issues. Ignore some warnings with -q
+ $(BUILDDIR)/%.res: $(MISCSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -s $(MISCSRCDIR) -d $(BUILDDIR) $(<F)
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -s $(MISCSRCDIR) -d $(BUILDDIR) $(<F)
+
+
+
+@@ -553,7 +553,7 @@ clean-resindex:
+ -$(RMV) $(BUILDDIR)/$(INDEX_NAME).txt $(PKGDATA_LIST)
+
+ $(INDEX_RES_FILE): $(INDEX_FILE) $(BINDIR)/genrb$(EXEEXT)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -d $(BUILDDIR) $(INDEX_FILE)
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -d $(BUILDDIR) $(INDEX_FILE)
+
+ # Starting with ICU4C 3.4, the core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu, unorm.icu)
+ # are hardcoded in the common DLL and therefore not included in the data package any more.
+diff --git a/source/data/icupkg.inc.in b/source/data/icupkg.inc.in
+index c76790a..6a2aa70 100644
+--- a/source/data/icupkg.inc.in
++++ b/source/data/icupkg.inc.in
+@@ -49,8 +49,8 @@ U_IS_BIG_ENDIAN=@U_IS_BIG_ENDIAN@
+
+ ##### Add the following to source/config/Makefile.in
+
+-GENCCODE=$(BINDIR)/genccode
+-GENCMN=$(BINDIR)/gencmn
+-ICUPKG=$(BINDIR)/icupkg
++GENCCODE=$(BINDIR)-host/genccode
++GENCMN=$(BINDIR)-host/gencmn
++ICUPKG=$(BINDIR)-host/icupkg
+
+
+diff --git a/source/extra/uconv/Makefile.in b/source/extra/uconv/Makefile.in
+index de6ed18..65e0e42 100644
+--- a/source/extra/uconv/Makefile.in
++++ b/source/extra/uconv/Makefile.in
+@@ -106,7 +106,7 @@ clean-local: resclean
+ $(RMV) $(OBJECTS) $(TARGET)
+
+ resclean:
+- @#-$(INVOKE) $(BINDIR)/pkgdata --clean -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
++ @#-$(INVOKE) $(BINDIR)-host/pkgdata --clean -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
+ $(RMV) pkgdata.inc $(RESDIR)
+
+ distclean-local: clean-local
+@@ -138,7 +138,7 @@ endif
+
+
+ package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc
+- $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(BINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
++ $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(BINDIR)-host/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
+
+ $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
+ @$(MKINSTALLDIRS) $(RESDIR)
+@@ -151,7 +151,7 @@ $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
+ ifneq ($(UCONVMSG_MODE),static)
+ install-resfiles: $(RESFILES)
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUDATA_DIR)
+- $(INVOKE) $(BINDIR)/pkgdata -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -I $(INSTALLTO) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
++ $(INVOKE) $(BINDIR)-host/pkgdata -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -I $(INSTALLTO) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
+ else
+ install-resfiles:
+ endif
+@@ -161,7 +161,7 @@ $(UCONVMSG_LIB): resfiles
+
+ $(MSGNAME)/%.res: $(srcdir)/$(RESOURCESDIR)/%.txt
+ $(MKINSTALLDIRS) $(@D)
+- $(INVOKE) $(BINDIR)/genrb -e UTF-8 -s $(^D) -d $(@D) $(^F)
++ $(INVOKE) $(BINDIR)-host/genrb -e UTF-8 -s $(^D) -d $(@D) $(^F)
+
+ install-man: $(ALL_MAN_FILES)
+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
+diff --git a/source/extra/uconv/pkgdata.inc.in b/source/extra/uconv/pkgdata.inc.in
+index 8ce5c21..45765b7 100644
+--- a/source/extra/uconv/pkgdata.inc.in
++++ b/source/extra/uconv/pkgdata.inc.in
+@@ -55,8 +55,8 @@ platform=@platform@
+
+ ##### Add the following to source/config/Makefile.in
+
+-GENCCODE=$(BINDIR)/genccode
+-GENCMN=$(BINDIR)/gencmn
+-ICUPKG=$(BINDIR)/icupkg
++GENCCODE=$(BINDIR)-host/genccode
++GENCMN=$(BINDIR)-host/gencmn
++ICUPKG=$(BINDIR)-host/icupkg
+
+
+diff --git a/source/test/testdata/Makefile.in b/source/test/testdata/Makefile.in
+index 657c770..dcf1769 100644
+--- a/source/test/testdata/Makefile.in
++++ b/source/test/testdata/Makefile.in
+@@ -99,7 +99,7 @@ ICU_DATA_OPT = -i $(BUILDDIR)
+ endif
+ endif
+
+-PKGDATA = $(BINDIR)/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME)
++PKGDATA = $(BINDIR)-host/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME)
+ PKGDATA_INVOKE:=$(INVOKE) $(PKGDATA_INVOKE_OPTS)
+
+ # Contains all 'intermediate' files (and temp files) except for 'unpackaged data' below
+@@ -158,42 +158,42 @@ $(JAVA_OUT_DIR)/DebugUtilitiesData.java: $(TOOLDIR)/gentest/gentest$(EXEEXT)
+
+
+ $(TESTBUILDDIR)/testtable32.res: $(TESTBUILDDIR)/testtable32.txt $(BINDIR)/genrb$(EXEEXT)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -s $(TESTBUILDDIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) $(<F)
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -s $(TESTBUILDDIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) $(<F)
+
+ # Targets for nfscsi.spp
+ $(TESTBUILDDIR)/nfscsi.spp: $(BINDIR)/gensprep$(EXEEXT) $(TESTSRCDATADIR)/nfs4_cs_prep_ci.txt
+ @echo Building nfscsi.icu
+- $(INVOKE) $(BINDIR)/gensprep -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) -b nfscsi -u 3.2.0 nfs4_cs_prep_ci.txt
++ $(INVOKE) $(BINDIR)-host/gensprep -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) -b nfscsi -u 3.2.0 nfs4_cs_prep_ci.txt
+
+ # Targets for nfscss.spp
+ $(TESTBUILDDIR)/nfscss.spp: $(BINDIR)/gensprep$(EXEEXT) $(TESTSRCDATADIR)/nfs4_cs_prep_cs.txt
+ @echo Building nfscss.icu
+- $(INVOKE) $(BINDIR)/gensprep -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) -b nfscss -u 3.2.0 nfs4_cs_prep_cs.txt
++ $(INVOKE) $(BINDIR)-host/gensprep -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) -b nfscss -u 3.2.0 nfs4_cs_prep_cs.txt
+
+ # Targets for nfscis.spp
+ $(TESTBUILDDIR)/nfscis.spp: $(BINDIR)/gensprep$(EXEEXT) $(TESTSRCDATADIR)/nfs4_cis_prep.txt
+ @echo Building nfscis.spp
+- $(INVOKE) $(BINDIR)/gensprep -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) -b nfscis -k -n $(UNICODEDATADIR) -u 3.2.0 nfs4_cis_prep.txt
++ $(INVOKE) $(BINDIR)-host/gensprep -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) -b nfscis -k -n $(UNICODEDATADIR) -u 3.2.0 nfs4_cis_prep.txt
+
+ # Targets for nfsmxs.spp
+ $(TESTBUILDDIR)/nfsmxs.spp: $(BINDIR)/gensprep$(EXEEXT) $(TESTSRCDATADIR)/nfs4_mixed_prep_s.txt
+ @echo Building nfsmxs.spp
+- $(INVOKE) $(BINDIR)/gensprep -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) -b nfsmxs -k -n $(UNICODEDATADIR) -u 3.2.0 nfs4_mixed_prep_s.txt
++ $(INVOKE) $(BINDIR)-host/gensprep -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) -b nfsmxs -k -n $(UNICODEDATADIR) -u 3.2.0 nfs4_mixed_prep_s.txt
+
+ # Targets for nfsmxp.spp
+ $(TESTBUILDDIR)/nfsmxp.spp: $(BINDIR)/gensprep$(EXEEXT) $(TESTSRCDATADIR)/nfs4_mixed_prep_p.txt
+ @echo Building nfsmxp.spp
+- $(INVOKE) $(BINDIR)/gensprep -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) -b nfsmxp -k -n $(UNICODEDATADIR) -u 3.2.0 nfs4_mixed_prep_p.txt
++ $(INVOKE) $(BINDIR)-host/gensprep -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) -b nfsmxp -k -n $(UNICODEDATADIR) -u 3.2.0 nfs4_mixed_prep_p.txt
+
+ $(TESTBUILDDIR)/%.cnv: $(TESTSRCDATADIR)/%.ucm $(BINDIR)/makeconv$(EXEEXT)
+- $(INVOKE) $(BINDIR)/makeconv -c -d $(TESTBUILDDIR) $(TESTSRCDATADIR)/$(<F)
++ $(INVOKE) $(BINDIR)-host/makeconv -c -d $(TESTBUILDDIR) $(TESTSRCDATADIR)/$(<F)
+
+ $(TESTBUILDDIR)/%.res: $(TESTSRCDATADIR)/%.txt $(BINDIR)/genrb$(EXEEXT) $(DAT_FILES)
+- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -q -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) $(<F)
++ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -q -s $(TESTSRCDATADIR) $(ICU_DATA_OPT) -d $(TESTBUILDDIR) $(<F)
+
+ $(TESTBUILDDIR)/iscii.res: $(TESTSRCDATADIR)/iscii.bin $(BINDIR)/genrb$(EXEEXT)
+ @echo Testing genrb -e option
+- @ICU_DATA=$(BUILDDIR) $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -s $(TESTSRCDATADIR) -eISCII,version=0 -d $(TESTBUILDDIR) $(<F) >/dev/null || ( echo "WARNING: could not open ISCII - it may have been disabled." | tee $@ )
++ @ICU_DATA=$(BUILDDIR) $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -s $(TESTSRCDATADIR) -eISCII,version=0 -d $(TESTBUILDDIR) $(<F) >/dev/null || ( echo "WARNING: could not open ISCII - it may have been disabled." | tee $@ )
+ @echo Finished testing genrb -e option
+
+ ################################################################### TYP
+diff --git a/source/test/testdata/pkgdata.inc.in b/source/test/testdata/pkgdata.inc.in
+index 40cc60f..bac0834 100644
+--- a/source/test/testdata/pkgdata.inc.in
++++ b/source/test/testdata/pkgdata.inc.in
+@@ -15,6 +15,6 @@ include $(top_builddir)/icudefs.mk
+
+ ##### Add the following to source/config/Makefile.in
+
+-GENCCODE=$(BINDIR)/genccode
+-ICUPKG=$(BINDIR)/icupkg
++GENCCODE=$(BINDIR)-host/genccode
++ICUPKG=$(BINDIR)-host/icupkg
+
+--
+1.6.6
+
diff --git a/package/icu/icu-4c-3_8_1-lsupc++.patch b/package/icu/icu-4c-3_8_1-lsupc++.patch
index 891ddce..8f5d72b 100644
--- a/package/icu/icu-4c-3_8_1-lsupc++.patch
+++ b/package/icu/icu-4c-3_8_1-lsupc++.patch
@@ -1,5 +1,5 @@
---- source/tools/genccode/Makefile.in 2007-12-12 13:57:28.000000000 -0500
-+++ source/tools/genccode/Makefile.in 2008-02-07 14:37:56.000000000 -0500
+--- a/source/tools/genccode/Makefile.in 2007-12-12 13:57:28.000000000 -0500
++++ b/source/tools/genccode/Makefile.in 2008-02-07 14:37:56.000000000 -0500
@@ -31,7 +31,7 @@ ifneq ($(top_builddir),$(top_srcdir))
CPPFLAGS += -I$(top_builddir)/common
endif
@@ -9,8 +9,8 @@
OBJECTS = genccode.o
---- source/tools/gencmn/Makefile.in 2007-12-12 13:57:28.000000000 -0500
-+++ source/tools/gencmn/Makefile.in 2008-02-07 14:37:56.000000000 -0500
+--- a/source/tools/gencmn/Makefile.in 2007-12-12 13:57:28.000000000 -0500
++++ b/source/tools/gencmn/Makefile.in 2008-02-07 14:37:56.000000000 -0500
@@ -31,7 +31,7 @@ ifneq ($(top_builddir),$(top_srcdir))
CPPFLAGS += -I$(top_builddir)/common
endif
@@ -20,8 +20,8 @@
OBJECTS = gencmn.o
---- source/tools/genrb/Makefile.in 2007-12-12 13:57:28.000000000 -0500
-+++ source/tools/genrb/Makefile.in 2008-02-07 14:37:56.000000000 -0500
+--- a/source/tools/genrb/Makefile.in 2007-12-12 13:57:28.000000000 -0500
++++ b/source/tools/genrb/Makefile.in 2008-02-07 14:37:56.000000000 -0500
@@ -55,7 +55,7 @@ ifneq ($(top_builddir),$(top_srcdir))
CPPFLAGS += -I$(top_builddir)/common
endif
@@ -32,8 +32,8 @@
OBJECTS = errmsg.o genrb.o parse.o read.o reslist.o ustr.o rbutil.o \
wrtjava.o rle.o wrtxml.o prscmnts.o
---- source/tools/pkgdata/Makefile.in 2007-12-12 13:57:28.000000000 -0500
-+++ source/tools/pkgdata/Makefile.in 2008-02-07 14:37:56.000000000 -0500
+--- a/source/tools/pkgdata/Makefile.in 2007-12-12 13:57:28.000000000 -0500
++++ b/source/tools/pkgdata/Makefile.in 2008-02-07 14:37:56.000000000 -0500
@@ -35,7 +35,7 @@ CPPFLAGS += -I$(top_builddir)/common
endif
CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
@@ -43,8 +43,8 @@
OBJECTS = pkgdata.o pkgtypes.o make.o dllmode.o cmnmode.o filemode.o sttcmode.o winmode.o
---- source/samples/date/Makefile.in 2007-12-12 13:57:28.000000000 -0500
-+++ source/samples/date/Makefile.in 2008-02-07 14:37:56.000000000 -0500
+--- a/source/samples/date/Makefile.in 2007-12-12 13:57:28.000000000 -0500
++++ b/source/samples/date/Makefile.in 2008-02-07 14:37:56.000000000 -0500
@@ -21,7 +21,7 @@ CLEANFILES = *~ $(DEPS)
TARGET = icudate$(EXEEXT)
@@ -54,8 +54,8 @@
OBJECTS = uprint.o date.o
---- source/samples/cal/Makefile.in 2007-12-12 13:57:28.000000000 -0500
-+++ source/samples/cal/Makefile.in 2008-02-07 14:37:56.000000000 -0500
+--- a/source/samples/cal/Makefile.in 2007-12-12 13:57:28.000000000 -0500
++++ b/source/samples/cal/Makefile.in 2008-02-07 14:37:56.000000000 -0500
@@ -21,7 +21,7 @@ CLEANFILES = *~ $(DEPS)
TARGET = icucal$(EXEEXT)
diff --git a/package/icu/icu-config b/package/icu/icu-config
new file mode 100755
index 0000000..d6da4fc
--- /dev/null
+++ b/package/icu/icu-config
@@ -0,0 +1,684 @@
+#!/bin/sh
+## -*-sh-*-
+#set -x
+# BEGIN of icu-config-top
+#******************************************************************************
+# Copyright (C) 1999-2004, International Business Machines
+# Corporation and others. All Rights Reserved.
+#******************************************************************************
+# This script is designed to aid configuration of ICU.
+# rpath links a library search path right into the binaries.
+
+
+### END of icu-config-top
+
+## Zero out prefix.
+execprefix=
+prefix=
+
+
+loaddefs()
+{
+
+# Following from ./config/mh-linux
+## -*-makefile-*-
+#******************************************************************************
+# Copyright (C) 1999-2007, International Business Machines
+# Corporation and others. All Rights Reserved.
+#******************************************************************************
+# This Makefile.inc is designed to be included into projects which make use
+# of the ICU.
+
+# CONTENTS OF THIS FILE
+# 1). Base configuration information and linkage
+# 2). Variables giving access to ICU tools
+# 3). Host information
+# 4). Compiler flags and settings
+# 5). Data Packaging directives
+# 6). Include of platform make fragment (mh-* file)
+
+##################################################################
+#
+# *1* base configuration information and linkage
+#
+##################################################################
+# The PREFIX is the base of where ICU is installed.
+# Inside this directory you should find bin, lib, include/unicode,
+# etc. If ICU is not installed in this directory, you must change the
+# following line. There should exist ${prefix}/include/unicode/utypes.h
+# for example.
+default_prefix="/usr"
+if [ "x${prefix}" = "x" ]; then prefix="$default_prefix"; fi
+exec_prefix="${prefix}"
+libdir="${exec_prefix}/lib"
+libexecdir="${exec_prefix}/libexec"
+bindir="${exec_prefix}/bin"
+datadir="${prefix}/share"
+sbindir="${exec_prefix}/sbin"
+
+# about the ICU version
+VERSION="3.8.1"
+UNICODE_VERSION="5.0"
+
+# The prefix for ICU libraries, normally 'icu'
+ICUPREFIX="icu"
+PACKAGE="icu"
+LIBICU="lib${ICUPREFIX}"
+
+# Static library prefix and file extension
+STATIC_PREFIX="s"
+LIBSICU="lib${STATIC_PREFIX}${ICUPREFIX}"
+A="a"
+
+# Suffix at the end of libraries. Usually empty.
+ICULIBSUFFIX=""
+# ICULIBSUFFIX_VERSION is non-empty if it is to contain a library
+# version. For example, if it is 21, it means libraries are named
+# libicuuc21.so for example.
+
+# rpath links a library search path right into the binaries.
+## mh-files MUST NOT override RPATHLDFLAGS unless they provide
+## equivalent '#SH#' lines for icu-config fixup
+default_ENABLE_RPATH="NO"
+if [ "x${ENABLE_RPATH}" = "x" ]; then ENABLE_RPATH="$default_ENABLE_RPATH"; fi
+RPATHLDFLAGS="${LD_RPATH}${LD_RPATH_PRE}${libdir}"
+
+# icu-config version of above 'if':
+case "$ENABLE_RPATH" in
+[yY]*)
+ ENABLE_RPATH=YES
+ RPATHLDFLAGS="${LD_RPATH}${LD_RPATH_PRE}${libdir}"
+ ;;
+
+[nN]*)
+ ENABLE_RPATH=NO
+ RPATHLDFLAGS=""
+ ;;
+
+*)
+ echo $0: Unknown --enable-rpath value ${ENABLE_RPATH} 1>&2
+ exit 3
+ ;;
+esac
+
+# Name flexibility for the library naming scheme. Any modifications should
+# be made in the mh- file for the specific platform.
+DATA_STUBNAME="data"
+COMMON_STUBNAME="uc"
+I18N_STUBNAME="i18n"
+LAYOUT_STUBNAME="le"
+LAYOUTEX_STUBNAME="lx"
+IO_STUBNAME="io"
+TOOLUTIL_STUBNAME="tu"
+CTESTFW_STUBNAME="test"
+
+
+### To link your application with ICU:
+# 1. use LDFLAGS, CFLAGS, etc from above
+# 2. link with ${ICULIBS}
+# 3. optionally, add one or more of:
+# - ${ICULIBS_I18N} - i18n library, formatting, etc.
+# - ${ICULIBS_LAYOUT} - ICU layout library.
+# - ${ICULIBS_ICUIO} - ICU stdio equivalent library
+
+ICULIBS_COMMON="-l${ICUPREFIX}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+ICULIBS_DATA="-l${ICUPREFIX}${DATA_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+ICULIBS_I18N="-l${ICUPREFIX}${I18N_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+ICULIBS_TOOLUTIL="-l${ICUPREFIX}tu${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+ICULIBS_CTESTFW="-l${ICUPREFIX}ctestfw${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+ICULIBS_ICUIO="-l${ICUPREFIX}io${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+ICULIBS_OBSOLETE="-l${ICUPREFIX}obsolete${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+ICULIBS_LAYOUT="-l${ICUPREFIX}le${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+ICULIBS_LAYOUTEX="-l${ICUPREFIX}lx${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+ICULIBS_BASE="${LIBS}"
+
+# for icu-config to test with
+ICULIBS_COMMON_LIB_NAME="${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
+
+# ICULIBS is the set of libraries your application should link
+# with usually. Many applications will want to add ${ICULIBS_I18N} as well.
+ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
+
+##################################################################
+#
+# *2* access to ICU tools
+#
+##################################################################
+# Environment variable to set a runtime search path
+# (Overridden when necessary in -mh files)
+LDLIBRARYPATH_ENVVAR="LD_LIBRARY_PATH"
+
+# Versioned target for a shared library
+## FINAL_SO_TARGET = ${SO_TARGET}.${SO_TARGET_VERSION}
+## MIDDLE_SO_TARGET = ${SO_TARGET}.${SO_TARGET_VERSION_MAJOR}
+
+# Access to important ICU tools.
+# Use as follows: ${INVOKE} ${GENRB} arguments ..
+INVOKE="${LDLIBRARYPATH_ENVVAR}=${libdir}:$$${LDLIBRARYPATH_ENVVAR} ${LEAK_CHECKER}"
+GENCCODE="${sbindir}/genccode"
+ICUPKG="${sbindir}/icupkg"
+GENCMN="${sbindir}/gencmn"
+GENRB="${bindir}/genrb"
+PKGDATA="${bindir}/pkgdata"
+
+##################################################################
+#
+# *3* Information about the host
+#
+##################################################################
+
+# Information about the host that 'configure' was run on.
+host="i686-cm-linux-gnu"
+host_alias="i686-cm-linux"
+host_cpu="i686"
+host_vendor="cm"
+host_os="linux-gnu"
+# Our platform canonical name (as determined by configure)
+# this is a #define value (i.e. U_XXXX or XXXX)
+platform="U_LINUX"
+
+##################################################################
+#
+# *4* compiler flags and misc. options
+#
+##################################################################
+AR="/opt/IntelCE//bin/i686-cm-linux-ar"
+# initial tab keeps it out of the shell version.
+ARFLAGS=" ${ARFLAGS}"
+CC="/opt/IntelCE//bin/i686-cm-linux-gcc -Os -pipe -Os --sysroot /home/djdeath/src/buildroot/buildroot_rebase/output2/staging/"
+CFLAGS="-Os -pipe -Os --sysroot /home/djdeath/src/buildroot/buildroot_rebase/output2/staging/ ${THREADSCFLAGS} "
+CPP="/opt/IntelCE//bin/i686-cm-linux-cpp -Os -pipe -Os --sysroot /home/djdeath/src/buildroot/buildroot_rebase/output2/staging/"
+CPPFLAGS="--sysroot /home/djdeath/src/buildroot/buildroot_rebase/output2/staging/ ${THREADSCPPFLAGS} ${LIBCPPFLAGS}"
+CXX="/opt/IntelCE//bin/i686-cm-linux-g++ -Os -pipe -Os --sysroot /home/djdeath/src/buildroot/buildroot_rebase/output2/staging/"
+CXXFLAGS="-Os -pipe -Os --sysroot /home/djdeath/src/buildroot/buildroot_rebase/output2/staging/ ${THREADSCXXFLAGS} "
+DEFAULT_MODE="dll"
+DEFS="-DHAVE_CONFIG_H "
+FFLAGS="@FFLAGS@"
+# use a consistent INSTALL
+INSTALL="${SHELL} ${pkgdatadir}/install-sh -c"
+INSTALL_DATA="${INSTALL} -m 644"
+INSTALL_PROGRAM="${INSTALL}"
+INSTALL_SCRIPT="${INSTALL}"
+LDFLAGS="--sysroot /home/djdeath/src/buildroot/buildroot_rebase/output2/staging/ ${RPATHLDFLAGS}"
+LIBS="-lpthread -lm "
+LIB_M=""
+LIB_VERSION="38.1"
+LIB_VERSION_MAJOR="38"
+MKINSTALLDIRS="${SHELL} ${pkgdatadir}/mkinstalldirs"
+RANLIB="/opt/IntelCE//bin/i686-cm-linux-ranlib"
+RMV="rm -rf"
+SHELL="/bin/sh"
+SHLIB_c="${CC} ${DEFS} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -shared"
+SHLIB_cc="${CXX} ${DEFS} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -shared"
+U_IS_BIG_ENDIAN="0"
+includedir="${prefix}/include"
+infodir="/usr/info"
+localstatedir="${prefix}/var"
+mandir="/usr/man"
+oldincludedir="/usr/include"
+program_transform_name="s,x,x,"
+sharedstatedir="${prefix}/com"
+sysconfdir="${prefix}/etc"
+INSTALL_L="${INSTALL_DATA}"
+
+##################################################################
+#
+# *5* packaging options and directories
+#
+##################################################################
+
+pkgdatadir="${datadir}/${PACKAGE}${ICULIBSUFFIX}/${VERSION}"
+pkglibdir="${libdir}/${PACKAGE}${ICULIBSUFFIX}/${VERSION}"
+
+# The basename of the ICU data file (i.e. icudt21b )
+ICUDATA_CHAR="l"
+ICUDATA_NAME="icudt38l"
+
+# Defaults for pkgdata's mode and directories
+# The default data dir changes depending on what packaging mode
+# is being used
+if [ "x$PKGDATA_MODE" = "x" ];
+then
+PKGDATA_MODE="dll"
+fi
+
+case "$PKGDATA_MODE" in
+common)
+ICUDATA_DIR="${pkgdatadir}"
+ICUPKGDATA_DIR="${ICUDATA_DIR}"
+;;
+dll)
+ICUDATA_DIR="${pkgdatadir}"
+ICUPKGDATA_DIR="${libdir}"
+;;
+*)
+ICUDATA_DIR="${pkgdatadir}"
+ICUPKGDATA_DIR="${ICUDATA_DIR}"
+;;
+
+esac
+
+GENCCODE_ASSEMBLY="-a gcc"
+
+##################################################################
+#
+# *6* Inclusion of platform make fragment (mh-* file)
+#
+##################################################################
+# The mh- file ("make fragment") for the platform is included here.
+# It may override the above settings.
+# It is put last so that the mh-file can override anything.
+
+## -*-makefile-*-
+## Linux-specific setup
+## Copyright (c) 1999-2006, International Business Machines Corporation and
+## others. All Rights Reserved.
+
+## Commands to generate dependency files
+GEN_DEPS_c="${CC} -E -MM ${DEFS} ${CPPFLAGS}"
+GEN_DEPS_cc="${CXX} -E -MM ${DEFS} ${CPPFLAGS}"
+
+## Flags for position independent code
+SHAREDLIBCFLAGS="-fPIC"
+SHAREDLIBCXXFLAGS="-fPIC"
+SHAREDLIBCPPFLAGS="-DPIC"
+
+## Additional flags when building libraries and with threads
+THREADSCPPFLAGS="-D_REENTRANT"
+LIBCPPFLAGS=""
+
+## Compiler switch to embed a runtime search path
+LD_RPATH=""
+LD_RPATH_PRE="-Wl,-rpath,"
+
+## These are the library specific LDFLAGS
+LDFLAGSICUDT="-nodefaultlibs -nostdlib"
+
+## Compiler switch to embed a library name
+# The initial tab in the next line is to prevent icu-config from reading it.
+# We can't depend on MIDDLE_SO_TARGET being set.
+LD_SONAME=
+
+## Shared object suffix
+SO="so"
+## Non-shared intermediate object suffix
+STATIC_O="ao"
+
+## Compilation rules
+
+## Dependency rules
+
+## Versioned libraries rules
+
+## Bind internal references
+
+# LDflags that pkgdata will use
+BIR_LDFLAGS="-Wl,-Bsymbolic"
+
+# Dependencies [i.e. map files] for the final library
+BIR_DEPS=""
+
+## End Linux-specific setup
+
+## -*-sh-*-
+## BEGIN of icu-config-bottom.
+## Copyright (c) 2002-2007, International Business Machines Corporation and
+## others. All Rights Reserved.
+
+ICUUC_FILE=${libdir}/${ICULIBS_COMMON_LIB_NAME}
+
+# echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS}
+if [ "x$PKGDATA_MODE" = "x" ]; then
+ PKGDATA_MODE=dll
+fi
+
+}
+
+## The actual code of icu-config goes here.
+
+ME=`basename "$0"`
+
+allflags()
+{
+ echo " --bindir Print binary directory path (bin)"
+ echo " --cc Print C compiler used [CC]"
+ echo " --cflags Print C compiler flags [CFLAGS]"
+ echo " --cflags-dynamic Print additional C flags for"
+ echo " building shared libraries."
+ echo " --cppflags Print C Preprocessor flags [CPPFLAGS]"
+ echo " --cppflags-dynamic Print additional C Preprocessor flags for"
+ echo " building shared libraries."
+ echo " --cppflags-searchpath Print only -I include directives (-Iinclude)"
+ echo " --cxx Print C++ compiler used [CXX]"
+ echo " --cxxflags Print C++ compiler flags [CXXFLAGS]"
+ echo " --cxxflags-dynamic Print additional C++ flags for"
+ echo " building shared libraries."
+ echo " --detect-prefix Attempt to detect prefix based on PATH"
+ echo " --exec-prefix Print prefix for executables (/bin)"
+ echo " --exists Return with 0 status if ICU exists else fail"
+ echo " --help, -?, --usage Print this message"
+ echo " --icudata Print shortname of ICU data file (icudt21l)"
+ echo " --icudata-install-dir Print path to install data to - use as --install option to pkgdata(1)"
+ echo " --icudata-mode Print default ICU pkgdata mode (dll) - use as --mode option to pkgdata(1)."
+ echo " --icudatadir Print path to packaged archive data. Can set as [ICU_DATA]"
+ echo " --invoke Print commands to invoke an ICU program"
+ echo " --invoke=<prog> Print commands to invoke an ICU program named <prog> (ex: genrb)"
+ echo " --ldflags Print -L search path and -l libraries to link with ICU [LDFLAGS]. This is for the data, uc (common), and i18n libraries only. "
+ echo " --ldflags-layout Print ICU layout engine link directive. Use in addition to --ldflags"
+ echo " --ldflags-libsonly Same as --ldflags, but only the -l directives"
+ echo " --ldflags-searchpath Print only -L (search path) directive"
+ echo " --ldflags-system Print only system libs ICU links with (-lpthread, -lm)"
+ echo " --ldflags-icuio Print ICU icuio link directive. Use in addition to --ldflags "
+ echo " --ldflags-obsolete Print ICU obsolete link directive. Use in addition to --ldflags. (requires icuapps/obsolete to be built and installed.) "
+ echo " --mandir Print manpage (man) path"
+ echo " --prefix Print PREFIX to icu install (/usr/local)"
+ echo " --prefix=XXX Set prefix to XXX for remainder of command"
+ echo " --sbindir Print system binary path (sbin) "
+ echo " --shared-datadir Print shared data (share) path. This is NOT the ICU data dir."
+ echo " --shlib-c Print the command to compile and build C shared libraries with ICU"
+ echo " --shlib-cc Print the command to compile and build C++ shared libraries with ICU"
+ echo " --sysconfdir Print system config (etc) path"
+ echo " --unicode-version Print version of Unicode data used in ICU ($UNICODE_VERSION)"
+ echo " --version Print ICU version ($VERSION)"
+ echo " --incfile Print path to Makefile.inc (for -O option of pkgdata)"
+ echo " --install Print path to install-sh"
+ echo " --mkinstalldirs Print path to mkinstalldirs"
+}
+
+## Print the normal usage message
+shortusage()
+{
+ echo "usage: ${ME} " `allflags | cut -c-25 | sed -e 's%.*%[ & ]%'`
+}
+
+
+usage()
+{
+ echo "${ME}: icu-config: ICU configuration helper script"
+ echo
+ echo "The most commonly used options will be --cflags, --cxxflags, --cppflags, and --ldflags."
+ echo 'Example (in make): CPFLAGS=$(shell icu-config --cppflags)'
+ echo ' LDFLAGS=$(shell icu-config --ldflags)'
+ echo " (etc).."
+ echo
+ echo "Usage:"
+ allflags
+
+ echo
+ echo " [Brackets] show MAKE variable equivalents, (parenthesis) show example output"
+ echo
+ echo "Copyright (c) 2002, International Business Machines Corporation and others. All Rights Reserved."
+}
+
+## Check the sanity of current variables
+sanity()
+{
+ if [ ! -f ${ICUUC_FILE} ];
+ then
+ echo "### $ME: Can't find ${ICUUC_FILE} - ICU prefix is wrong." 1>&2
+ echo "### Try the --prefix= or --exec-prefix= options " 1>&2
+ echo "### or --detect-prefix"
+ echo "### $ME: Exitting." 1>&2
+ exit 2
+ fi
+}
+
+## Main starts here.
+
+if [ $# -lt 1 ]; then
+ shortusage
+ exit 1
+fi
+
+
+# Load our variables from autoconf
+# ALWAYS load twice because of dependencies
+loaddefs
+loaddefs
+sanity
+
+while [ $# -gt 0 ];
+do
+ arg="$1"
+ var=`echo $arg | sed -e 's/^[^=]*=//'`
+# echo "### processing $arg" 1>&2
+ case "$arg" in
+
+ # undocumented.
+ --debug)
+ set -x
+ ;;
+
+ --so)
+ echo $SO
+ ;;
+
+ --bindir)
+ echo $bindir
+ ;;
+
+ --libdir)
+ echo $libdir
+ ;;
+
+ --exists)
+ sanity
+ ;;
+
+ --sbindir)
+ echo $sbindir
+ ;;
+
+ --mkinstalldirs)
+ echo ${MKINSTALLDIRS}
+ ;;
+
+ --install)
+ echo ${INSTALL}
+ ;;
+
+ --invoke=*)
+ QUOT="\""
+ CMD="${var}"
+
+ # If it's not a locally executable command (1st choice) then
+ # search for it in the ICU directories.
+ if [ ! -x ${CMD} ]; then
+ if [ -x ${bindir}/${var} ]; then
+ CMD="${bindir}/${var}"
+ fi
+ if [ -x ${sbindir}/${var} ]; then
+ CMD="${sbindir}/${var}"
+ fi
+ fi
+
+ echo "env ${QUOT}${LDLIBRARYPATH_ENVVAR}=${libdir}:"'${'"${LDLIBRARYPATH_ENVVAR}"'}'${QUOT} ${CMD}
+ ;;
+
+ --invoke)
+ QUOT="\""
+ echo "env ${QUOT}${LDLIBRARYPATH_ENVVAR}=${libdir}:"'${'"${LDLIBRARYPATH_ENVVAR}"'}'${QUOT}
+ ;;
+
+ --cflags)
+ echo $CFLAGS
+ ;;
+
+ --cc)
+ echo $CC
+ ;;
+
+ --cxx)
+ echo $CXX
+ ;;
+
+ --cxxflags)
+ echo $CXXFLAGS
+ ;;
+
+ --cppflags)
+ # Don't echo the -I. - it's unneeded.
+ echo $CPPFLAGS | sed -e 's/-I. //'
+ ;;
+
+ --cppflags-searchpath)
+ echo -I${prefix}/include
+ ;;
+
+ --cppflags-dynamic)
+ echo $SHAREDLIBCPPFLAGS
+ ;;
+
+ --cxxflags-dynamic)
+ echo $SHAREDLIBCXXFLAGS
+ ;;
+
+ --cflags-dynamic)
+ echo $SHAREDLIBCFLAGS
+ ;;
+
+ --ldflags-system)
+ echo $LIBS
+ ;;
+
+ --ldflags)
+ echo $LDFLAGS $ICULIBS $LIBS
+# $RPATH_LDFLAGS
+ ;;
+
+ --ldflags-libsonly)
+ echo $ICULIBS_I18N $ICULIBS_COMMON $ICULIBS_DATA
+ ;;
+
+ --ldflags-icuio)
+ echo $ICULIBS_ICUIO
+ ;;
+
+ --ldflags-obsolete)
+ echo $ICULIBS_OBSOLETE
+ ;;
+
+ --ldflags-toolutil)
+ echo $ICULIBS_TOOLUTIL
+ ;;
+
+ --ldflags-layout)
+ echo $ICULIBS_LAYOUT $ICULIBS_LAYOUTEX
+ ;;
+
+ --ldflags-searchpath)
+ echo -L${libdir}
+ ;;
+
+ --detect-prefix)
+ HERE=`echo $0 | sed -e "s/$ME//g"`
+ if [ -f $HERE/../lib/${ICULIBS_COMMON_LIB_NAME} ]; then
+ prefix=$HERE/..
+ echo "## Using --prefix=${prefix}" 1>&2
+ fi
+ loaddefs
+ loaddefs
+ sanity
+ ;;
+
+ --exec-prefix)
+ echo $exec_prefix
+ ;;
+
+ --prefix)
+ echo $prefix
+ ;;
+
+ --prefix=*)
+ prefix=$var
+ loaddefs
+ loaddefs
+ sanity
+ ;;
+
+ --sysconfdir)
+ echo $sysconfdir
+ ;;
+
+ --mandir)
+ echo $mandir
+ ;;
+
+ --shared-datadir)
+ echo $datadir
+ ;;
+
+ --incfile)
+ echo $pkglibdir/Makefile.inc
+ ;;
+
+ --icudata)
+ echo $ICUDATA_NAME
+ ;;
+
+ --icudata-mode)
+ echo $PKGDATA_MODE
+ ;;
+
+ --icudata-install-dir)
+ echo $ICUPKGDATA_DIR
+ ;;
+
+ --icudatadir)
+ echo $ICUDATA_DIR
+ ;;
+
+ --shlib-c)
+ echo $SHLIB_c
+ ;;
+
+ --shlib-cc)
+ echo $SHLIB_cc
+ ;;
+
+ --version)
+ echo $VERSION
+ ;;
+
+ --unicode-version)
+ echo $UNICODE_VERSION
+ ;;
+
+ --help)
+ usage
+ exit 0
+ ;;
+
+ --usage)
+ usage
+ exit 0
+ ;;
+
+# --enable-rpath=*)
+# ENABLE_RPATH=$var
+# loaddefs
+# ;;
+
+ -?)
+ usage
+ exit 0
+ ;;
+
+ *)
+ echo ${ME}: ERROR Unknown Option $arg 1>&2
+ echo 1>&2
+ shortusage 1>&2
+ echo "### $ME: Exitting." 1>&2
+ exit 1;
+ ;;
+ esac
+ shift
+done
+
+# Check once before we quit (will check last used prefix)
+sanity
+## END of icu-config-bottom
+
+exit 0
+
+# Rebuilt on mercredi 25 novembre 2009, 12:31:58 (UTC+0100)
diff --git a/package/icu/icu-cross-compile.patch b/package/icu/icu-cross-compile.patch
deleted file mode 100644
index a12c589..0000000
--- a/package/icu/icu-cross-compile.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-diff -rup icu/source/data/icupkg.inc.in icu/source/data/icupkg.inc.in
---- source/data/icupkg.inc.in 2007-12-12 13:58:04.000000000 -0500
-+++ source/data/icupkg.inc.in 2008-02-03 12:35:09.000000000 -0500
-@@ -49,8 +49,8 @@ U_IS_BIG_ENDIAN=@U_IS_BIG_ENDIAN@
-
- ##### Add the following to source/config/Makefile.in
-
--GENCCODE=$(BINDIR)/genccode
--GENCMN=$(BINDIR)/gencmn
--ICUPKG=$(BINDIR)/icupkg
-+GENCCODE=$(BINDIR)-host/genccode
-+GENCMN=$(BINDIR)-host/gencmn
-+ICUPKG=$(BINDIR)-host/icupkg
-
-
-diff -rup icu/source/data/Makefile.in icu/source/data/Makefile.in
---- source/data/Makefile.in 2007-12-12 13:58:04.000000000 -0500
-+++ source/data/Makefile.in 2008-02-03 12:35:49.000000000 -0500
-@@ -36,7 +36,7 @@ ICUPKGDATA_OUTDIR = $(OUTDIR)
- endif
-
- CURDIR:=$(CURR_FULL_DIR)
--PKGDATA = $(BINDIR)/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR) -M'PKGDATA_LDFLAGS="$(LDFLAGSICUDT)"'
-+PKGDATA = $(BINDIR)-host/pkgdata $(PKGDATA_OPTS) -q -c -s $(CURDIR)/out/build/$(ICUDATA_PLATFORM_NAME) -d $(ICUPKGDATA_OUTDIR) -M'PKGDATA_LDFLAGS="$(LDFLAGSICUDT)"'
-
- ifeq ($(OS390_STUBDATA),1)
- OS390PKG=package390
-@@ -133,7 +133,7 @@ ICUDATA_ARCHIVE = $(firstword $(wildcard
- ifneq ($(ICUDATA_ARCHIVE),)
- ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat
- $(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR)
-- $(INVOKE) $(BINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
-+ $(INVOKE) $(BINDIR)-host/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
- endif
- else
- ifneq ($(ENABLE_STATIC),YES)
-@@ -349,7 +349,7 @@ $(PKGDATA_LIST): $(SRCLISTDEPS) $(ICUDAT
- ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
- @echo "Unpacking $(ICUDATA_SOURCE_ARCHIVE) and generating $@ (list of data files)"
- @-$(RMV) $@
-- $(INVOKE) $(BINDIR)/icupkg -d $(BUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) > $@
-+ $(INVOKE) $(BINDIR)-host/icupkg -d $(BUILDDIR) --list -x \* $(ICUDATA_SOURCE_ARCHIVE) > $@
- else
- @echo "$@" > $@
- endif
-@@ -377,46 +377,46 @@ endif
- # DAT FILES
-
- # uprops.icu
--$(BUILDDIR)/uprops.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/BidiMirroring.txt $(BINDIR)/genprops$(EXEEXT) $(BUILDDIR)/$(ICUDT)pnames.icu
-- $(INVOKE) $(BINDIR)/genprops -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
-- $(INVOKE) $(BINDIR)/genprops --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
-+$(BUILDDIR)/uprops.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/BidiMirroring.txt $(BINDIR)-host/genprops$(EXEEXT) $(BUILDDIR)/$(ICUDT)pnames.icu
-+ $(INVOKE) $(BINDIR)-host/genprops -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
-+ $(INVOKE) $(BINDIR)-host/genprops --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
-
- # ubidi.icu
--$(BUILDDIR)/ubidi.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)/genbidi$(EXEEXT)
-- $(INVOKE) $(BINDIR)/genbidi -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
-- $(INVOKE) $(BINDIR)/genbidi --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
-+$(BUILDDIR)/ubidi.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)-host/genbidi$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/genbidi -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
-+ $(INVOKE) $(BINDIR)-host/genbidi --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
-
- # ucase.icu
--$(BUILDDIR)/ucase.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)/gencase$(EXEEXT)
-- $(INVOKE) $(BINDIR)/gencase -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
-- $(INVOKE) $(BINDIR)/gencase --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
-+$(BUILDDIR)/ucase.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)-host/gencase$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/gencase -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
-+ $(INVOKE) $(BINDIR)-host/gencase --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
-
- # pnames.icu
--$(BUILDDIR)/pnames.icu: $(UNICODEDATADIR)/PropertyAliases.txt $(UNICODEDATADIR)/PropertyValueAliases.txt $(UNICODEDATADIR)/Blocks.txt $(COMINCDIR)/uscript.h $(COMINCDIR)/uchar.h $(BINDIR)/genpname$(EXEEXT)
-- $(INVOKE) $(BINDIR)/genpname -d $(BUILDDIR)
-+$(BUILDDIR)/pnames.icu: $(UNICODEDATADIR)/PropertyAliases.txt $(UNICODEDATADIR)/PropertyValueAliases.txt $(UNICODEDATADIR)/Blocks.txt $(COMINCDIR)/uscript.h $(COMINCDIR)/uchar.h $(BINDIR)-host/genpname$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/genpname -d $(BUILDDIR)
-
- # unorm.icu
--$(BUILDDIR)/unorm.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/DerivedNormalizationProps.txt $(UNICODEDATADIR)/BidiMirroring.txt $(BINDIR)/gennorm$(EXEEXT) $(BUILDDIR)/$(ICUDT)pnames.icu $(BUILDDIR)/$(ICUDT)uprops.icu $(BUILDDIR)/$(ICUDT)ucase.icu
-- $(INVOKE) $(BINDIR)/gennorm -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
-- $(INVOKE) $(BINDIR)/gennorm --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
-+$(BUILDDIR)/unorm.icu: $(UNICODEDATADIR)/UnicodeData.txt $(UNICODEDATADIR)/DerivedNormalizationProps.txt $(UNICODEDATADIR)/BidiMirroring.txt $(BINDIR)-host/gennorm$(EXEEXT) $(BUILDDIR)/$(ICUDT)pnames.icu $(BUILDDIR)/$(ICUDT)uprops.icu $(BUILDDIR)/$(ICUDT)ucase.icu
-+ $(INVOKE) $(BINDIR)-host/gennorm -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(BUILDDIR) -u $(UNICODE_VERSION)
-+ $(INVOKE) $(BINDIR)-host/gennorm --csource -s $(UNICODEDATADIR) -i $(BUILDDIR) -d $(OUTTMPDIR) -u $(UNICODE_VERSION)
-
- # ucadata.icu
- # used to depend on $(BUILDDIR)/$(ICUDT)unorm.icu $(BUILDDIR)/$(ICUDT)ucase.icu
- # see Jitterbug 4497
--$(BUILDDIR)/ucadata.icu $(BUILDDIR)/$(ICUDT)invuca.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(BINDIR)/genuca$(EXEEXT)
-- $(INVOKE) $(BINDIR)/genuca -s $(UNICODEDATADIR) -d $(BUILDDIR) -i $(BUILDDIR)
-+$(BUILDDIR)/ucadata.icu $(BUILDDIR)/$(ICUDT)invuca.icu: $(UNICODEDATADIR)/FractionalUCA.txt $(BINDIR)-host/genuca$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/genuca -s $(UNICODEDATADIR) -d $(BUILDDIR) -i $(BUILDDIR)
-
- # unames.icu
--$(BUILDDIR)/unames.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)/gennames$(EXEEXT)
-- $(INVOKE) $(BINDIR)/gennames -1 -d $(BUILDDIR) $(UNICODEDATADIR)/UnicodeData.txt -u $(UNICODE_VERSION)
-+$(BUILDDIR)/unames.icu: $(UNICODEDATADIR)/UnicodeData.txt $(BINDIR)-host/gennames$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/gennames -1 -d $(BUILDDIR) $(UNICODEDATADIR)/UnicodeData.txt -u $(UNICODE_VERSION)
-
- # cnvalias.icu
--$(BUILDDIR)/cnvalias.icu: $(UCMSRCDIR)/convrtrs.txt $(BINDIR)/gencnval$(EXEEXT)
-- $(INVOKE) $(BINDIR)/gencnval -d $(BUILDDIR) $(UCMSRCDIR)/convrtrs.txt
-+$(BUILDDIR)/cnvalias.icu: $(UCMSRCDIR)/convrtrs.txt $(BINDIR)-host/gencnval$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/gencnval -d $(BUILDDIR) $(UCMSRCDIR)/convrtrs.txt
-
- # uidna.spp
--$(BUILDDIR)/uidna.spp: $(MISCSRCDIR)/NamePrepProfile.txt $(BINDIR)/gensprep$(EXEEXT) $(BUILDDIR)/unames.icu $(BUILDDIR)/pnames.icu
-- $(INVOKE) $(BINDIR)/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(MISCSRCDIR) -b uidna -n $(UNICODEDATADIR) -u 3.2.0 -k NamePrepProfile.txt
-+$(BUILDDIR)/uidna.spp: $(MISCSRCDIR)/NamePrepProfile.txt $(BINDIR)-host/gensprep$(EXEEXT) $(BUILDDIR)/unames.icu $(BUILDDIR)/pnames.icu
-+ $(INVOKE) $(BINDIR)-host/gensprep -d $(BUILDDIR) -i $(BUILDDIR) -s $(MISCSRCDIR) -b uidna -n $(UNICODEDATADIR) -u 3.2.0 -k NamePrepProfile.txt
-
- #################################################### BRK
- # BRK FILES
-@@ -424,29 +424,29 @@ $(BUILDDIR)/uidna.spp: $(MISCSRCDIR)/Nam
- #thaidict.brk: $(SRCDATADIR)/thaidict.brk
- # $(RMV) $@ && ln -s $(BUILDDIR) $@
-
--$(BRKBLDDIR)/%.brk: $(BRKSRCDIR)/%.txt $(BINDIR)/genbrk$(EXEEXT) $(DAT_FILES)
-- $(INVOKE) $(BINDIR)/genbrk -c -i $(BUILDDIR) -r $< -o $@
-+$(BRKBLDDIR)/%.brk: $(BRKSRCDIR)/%.txt $(BINDIR)-host/genbrk$(EXEEXT) $(DAT_FILES)
-+ $(INVOKE) $(BINDIR)-host/genbrk -c -i $(BUILDDIR) -r $< -o $@
-
- #################################################### CTD
- # CTD FILES
-
--$(BRKBLDDIR)/%.ctd: $(BRKSRCDIR)/%.txt $(BINDIR)/genctd$(EXEEXT) $(DAT_FILES)
-- $(INVOKE) $(BINDIR)/genctd -c -i $(BUILDDIR) -o $@ $<
-+$(BRKBLDDIR)/%.ctd: $(BRKSRCDIR)/%.txt $(BINDIR)-host/genctd$(EXEEXT) $(DAT_FILES)
-+ $(INVOKE) $(BINDIR)-host/genctd -c -i $(BUILDDIR) -o $@ $<
-
- #################################################### CNV
- # CNV FILES
--$(BUILDDIR)/%.cnv: $(UCMSRCDIR)/%.ucm $(BINDIR)/makeconv$(EXEEXT)
-- $(INVOKE) $(BINDIR)/makeconv -c -d $(BUILDDIR) $(UCMSRCDIR)/$(<F)
-+$(BUILDDIR)/%.cnv: $(UCMSRCDIR)/%.ucm $(BINDIR)-host/makeconv$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/makeconv -c -d $(BUILDDIR) $(UCMSRCDIR)/$(<F)
-
- #################################################### RES
- # RES FILES
-
- ### collation res
--$(COLBLDDIR)/%.res: $(COLSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT) $(DAT_FILES)
-- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F)
-+$(COLBLDDIR)/%.res: $(COLSRCDIR)/%.txt $(BINDIR)-host/genrb$(EXEEXT) $(DAT_FILES)
-+ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(COLSRCDIR) -d $(COLBLDDIR) $(<F)
-
--$(COLBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(COLLATION_TREE)/$(INDEX_NAME).txt $(BINDIR)/genrb$(EXEEXT)
-- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt
-+$(COLBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(COLLATION_TREE)/$(INDEX_NAME).txt $(BINDIR)-host/genrb$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(COLLATION_TREE) -d $(COLBLDDIR) $(INDEX_NAME).txt
-
- $(COLLATION_INDEX_FILE): $(SRCLISTDEPS)
- @echo "generating $@ (list of installed collation locales)"; \
-@@ -461,11 +461,11 @@ $(COLLATION_INDEX_FILE): $(SRCLISTDEPS)
- echo "}" >> $@;
-
- ### brk res
--$(BRKBLDDIR)/%.res: $(BRKSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT) $(BRK_FILES) $(DAT_FILES)
-- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
-+$(BRKBLDDIR)/%.res: $(BRKSRCDIR)/%.txt $(BINDIR)-host/genrb$(EXEEXT) $(BRK_FILES) $(DAT_FILES)
-+ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(BRKSRCDIR) -d $(BRKBLDDIR) $(<F)
-
--$(BRKBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(BREAK_TREE)/$(INDEX_NAME).txt $(BINDIR)/genrb$(EXEEXT)
-- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(BREAK_TREE) -d $(BRKBLDDIR) $(INDEX_NAME).txt
-+$(BRKBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(BREAK_TREE)/$(INDEX_NAME).txt $(BINDIR)-host/genrb$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(BREAK_TREE) -d $(BRKBLDDIR) $(INDEX_NAME).txt
-
- $(BRK_RES_INDEX_FILE): $(SRCLISTDEPS)
- @echo "generating $@ (list of installed break locales)"; \
-@@ -480,11 +480,11 @@ $(BRK_RES_INDEX_FILE): $(SRCLISTDEPS)
- echo "}" >> $@;
-
- ### RBNF res
--$(RBNFBLDDIR)/%.res: $(RBNFSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT) $(DAT_FILES)
-- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(RBNFSRCDIR) -d $(RBNFBLDDIR) $(<F)
-+$(RBNFBLDDIR)/%.res: $(RBNFSRCDIR)/%.txt $(BINDIR)-host/genrb$(EXEEXT) $(DAT_FILES)
-+ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(RBNFSRCDIR) -d $(RBNFBLDDIR) $(<F)
-
--$(RBNFBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(RBNF_TREE)/$(INDEX_NAME).txt $(BINDIR)/genrb$(EXEEXT)
-- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(RBNF_TREE) -d $(RBNFBLDDIR) $(INDEX_NAME).txt
-+$(RBNFBLDDIR)/$(INDEX_NAME).res: $(OUTTMPDIR)/$(RBNF_TREE)/$(INDEX_NAME).txt $(BINDIR)-host/genrb$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(OUTTMPDIR)/$(RBNF_TREE) -d $(RBNFBLDDIR) $(INDEX_NAME).txt
-
- $(RBNF_INDEX_FILE): $(SRCLISTDEPS)
- @echo "generating $@ (list of installed RBNF locales)"; \
-@@ -499,14 +499,14 @@ $(RBNF_INDEX_FILE): $(SRCLISTDEPS)
- echo "}" >> $@;
-
- ### TRANSLIT res
--$(TRANSLITBLDDIR)/%.res: $(TRANSLITSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT) $(DAT_FILES)
-- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(TRANSLITSRCDIR) -d $(TRANSLITBLDDIR) $(<F)
-+$(TRANSLITBLDDIR)/%.res: $(TRANSLITSRCDIR)/%.txt $(BINDIR)-host/genrb$(EXEEXT) $(DAT_FILES)
-+ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(TRANSLITSRCDIR) -d $(TRANSLITBLDDIR) $(<F)
-
- ### normal (locale) res
- all-RES: $(RES_FILES)
-
--$(BUILDDIR)/%.res: $(LOCSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT) $(DAT_FILES)
-- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(LOCSRCDIR) -d $(BUILDDIR) $(<F)
-+$(BUILDDIR)/%.res: $(LOCSRCDIR)/%.txt $(BINDIR)-host/genrb$(EXEEXT) $(DAT_FILES)
-+ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -s $(LOCSRCDIR) -d $(BUILDDIR) $(<F)
-
- # if the tzcode directory contains a new tzdata*.tar.gz file, use it for zoneinfo.txt
- TZDATA = $(firstword $(wildcard $(top_builddir)/tools/tzcode/tzdata*.tar.gz) $(wildcard $(top_srcdir)/tools/tzcode/tzdata*.tar.gz))
-@@ -518,9 +518,9 @@ ZONEINFO=$(TZCODE_DIR)/zoneinfo.txt
-
- # Override the normal genrb for zoneinfo.txt to always pull from
- # icu/source/tools/tzcode/zoneinfo.txt
--$(BUILDDIR)/zoneinfo.res: $(ZONEINFO) $(BINDIR)/genrb$(EXEEXT)
-+$(BUILDDIR)/zoneinfo.res: $(ZONEINFO) $(BINDIR)-host/genrb$(EXEEXT)
- @echo Note: $(MISCSRCDIR)/zoneinfo.txt is IGNORED because $(TZDATA) is present.
-- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -d $(BUILDDIR) $(ZONEINFO)
-+ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -d $(BUILDDIR) $(ZONEINFO)
-
- # Create the tzcode tool and zoneinfo.txt as needed.
- $(ZONEINFO): $(TZDATA)
-@@ -531,8 +531,8 @@ $(ZONEINFO): $(TZDATA)
- endif
-
- # zoneinfo has some issues. Ignore some warnings with -q
--$(BUILDDIR)/%.res: $(MISCSRCDIR)/%.txt $(BINDIR)/genrb$(EXEEXT)
-- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -s $(MISCSRCDIR) -d $(BUILDDIR) $(<F)
-+$(BUILDDIR)/%.res: $(MISCSRCDIR)/%.txt $(BINDIR)-host/genrb$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -q -i $(BUILDDIR) -s $(MISCSRCDIR) -d $(BUILDDIR) $(<F)
-
-
-
-@@ -552,8 +552,8 @@ $(INDEX_FILE): $(SRCLISTDEPS)
- clean-resindex:
- -$(RMV) $(BUILDDIR)/$(INDEX_NAME).txt $(PKGDATA_LIST)
-
--$(INDEX_RES_FILE): $(INDEX_FILE) $(BINDIR)/genrb$(EXEEXT)
-- $(INVOKE) $(BINDIR)/genrb $(GENRBOPTS) -i $(BUILDDIR) -d $(BUILDDIR) $(INDEX_FILE)
-+$(INDEX_RES_FILE): $(INDEX_FILE) $(BINDIR)-host/genrb$(EXEEXT)
-+ $(INVOKE) $(BINDIR)-host/genrb $(GENRBOPTS) -i $(BUILDDIR) -d $(BUILDDIR) $(INDEX_FILE)
-
- # Starting with ICU4C 3.4, the core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu, unorm.icu)
- # are hardcoded in the common DLL and therefore not included in the data package any more.
-diff -rup icu/source/extra/uconv/Makefile.in icu/source/extra/uconv/Makefile.in
---- source/extra/uconv/Makefile.in 2007-12-12 13:57:20.000000000 -0500
-+++ source/extra/uconv/Makefile.in 2008-02-03 12:36:48.000000000 -0500
-@@ -40,7 +40,7 @@ ALL_MAN_FILES = $(TARGET_STUB_NAME).$(SE
- CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES)
-
- ## Target information
--TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
-+TARGET = $(BINDIR)-host/$(TARGET_STUB_NAME)$(EXEEXT)
-
- CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
- LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
-@@ -106,7 +106,7 @@ clean-local: resclean
- $(RMV) $(OBJECTS) $(TARGET)
-
- resclean:
-- @#-$(INVOKE) $(BINDIR)/pkgdata --clean -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
-+ @#-$(INVOKE) $(BINDIR)-host/pkgdata --clean -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
- $(RMV) pkgdata.inc $(RESDIR)
-
- distclean-local: clean-local
-@@ -138,7 +138,7 @@ endif
-
-
- package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc
-- $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(BINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
-+ $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(BINDIR)-host/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
-
- $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
- @$(MKINSTALLDIRS) $(RESDIR)
-@@ -151,7 +151,7 @@ $(RESDIR)/$(RESDIR).lst: Makefile $(srcd
- ifneq ($(UCONVMSG_MODE),static)
- install-resfiles: $(RESFILES)
- $(MKINSTALLDIRS) $(DESTDIR)$(ICUDATA_DIR)
-- $(INVOKE) $(BINDIR)/pkgdata -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -I $(INSTALLTO) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
-+ $(INVOKE) $(BINDIR)-host/pkgdata -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -I $(INSTALLTO) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
- else
- install-resfiles:
- endif
-@@ -161,7 +161,7 @@ $(UCONVMSG_LIB): resfiles
-
- $(MSGNAME)/%.res: $(srcdir)/$(RESOURCESDIR)/%.txt
- $(MKINSTALLDIRS) $(@D)
-- $(INVOKE) $(BINDIR)/genrb -e UTF-8 -s $(^D) -d $(@D) $(^F)
-+ $(INVOKE) $(BINDIR)-host/genrb -e UTF-8 -s $(^D) -d $(@D) $(^F)
-
- install-man: $(ALL_MAN_FILES)
- $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
-diff -rup icu/source/extra/uconv/pkgdata.inc.in icu/source/extra/uconv/pkgdata.inc.in
---- source/extra/uconv/pkgdata.inc.in 2007-12-12 13:57:20.000000000 -0500
-+++ source/extra/uconv/pkgdata.inc.in 2008-02-03 12:37:13.000000000 -0500
-@@ -55,8 +55,8 @@ platform=@platform@
-
- ##### Add the following to source/config/Makefile.in
-
--GENCCODE=$(BINDIR)/genccode
--GENCMN=$(BINDIR)/gencmn
--ICUPKG=$(BINDIR)/icupkg
-+GENCCODE=$(BINDIR)-host/genccode
-+GENCMN=$(BINDIR)-host/gencmn
-+ICUPKG=$(BINDIR)-host/icupkg
-
-
-diff -rup icu/source/icudefs.mk.in icu/source/icudefs.mk.in
---- source/icudefs.mk.in 2007-12-12 13:58:06.000000000 -0500
-+++ source/icudefs.mk.in 2008-02-03 12:37:47.000000000 -0500
-@@ -226,7 +226,7 @@ LIBICUTOOLUTIL= -L$(LIBDIR) -l$(STATIC_P
- LIBICUIO= -L$(LIBDIR) -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
-
- # Invoke, set library path for all ICU libraries.
--INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)$(LIBDIR):$(top_builddir)/stubdata:$(top_builddir)/tools/ctestfw:$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
-+INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)$(LIBDIR)-host:$(top_builddir)/stubdata:$(top_builddir)/tools/ctestfw:$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
-
- # Platform-specific setup
- include @platform_make_fragment@
diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index 589c31f..2d188fa 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -1,3 +1,4 @@
+
#############################################################
#
# ICU International Components for Unicode
@@ -7,70 +8,75 @@
ICU_VERSION:=4c-3_8_1
ICU_SOURCE:=icu$(ICU_VERSION)-src.tgz
ICU_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/icu
-ICU_CAT:=$(ZCAT)
-ICU_DIR:=$(BUILD_DIR)/icu/source
-ICU_HOST_DIR:=$(BUILD_DIR)/icu-host/source
-
-$(DL_DIR)/$(ICU_SOURCE):
- $(call DOWNLOAD,$(ICU_SITE),$(ICU_SOURCE))
+ICU_DEPENDENCIES:=host-icu
+ICU_SUBDIR:=source
+ICU_INSTALL_STAGING = YES
-icu-source: $(DL_DIR)/$(ICU_SOURCE)
+ICU_BINARIES = \
+ derb \
+ genbidi \
+ genbrk \
+ gencase \
+ genccode \
+ gencmn \
+ gencnval \
+ genctd \
+ gennames \
+ gennorm \
+ genpname \
+ genprops \
+ genrb \
+ gensprep \
+ genuca \
+ icupkg \
+ icuswap \
+ makeconv \
+ pkgdata \
+ uconv
-$(ICU_DIR)/.unpacked: $(DL_DIR)/$(ICU_SOURCE)
- $(ICU_CAT) $(DL_DIR)/$(ICU_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(CONFIG_UPDATE) $(ICU_DIR)
- cp -a $(BUILD_DIR)/icu $(BUILD_DIR)/icu-host
- toolchain/patch-kernel.sh $(ICU_DIR) package/icu/ \*.patch
- touch $(ICU_DIR)/.unpacked
+define HOST_ICU_CONFIGURE_CMDS
+ (cd $(@D)/$(ICU_SUBDIR); \
+ $(HOST_CONFIGURE_OPTS) \
+ $(HOST_CONFIGURE_ARGS) \
+ $(HOST_CONFIGURE_ENV) \
+ ./configure $(QUIET) --prefix=/usr)
+ ln -sf $(@D)/$(ICU_SUBDIR)/bin $(@D)/$(ICU_SUBDIR)/bin-host
+endef
-$(ICU_HOST_DIR)/.configured: $(ICU_DIR)/.unpacked
- (cd $(ICU_HOST_DIR); ./configure $(QUIET) \
- --prefix=/usr;);
- touch $(ICU_HOST_DIR)/.configured
+define HOST_ICU_INSTALL_CMDS
+ make -C $(@D)/$(ICU_SUBDIR) DESTDIR=$(HOST_DIR) install
+ mkdir -p $(HOST_DIR)/usr/sbin
+ cp -f $(addprefix $(@D)/$(ICU_SUBDIR)/bin/,$(ICU_BINARIES)) $(HOST_DIR)/usr/sbin/
+endef
-$(ICU_DIR)/.configured: $(ICU_HOST_DIR)/.configured
- (cd $(ICU_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- CXX=$(TARGET_CXX) \
- ./configure $(QUIET) \
+define ICU_CONFIGURE_CMDS
+ (cd $(@D)/$(ICU_SUBDIR); \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ $(TARGET_CONFIGURE_ENV) \
+ ./configure $(QUIET) \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--mandir=/usr/man \
--infodir=/usr/info \
- --enable-samples \
- );
- touch $(ICU_DIR)/.configured
-
-$(ICU_HOST_DIR)/.done: $(ICU_DIR)/.configured
- $(MAKE) -C $(ICU_HOST_DIR)
- ln -s -f $(ICU_HOST_DIR)/bin $(ICU_DIR)/bin-host
- ln -s -f $(ICU_HOST_DIR)/lib $(ICU_DIR)/lib-host
- touch $(ICU_HOST_DIR)/.done
-
-$(ICU_DIR)/.done: $(ICU_HOST_DIR)/.done
- $(MAKE) -C $(ICU_DIR)
- $(MAKE) -C $(ICU_DIR) install DESTDIR=$(STAGING_DIR)
- $(MAKE) -C $(ICU_DIR) install DESTDIR=$(TARGET_DIR)
- $(SED) "s,^default_prefix=.*,default_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/icu-config
- touch $(ICU_DIR)/.done
+ --enable-samples)
+ ln -sf $(HOST_DIR)/usr/sbin $(@D)/$(ICU_SUBDIR)/bin-host
+endef
-icu: $(ICU_DIR)/.done
+define ICU_BUILD_CMDS
+ $(TARGET_MAKE_ENV) make -C $(@D)/$(ICU_SUBDIR)
+endef
-icu-clean:
- rm -f $(TARGET_DIR)/bin/icu
- -$(MAKE) -C $(ICU_DIR) clean
+define ICU_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) make -C $(@D)/$(ICU_SUBDIR) DESTDIR=$(TARGET_DIR) install
+endef
-icu-dirclean:
- rm -rf $(ICU_DIR)
+define ICU_INSTALL_STAGING_CMDS
+ $(TARGET_MAKE_ENV) make -C $(@D)/$(ICU_SUBDIR) DESTDIR=$(STAGING_DIR) install
+ $(SED) "s,^default_prefix=.*,default_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/icu-config
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_ICU),y)
-TARGETS+=icu
-endif
+$(eval $(call GENTARGETS,package,icu,host))
+$(eval $(call GENTARGETS,package,icu))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 06/41] Rework icu package on top of the generic infrastructure
2010-04-13 23:05 ` [Buildroot] [PATCH 06/41] Rework icu package on top of the generic infrastructure llandwerlin at gmail.com
@ 2010-04-14 15:18 ` Thomas Petazzoni
0 siblings, 0 replies; 73+ messages in thread
From: Thomas Petazzoni @ 2010-04-14 15:18 UTC (permalink / raw)
To: buildroot
On Wed, 14 Apr 2010 01:05:39 +0200
llandwerlin at gmail.com wrote:
> diff --git a/package/icu/icu-4c-3_8_1-fix-compilation-with-gcc-4.4.patch b/package/icu/icu-4c-3_8_1-fix-compilation-with-gcc-4.4.patch
> new file mode 100644
> index 0000000..8c88f1c
> --- /dev/null
> +++ b/package/icu/icu-4c-3_8_1-fix-compilation-with-gcc-4.4.patch
This patch contains a lot of whitespace changes that are not necessary.
If I understand correctly, the patch should just be a one-liner
s/#elif/#else/, shouldn't it ?
> ++GENCCODE = $(BINDIR)-host/genccode
> ++ICUPKG = $(BINDIR)-host/icupkg
> ++GENCMN = $(BINDIR)-host/gencmn
> ++GENRB = $(BINDIR)-host/genrb
> ++PKGDATA = $(BINDIR)-host/pkgdata
I'm not really a fan of all this. Since you introduce a host-icu
package in icu.mk, why not just use the host icu binaries installed in
$(HOST_DIR)/usr/bin ?
> diff --git a/package/icu/icu-config b/package/icu/icu-config
> new file mode 100755
> index 0000000..d6da4fc
Why do we need this ?
> +define HOST_ICU_CONFIGURE_CMDS
> + (cd $(@D)/$(ICU_SUBDIR); \
> + $(HOST_CONFIGURE_OPTS) \
> + $(HOST_CONFIGURE_ARGS) \
> + $(HOST_CONFIGURE_ENV) \
> + ./configure $(QUIET) --prefix=/usr)
If icu is an autotools-based package, why not using the AUTOTARGETS
infrastructure ? Of maybe it has a configure script, but it is not a
properly autotools-based one ?
> + ln -sf $(@D)/$(ICU_SUBDIR)/bin $(@D)/$(ICU_SUBDIR)/bin-host
If we install binaries in $(HOST_DIR) as suggested above, can't we get
rid of this ?
> +define HOST_ICU_INSTALL_CMDS
> + make -C $(@D)/$(ICU_SUBDIR) DESTDIR=$(HOST_DIR) install
> + mkdir -p $(HOST_DIR)/usr/sbin
> + cp -f $(addprefix $(@D)/$(ICU_SUBDIR)/bin/,$(ICU_BINARIES)) $(HOST_DIR)/usr/sbin/
> +endef
make install doesn't install the binaries ?
In the mean time, I think these changes still improve the situation, so:
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
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] 73+ messages in thread
* [Buildroot] [PATCH 07/41] external toolchain: fix strip of libraries
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (5 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 06/41] Rework icu package on top of the generic infrastructure llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 13:41 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 08/41] ext-toolchain: remove pkgconfig files from the external toolchain llandwerlin at gmail.com
` (33 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
toolchain/external-toolchain/ext-tool.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk
index 4493281..235e68c 100644
--- a/toolchain/external-toolchain/ext-tool.mk
+++ b/toolchain/external-toolchain/ext-tool.mk
@@ -56,9 +56,9 @@ copy_toolchain_lib_root = \
elif test -f $${LIB_DIR}/$${LIB}; then \
$(INSTALL) -D -m0755 $${LIB_DIR}/$${LIB} $(TARGET_DIR)$${DST}/$${LIB}; \
case "$${STRIP}" in \
- (0 | n | no) \
-;; \
(*) \
+;; \
+ (y) \
$(TARGET_CROSS)strip "$(TARGET_DIR)$${DST}/$${LIB}"; \
;; \
esac; \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 07/41] external toolchain: fix strip of libraries
2010-04-13 23:05 ` [Buildroot] [PATCH 07/41] external toolchain: fix strip of libraries llandwerlin at gmail.com
@ 2010-04-14 13:41 ` Thomas Petazzoni
0 siblings, 0 replies; 73+ messages in thread
From: Thomas Petazzoni @ 2010-04-14 13:41 UTC (permalink / raw)
To: buildroot
On Wed, 14 Apr 2010 01:05:40 +0200
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
But Peter, please, do not merge this patch directly, I'll carry it into
my codesourcery-external-toolchain branch, because it will conflict
with changes made in this branch.
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] 73+ messages in thread
* [Buildroot] [PATCH 08/41] ext-toolchain: remove pkgconfig files from the external toolchain
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (6 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 07/41] external toolchain: fix strip of libraries llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 13:42 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 09/41] scripts: force copy of files to erase already present and readonly files llandwerlin at gmail.com
` (32 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
toolchain/external-toolchain/ext-tool.mk | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk
index 235e68c..0b6af52 100644
--- a/toolchain/external-toolchain/ext-tool.mk
+++ b/toolchain/external-toolchain/ext-tool.mk
@@ -80,7 +80,8 @@ copy_toolchain_lib_root = \
copy_toolchain_sysroot = \
SYSROOT_DIR="$(strip $1)"; \
cp -a $${SYSROOT_DIR}/* $(STAGING_DIR)/ ; \
- find $(STAGING_DIR) -type d | xargs chmod 755
+ find $(STAGING_DIR) -type d | xargs chmod 755; \
+ rm -rf $(STAGING_DIR)/usr/lib/pkgconfig
#
# Check the availability of a particular glibc feature. We assume that
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 08/41] ext-toolchain: remove pkgconfig files from the external toolchain
2010-04-13 23:05 ` [Buildroot] [PATCH 08/41] ext-toolchain: remove pkgconfig files from the external toolchain llandwerlin at gmail.com
@ 2010-04-14 13:42 ` Thomas Petazzoni
0 siblings, 0 replies; 73+ messages in thread
From: Thomas Petazzoni @ 2010-04-14 13:42 UTC (permalink / raw)
To: buildroot
On Wed, 14 Apr 2010 01:05:41 +0200
llandwerlin at gmail.com wrote:
> --- a/toolchain/external-toolchain/ext-tool.mk
> +++ b/toolchain/external-toolchain/ext-tool.mk
> @@ -80,7 +80,8 @@ copy_toolchain_lib_root = \
> copy_toolchain_sysroot = \
> SYSROOT_DIR="$(strip $1)"; \
> cp -a $${SYSROOT_DIR}/* $(STAGING_DIR)/ ; \
> - find $(STAGING_DIR) -type d | xargs chmod 755
> + find $(STAGING_DIR) -type d | xargs chmod 755; \
> + rm -rf $(STAGING_DIR)/usr/lib/pkgconfig
Just curious, which toolchain has pkgconfig files in its sysroot dir ?
If it has pkgconfig files in its sysroot dir, doesn't it also have
other libraries than the C library in /usr/lib ?
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] 73+ messages in thread
* [Buildroot] [PATCH 09/41] scripts: force copy of files to erase already present and readonly files
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (7 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 08/41] ext-toolchain: remove pkgconfig files from the external toolchain llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 10/41] package: added PKG_CONF_ENV variables to host packages llandwerlin at gmail.com
` (31 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
scripts/copy.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/copy.sh b/scripts/copy.sh
index 410606d..508ed56 100755
--- a/scripts/copy.sh
+++ b/scripts/copy.sh
@@ -5,7 +5,7 @@ TARGET_DIR=$2
echo "Copying development files to target..."
-cp -a ${STAGING_DIR}/usr/include ${TARGET_DIR}/usr
+cp -af ${STAGING_DIR}/usr/include ${TARGET_DIR}/usr
for LIBSDIR in /lib /usr/lib; do
for WILDCARD in *.a *.la; do
@@ -13,7 +13,7 @@ for LIBSDIR in /lib /usr/lib; do
STAGING_STRIPPED=${FILE_PATH##${STAGING_DIR}}
EXTENDED_DIR=${STAGING_STRIPPED%/${WILDCARD}}
mkdir -p ${TARGET_DIR}${EXTENDED_DIR}
- cp ${FILE_PATH} ${TARGET_DIR}${STAGING_STRIPPED}
+ cp -fa ${FILE_PATH} ${TARGET_DIR}${STAGING_STRIPPED}
#echo ${TARGET_DIR}${STAGING_STRIPPED}
done
done
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 10/41] package: added PKG_CONF_ENV variables to host packages
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (8 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 09/41] scripts: force copy of files to erase already present and readonly files llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 11/41] sysstat: drop target installation option (it's on by default) llandwerlin at gmail.com
` (30 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/Makefile.autotools.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 38e57cd..b7a7103 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -108,6 +108,7 @@ define $(2)_CONFIGURE_CMDS
$$(HOST_CONFIGURE_OPTS) \
CFLAGS="$$(HOST_CFLAGS)" \
LDFLAGS="$$(HOST_LDFLAGS)" \
+ $$($$(PKG)_CONF_ENV) \
./configure \
--prefix="$$(HOST_DIR)/usr" \
--sysconfdir="$$(HOST_DIR)/etc" \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 11/41] sysstat: drop target installation option (it's on by default)
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (9 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 10/41] package: added PKG_CONF_ENV variables to host packages llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 13:59 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 12/41] directfb: bump to 1.4.3 llandwerlin at gmail.com
` (29 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/sysstat/sysstat.mk | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 324580e..2b220d6 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -10,7 +10,6 @@ SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard/
SYSSTAT_AUTORECONF = NO
SYSSTAT_LIBTOOL_PATCH = NO
SYSSTAT_INSTALL_STAGING = NO
-SYSSTAT_INSTALL_TARGET = YES
# Should be --disable-man-group, it might be a little mistake in the
# configure.in script.
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 11/41] sysstat: drop target installation option (it's on by default)
2010-04-13 23:05 ` [Buildroot] [PATCH 11/41] sysstat: drop target installation option (it's on by default) llandwerlin at gmail.com
@ 2010-04-14 13:59 ` Thomas Petazzoni
0 siblings, 0 replies; 73+ messages in thread
From: Thomas Petazzoni @ 2010-04-14 13:59 UTC (permalink / raw)
To: buildroot
On Wed, 14 Apr 2010 01:05:44 +0200
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
> ---
> package/sysstat/sysstat.mk | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
> index 324580e..2b220d6 100644
> --- a/package/sysstat/sysstat.mk
> +++ b/package/sysstat/sysstat.mk
> @@ -10,7 +10,6 @@ SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard/
> SYSSTAT_AUTORECONF = NO
> SYSSTAT_LIBTOOL_PATCH = NO
> SYSSTAT_INSTALL_STAGING = NO
> -SYSSTAT_INSTALL_TARGET = YES
>
> # Should be --disable-man-group, it might be a little mistake in the
> # configure.in script.
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Note that the SYSSTAT_INSTALL_STAGING and SYSSTAT_AUTORECONF could be
dropped as well.
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] 73+ messages in thread
* [Buildroot] [PATCH 12/41] directfb: bump to 1.4.3
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (10 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 11/41] sysstat: drop target installation option (it's on by default) llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 13/41] package: added lirc llandwerlin at gmail.com
` (28 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
...rectfb-gfxcard-fix-build-error-with-debug.patch | 33 --------------------
package/directfb/directfb.mk | 2 +-
2 files changed, 1 insertions(+), 34 deletions(-)
delete mode 100644 package/directfb/directfb-gfxcard-fix-build-error-with-debug.patch
diff --git a/package/directfb/directfb-gfxcard-fix-build-error-with-debug.patch b/package/directfb/directfb-gfxcard-fix-build-error-with-debug.patch
deleted file mode 100644
index 2c1d459..0000000
--- a/package/directfb/directfb-gfxcard-fix-build-error-with-debug.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fab69ff2e063f0b6a4b13139f100ff01aa4cae84 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Fri, 2 Oct 2009 12:20:31 +0200
-Subject: [PATCH] gfxcard: fix build error with --enable-debug
-
-Commit fdc611ea (Added support for colors and multiple layers in a
-glyph implementing outlines) changed dfb_gfxcard_drawglyph() to take
-a layers argument instead of index, but the D_DEBUG_AT call wasn't
-changed to match.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/core/gfxcard.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/gfxcard.c b/src/core/gfxcard.c
-index 127e30e..0020103 100644
---- a/src/core/gfxcard.c
-+++ b/src/core/gfxcard.c
-@@ -2335,8 +2335,8 @@ void dfb_gfxcard_drawglyph( CoreGlyphData **glyph, int x, int y,
- DFBSurfaceBlendFunction orig_srcblend;
- DFBSurfaceBlendFunction orig_dstblend;
-
-- D_DEBUG_AT( Core_GraphicsOps, "%s( %u, %d,%d, %p, %p )\n",
-- __FUNCTION__, index, x, y, font, state );
-+ D_DEBUG_AT( Core_GraphicsOps, "%s( %d,%d, %u, %p, %p )\n",
-+ __FUNCTION__, x, y, layers, font, state );
-
- D_ASSERT( card != NULL );
- D_ASSERT( card->shared != NULL );
---
-1.6.3.3
-
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index a4ee3bc..2f095ee 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -4,7 +4,7 @@
#
#############################################################
DIRECTFB_VERSION_MAJOR:=1.4
-DIRECTFB_VERSION:=1.4.2
+DIRECTFB_VERSION:=1.4.3
DIRECTFB_SITE:=http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
DIRECTFB_SOURCE:=DirectFB-$(DIRECTFB_VERSION).tar.gz
DIRECTFB_AUTORECONF = NO
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 13/41] package: added lirc
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (11 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 12/41] directfb: bump to 1.4.3 llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 14/41] directfb: added support for lirc llandwerlin at gmail.com
` (27 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/Config.in | 2 ++
package/lirc/Config.in | 32 ++++++++++++++++++++++++++++++++
package/lirc/S70lircd | 24 ++++++++++++++++++++++++
package/lirc/lirc.mk | 38 ++++++++++++++++++++++++++++++++++++++
4 files changed, 96 insertions(+), 0 deletions(-)
create mode 100644 package/lirc/Config.in
create mode 100644 package/lirc/S70lircd
create mode 100644 package/lirc/lirc.mk
diff --git a/package/Config.in b/package/Config.in
index 877a87e..582d435 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -269,6 +269,7 @@ endmenu
menu "Hardware handling"
source "package/libaio/Config.in"
source "package/libraw1394/Config.in"
+source "package/lirc/Config.in"
source "package/tslib/Config.in"
source "package/libusb/Config.in"
source "package/libusb-compat/Config.in"
@@ -429,6 +430,7 @@ endmenu
menu "Package managers"
source "package/ipkg/Config.in"
source "package/portage/Config.in"
+
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/rpm/Config.in"
endif
diff --git a/package/lirc/Config.in b/package/lirc/Config.in
new file mode 100644
index 0000000..a8a2bb6
--- /dev/null
+++ b/package/lirc/Config.in
@@ -0,0 +1,32 @@
+config BR2_PACKAGE_LIRC
+ bool "lirc"
+ help
+ LIRC is a package that supports receiving and sending IR
+ signals of the most common IR remote controls. It contains a
+ daemon that decodes and sends IR signals, a mouse daemon
+ that translates IR signals to mouse movements and a couple
+ of user programs that allow to control your computer with a
+ remote control.
+
+ A list of supported hardware is available on the main page.
+
+ http://www.lirc.org/
+
+if BR2_PACKAGE_LIRC
+
+choice
+ prompt "lirc drivers"
+ default BR2_PACKAGE_LIRC_USERSPACE
+
+ config BR2_PACKAGE_LIRC_ALL
+ bool "all"
+
+ config BR2_PACKAGE_LIRC_USERSPACE
+ bool "userspace"
+
+ config BR2_PACKAGE_LIRC_NONE
+ bool "none"
+endchoice
+
+endif # BR2_PACKAGE_LIRC
+
diff --git a/package/lirc/S70lircd b/package/lirc/S70lircd
new file mode 100644
index 0000000..770bef5
--- /dev/null
+++ b/package/lirc/S70lircd
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+LIRCD=/usr/sbin/lircd
+PID_FILE=/var/run/lircd.pid
+LIRCFLAGS="-o /dev/lircd -P $PID_FILE"
+
+case "$1" in
+ start)
+ echo -n "Starting daemon lircd: "
+ start-stop-daemon --start --quiet --pidfile $PID_FILE --exec $LIRCD -- $LIRCFLAGS
+ echo "done"
+ ;;
+ stop)
+ echo -n "Shutting down daemon lircd: "
+ start-stop-daemon --stop --quiet --pidfile $PID_FILE --exec $LIRCD
+ echo "done"
+ ;;
+ *)
+ echo "Usage: $0 {start|stop}"
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/package/lirc/lirc.mk b/package/lirc/lirc.mk
new file mode 100644
index 0000000..12168f3
--- /dev/null
+++ b/package/lirc/lirc.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# lirc
+#
+#############################################################
+
+LIRC_VERSION = 0.8.6
+LIRC_SOURCE = lirc-$(LIRC_VERSION).tar.bz2
+LIRC_SITE = http://prdownloads.sourceforge.net/lirc
+LIRC_LIBTOOL_PATCH = NO
+LIRC_INSTALL_STAGING = YES
+
+LIRC_CONF_OPT = --without-x
+
+ifeq ($(BR2_PACKAGE_LIRC_ALL),y)
+LIRC_CONF_OPT += --with-driver=all
+endif
+ifeq ($(BR2_PACKAGE_LIRC_USERSPACE),y)
+LIRC_CONF_OPT += --with-driver=userspace
+endif
+ifeq ($(BR2_PACKAGE_LIRC_NONE),y)
+LIRC_CONF_OPT += --with-driver=none
+endif
+
+define LIRC_INSTALL_TARGET_SCRIPTS
+ mkdir -p $(TARGET_DIR)/etc/init.d
+ $(INSTALL) -m 0755 package/lirc/S70lircd $(TARGET_DIR)/etc/init.d/
+endef
+
+LIRC_POST_INSTALL_TARGET_HOOKS += LIRC_INSTALL_TARGET_SCRIPTS
+
+define LIRC_UNINSTALL_TARGET_SCRIPTS
+ rm -f $(TARGET_DIR)/etc/init.d/S70lircd
+endef
+
+LIRC_POST_UNINSTALL_TARGET_HOOKS += LIRC_UNINSTALL_TARGET_SCRIPTS
+
+$(eval $(call AUTOTARGETS,package,lirc))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 14/41] directfb: added support for lirc
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (12 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 13/41] package: added lirc llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 7:45 ` Peter Korsgaard
2010-04-14 14:02 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 15/41] directfb: added directfb tests installation option llandwerlin at gmail.com
` (26 subsequent siblings)
40 siblings, 2 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/directfb/Config.in | 5 +++++
package/directfb/directfb.mk | 4 ++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 7c41cdf..6c78597 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -65,6 +65,11 @@ config BR2_PACKAGE_DIRECTFB_KEYBOARD
bool "compile keyboard input driver"
default y
+config BR2_PACKAGE_DIRECTFB_LIRC
+ bool "compile lirc input driver"
+ select BR2_PACKAGE_LIRC
+ default n
+
config BR2_PACKAGE_DIRECTFB_PS2MOUSE
bool "compile PS2 mouse input driver"
default y
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 2f095ee..a065a22 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -80,6 +80,10 @@ endif
ifeq ($(BR2_PACKAGE_DIRECTFB_KEYBOARD),y)
DIRECTFB_INPUT+= keyboard
endif
+ifeq ($(BR2_PACKAGE_DIRECTFB_KEYBOARD),y)
+DIRECTFB_INPUT+= lirc
+DIRECTFB_DEP+= lirc
+endif
ifeq ($(BR2_PACKAGE_DIRECTFB_PS2MOUSE),y)
DIRECTFB_INPUT+= ps2mouse
endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 14/41] directfb: added support for lirc
2010-04-13 23:05 ` [Buildroot] [PATCH 14/41] directfb: added support for lirc llandwerlin at gmail.com
@ 2010-04-14 7:45 ` Peter Korsgaard
2010-04-14 14:02 ` Thomas Petazzoni
1 sibling, 0 replies; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 7:45 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> ---
llandwerlin> package/directfb/Config.in | 5 +++++
llandwerlin> package/directfb/directfb.mk | 4 ++++
llandwerlin> 2 files changed, 9 insertions(+), 0 deletions(-)
llandwerlin> diff --git a/package/directfb/Config.in b/package/directfb/Config.in
llandwerlin> index 7c41cdf..6c78597 100644
llandwerlin> --- a/package/directfb/Config.in
llandwerlin> +++ b/package/directfb/Config.in
llandwerlin> @@ -65,6 +65,11 @@ config BR2_PACKAGE_DIRECTFB_KEYBOARD
llandwerlin> bool "compile keyboard input driver"
llandwerlin> default y
llandwerlin> +config BR2_PACKAGE_DIRECTFB_LIRC
llandwerlin> + bool "compile lirc input driver"
llandwerlin> + select BR2_PACKAGE_LIRC
llandwerlin> + default n
N is default, so you don't need to explicitly list it.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 14/41] directfb: added support for lirc
2010-04-13 23:05 ` [Buildroot] [PATCH 14/41] directfb: added support for lirc llandwerlin at gmail.com
2010-04-14 7:45 ` Peter Korsgaard
@ 2010-04-14 14:02 ` Thomas Petazzoni
1 sibling, 0 replies; 73+ messages in thread
From: Thomas Petazzoni @ 2010-04-14 14:02 UTC (permalink / raw)
To: buildroot
On Wed, 14 Apr 2010 01:05:47 +0200
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
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] 73+ messages in thread
* [Buildroot] [PATCH 15/41] directfb: added directfb tests installation option
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (13 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 14/41] directfb: added support for lirc llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 16/41] directfb: drop forced linux-fusion with multiapp llandwerlin at gmail.com
` (25 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/directfb/Config.in | 3 +++
package/directfb/directfb.mk | 9 ++++++++-
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 6c78597..cace1fa 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -103,4 +103,7 @@ config BR2_PACKAGE_DIRECTB_DITHER_RGB16
Enable dithering when loading images to RGB16 surfaces.
This increases the data section by 64 KBytes.
+config BR2_PACKAGE_DIRECTB_TESTS
+ bool "build directfb tests"
+
endif # BR2_PACKAGE_DIRECTFB
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index a065a22..9b1cecf 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -126,6 +126,12 @@ else
DIRECTFB_DITHER_RGB16:=--with-dither-rgb16=none
endif
+ifeq ($(BR2_PACKAGE_DIRECTB_TESTS),y)
+DIRECTFB_TESTS:=--with-tests
+else
+DIRECTFB_TESTS:=
+endif
+
DIRECTFB_CONF_OPT = \
--localstatedir=/var \
--with-gfxdrivers=$(DIRECTFB_GFX) \
@@ -151,7 +157,8 @@ DIRECTFB_CONF_OPT = \
--disable-sdl \
--disable-vnc \
--disable-video4linux \
- --disable-video4linux2
+ --disable-video4linux2 \
+ $(DIRECTFB_TESTS)
DIRECTFB_DEPENDENCIES = $(DIRECTFB_DEP) freetype $(DIRECTFB_FUSION)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 16/41] directfb: drop forced linux-fusion with multiapp
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (14 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 15/41] directfb: added directfb tests installation option llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 17/41] pixman: disable GTK+ tests, let the others => remove patch to disable tests llandwerlin at gmail.com
` (24 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Linux-fusion isn't mandatory anymore for directfb to work with multi
app. Indeed, directfb has a userspace fusion implementation (still
unstable but anyway...).
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/directfb/Config.in | 1 -
package/directfb/directfb.mk | 13 ++++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index cace1fa..cd95da7 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -9,7 +9,6 @@ if BR2_PACKAGE_DIRECTFB
config BR2_PACKAGE_DIRECTFB_MULTI
bool "directfb multi application"
- select BR2_PACKAGE_LINUX_FUSION
help
Enable use of multiple concurrent DirectFB applications
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 9b1cecf..3dcad13 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -11,14 +11,17 @@ DIRECTFB_AUTORECONF = NO
DIRECTFB_LIBTOOL_PATCH = NO
HOST_DIRECTFB_LIBTOOL_PATCH = NO
DIRECTFB_INSTALL_STAGING = YES
-DIRECTFB_INSTALL_TARGET = YES
ifeq ($(BR2_PACKAGE_DIRECTFB_MULTI),y)
-DIRECTFB_MULTI:=--enable-multi --enable-fusion
-DIRECTFB_FUSION:=linux-fusion
+DIRECTFB_MULTI = --enable-multi
+ifeq ($(BR2_PACKAGE_LINUX_FUSION),y)
+DIRECTFB_FUSION = linux-fusion
else
-DIRECTFB_MULTI:=
-DIRECTFB_FUSION:=
+DIRECTFB_FUSION =
+endif
+else
+DIRECTFB_MULTI =
+DIRECTFB_FUSION =
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG),y)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 17/41] pixman: disable GTK+ tests, let the others => remove patch to disable tests
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (15 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 16/41] directfb: drop forced linux-fusion with multiapp llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 18/41] cairo: bump to 1.8.10 llandwerlin at gmail.com
` (23 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/pixman/pixman-0.10.0-no-tests.patch | 11 -----------
package/pixman/pixman.mk | 4 +++-
2 files changed, 3 insertions(+), 12 deletions(-)
delete mode 100644 package/pixman/pixman-0.10.0-no-tests.patch
diff --git a/package/pixman/pixman-0.10.0-no-tests.patch b/package/pixman/pixman-0.10.0-no-tests.patch
deleted file mode 100644
index fbd0d26..0000000
--- a/package/pixman/pixman-0.10.0-no-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in.orig 2008-05-23 14:04:37.000000000 +0000
-+++ b/Makefile.in 2008-05-23 14:04:50.000000000 +0000
-@@ -198,7 +198,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pixman test
-+SUBDIRS = pixman
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pixman-1.pc
- USERNAME = $$USER
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 8c7a233..64083fe 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -6,8 +6,10 @@
PIXMAN_VERSION = 0.17.6
PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
PIXMAN_SITE = http://cairographics.org/releases/
-PIXMAN_AUTORECONF = NO
+PIXMAN_LIBTOOL_PATCH = NO
PIXMAN_INSTALL_STAGING = YES
+PIXMAN_CONF_OPT = --disable-gtk
+
$(eval $(call AUTOTARGETS,package,pixman))
$(eval $(call AUTOTARGETS,package,pixman,host))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 18/41] cairo: bump to 1.8.10
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (16 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 17/41] pixman: disable GTK+ tests, let the others => remove patch to disable tests llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 7:54 ` Peter Korsgaard
2010-04-13 23:05 ` [Buildroot] [PATCH 19/41] cairo: drop target installation option (it's on by default) llandwerlin at gmail.com
` (22 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/cairo/cairo-1.6.4-directfb-all.patch | 1012 --------------------------
package/cairo/cairo-1.8.8-directfb.patch | 39 +
package/cairo/cairo.mk | 5 +-
3 files changed, 42 insertions(+), 1014 deletions(-)
delete mode 100644 package/cairo/cairo-1.6.4-directfb-all.patch
create mode 100644 package/cairo/cairo-1.8.8-directfb.patch
diff --git a/package/cairo/cairo-1.6.4-directfb-all.patch b/package/cairo/cairo-1.6.4-directfb-all.patch
deleted file mode 100644
index c71031f..0000000
--- a/package/cairo/cairo-1.6.4-directfb-all.patch
+++ /dev/null
@@ -1,1012 +0,0 @@
-diff --git a/.gitignore b/.gitignore
-new file mode 100644
-index 0000000..99849ce
---- /dev/null
-+++ b/.gitignore
-@@ -0,0 +1,13 @@
-+.deps
-+.libs
-+*.o
-+*.la
-+*.lo
-+Makefile
-+boot
-+boot.log
-+config.h
-+config.log
-+config.status
-+libtool
-+stamp-h1
-diff --git a/src/.gitignore b/src/.gitignore
-new file mode 100644
-index 0000000..17146ae
---- /dev/null
-+++ b/src/.gitignore
-@@ -0,0 +1,11 @@
-+cairo-directfb.pc
-+cairo-features.h
-+cairo-ft.pc
-+cairo-no-features.h
-+cairo-pdf.pc
-+cairo-png.pc
-+cairo-ps.pc
-+cairo-svg.pc
-+cairo-xlib-xrender.pc
-+cairo-xlib.pc
-+cairo.pc
-diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
-index f20bf2b..57e3980 100644
---- a/src/cairo-directfb-surface.c
-+++ b/src/cairo-directfb-surface.c
-@@ -34,7 +34,8 @@
- * Michael Emmel <mike.emmel@gmail.com>
- * Claudio Ciccani <klan@users.sf.net>
- */
--
-+
-+//#define DIRECT_ENABLE_DEBUG
-
- #include "cairoint.h"
- #include "cairo-directfb.h"
-@@ -42,6 +43,8 @@
- #include <stdlib.h>
-
- #include <directfb.h>
-+#include <directfb_util.h>
-+
- #include <direct/types.h>
- #include <direct/debug.h>
- #include <direct/memcpy.h>
-@@ -63,7 +66,7 @@
- /*
- * CompositeTrapezoids works (without antialiasing).
- */
--#define DFB_COMPOSITE_TRAPEZOIDS 0
-+#define DFB_COMPOSITE_TRAPEZOIDS 1
-
- /*
- * ShowGlyphs works fine.
-@@ -71,7 +74,13 @@
- #define DFB_SHOW_GLYPHS 1
-
-
--D_DEBUG_DOMAIN (Cairo_DirectFB, "Cairo/DirectFB", "Cairo DirectFB backend");
-+D_DEBUG_DOMAIN( CairoDFB_Acquire, "CairoDFB/Acquire", "Cairo DirectFB Acquire" );
-+D_DEBUG_DOMAIN( CairoDFB_Clip, "CairoDFB/Clip", "Cairo DirectFB Clipping" );
-+D_DEBUG_DOMAIN( CairoDFB_Font, "CairoDFB/Font", "Cairo DirectFB Font Rendering" );
-+D_DEBUG_DOMAIN( CairoDFB_Glyphs, "CairoDFB/Glyphs", "Cairo DirectFB Font Rendering - Glyphs" );
-+D_DEBUG_DOMAIN( CairoDFB_Render, "CairoDFB/Render", "Cairo DirectFB Rendering" );
-+D_DEBUG_DOMAIN( CairoDFB_Surface, "CairoDFB/Surface", "Cairo DirectFB Surface" );
-+D_DEBUG_DOMAIN( CairoDFB_SurfExt, "CairoDFB/SurfExt", "Cairo DirectFB Surface Extents" );
-
- /*****************************************************************************/
-
-@@ -89,7 +98,7 @@ typedef struct _cairo_directfb_surface {
- cairo_surface_t *color;
-
- DFBRegion *clips;
-- int n_clips;
-+ int n_clips; // -1 = don't draw at all
-
- int width;
- int height;
-@@ -122,7 +131,7 @@ static int _directfb_argb_font = 0;
-
-
- #define RUN_CLIPPED( surface, clip, func ) {\
-- if ((surface)->clips) {\
-+ if ((surface)->n_clips) {\
- int k;\
- for (k = 0; k < (surface)->n_clips; k++) {\
- if (clip) {\
-@@ -155,15 +164,15 @@ static int _directfb_argb_font = 0;
- }
-
- #define TRANSFORM_POINT2X( m, x, y, ret_x, ret_y ) {\
-- double _x = (x);\
-- double _y = (y);\
-+ float _x = (x);\
-+ float _y = (y);\
- (ret_x) = (_x * (m).xx + (m).x0);\
- (ret_y) = (_y * (m).yy + (m).y0);\
- }
-
- #define TRANSFORM_POINT3X( m, x, y, ret_x, ret_y ) {\
-- double _x = (x);\
-- double _y = (y);\
-+ float _x = (x);\
-+ float _y = (y);\
- (ret_x) = (_x * (m).xx + _y * (m).xy + (m).x0);\
- (ret_y) = (_x * (m).yx + _y * (m).yy + (m).y0);\
- }
-@@ -291,6 +300,7 @@ _directfb_get_operator (cairo_operator_t operator,
- dstblend = DSBF_ONE;
- break;
- default:
-+ D_DEBUG_AT (CairoDFB_Render, "=> UNSUPPORTED OPERATOR %d\n", operator);
- return CAIRO_INT_STATUS_UNSUPPORTED;
- }
-
-@@ -312,6 +322,8 @@ _directfb_buffer_surface_create (IDirectFB *dfb,
- DFBSurfaceDescription dsc;
- DFBResult ret;
-
-+ D_DEBUG_AT( CairoDFB_Surface, "%s( %4dx%4d %s )\n", __FUNCTION__, width, height, dfb_pixelformat_name(format) );
-+
- dsc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
- dsc.width = width;
- dsc.height = height;
-@@ -339,26 +351,24 @@ _directfb_acquire_surface (cairo_directfb_surface_t *surface,
- cairo_format_t cairo_format;
- void *data;
- int pitch;
--
-+
- if (surface->format == (cairo_format_t) -1) {
-- DFBSurfaceCapabilities caps;
--
- if (intrest_rec) {
- source_rect.x = intrest_rec->x;
- source_rect.y = intrest_rec->y;
- source_rect.w = intrest_rec->width;
- source_rect.h = intrest_rec->height;
- } else {
-- source_rect.x = 0;
-- source_rect.y = 0;
-- surface->dfbsurface->GetSize (surface->dfbsurface,
-- &source_rect.w, &source_rect.h);
-+ /* Use GetVisibleRectangle() here, because GetSize() might return huge values of a sub surface */
-+ surface->dfbsurface->GetVisibleRectangle (surface->dfbsurface, &source_rect);
- }
-
- if (surface->tmpsurface) {
- int w, h;
- surface->tmpsurface->GetSize (surface->tmpsurface, &w, &h);
-- if (w < source_rect.w || h < source_rect.h) {
-+ if (w < source_rect.w || h < source_rect.h ||
-+ ((w*4 > source_rect.w*5 || h*4 > source_rect.h*5) && (w > 32 || h > 32)))
-+ {
- surface->tmpsurface->Release (surface->tmpsurface);
- surface->tmpsurface = NULL;
- }
-@@ -366,7 +376,7 @@ _directfb_acquire_surface (cairo_directfb_surface_t *surface,
-
- cairo_format = _cairo_format_from_content (surface->content);
- if (!surface->tmpsurface) {
-- D_DEBUG_AT (Cairo_DirectFB, "Allocating buffer for surface %p.\n", surface);
-+ D_DEBUG_AT (CairoDFB_Acquire, " -> Allocating %dx%d buffer\n", source_rect.w, source_rect.h);
-
- surface->tmpsurface =
- _directfb_buffer_surface_create (surface->dfb,
-@@ -377,14 +387,12 @@ _directfb_acquire_surface (cairo_directfb_surface_t *surface,
- }
- buffer = surface->tmpsurface;
-
-- surface->dfbsurface->GetCapabilities (surface->dfbsurface, &caps);
-- if (caps & DSCAPS_FLIPPING) {
-- DFBRegion region = { .x1 = source_rect.x, .y1 = source_rect.y,
-- .x2 = source_rect.x + source_rect.w - 1,
-- .y2 = source_rect.y + source_rect.h - 1 };
-- surface->dfbsurface->Flip (surface->dfbsurface, ®ion, DSFLIP_BLIT);
-- }
-+ D_DEBUG_AT( CairoDFB_Render, " => Blit( 0,0-%4dx%4d <- %4d,%4d )\n",
-+ source_rect.w, source_rect.h, source_rect.x, source_rect.y );
-+
-+ buffer->SetBlittingFlags (buffer, DSBLIT_NOFX);
- buffer->Blit (buffer, surface->dfbsurface, &source_rect, 0, 0);
-+ buffer->ReleaseSource (buffer);
- }
- else {
- /*might be a subsurface get the offset*/
-@@ -396,7 +404,7 @@ _directfb_acquire_surface (cairo_directfb_surface_t *surface,
- *image_extra = buffer;
-
- if (buffer->Lock (buffer, lock_flags, &data, &pitch)) {
-- D_DEBUG_AT (Cairo_DirectFB, "Couldn't lock surface!\n");
-+ D_DEBUG_AT (CairoDFB_Acquire, "Couldn't lock surface!\n");
- goto ERROR;
- }
-
-@@ -443,9 +451,9 @@ _cairo_directfb_surface_create_similar (void *abstract_src,
- cairo_directfb_surface_t *surface;
- cairo_format_t format;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "%s( src=%p, content=0x%x, width=%d, height=%d).\n",
-- __FUNCTION__, source, content, width, height);
-+ D_DEBUG_AT (CairoDFB_Surface, "%s( src=%p, content=%s%s, width=%d, height=%d)\n", __FUNCTION__, source,
-+ (content & CAIRO_CONTENT_COLOR) ? "COLOR" : "",
-+ (content & CAIRO_CONTENT_ALPHA) ? "+ALPHA" : "", width, height);
-
- width = (width <= 0) ? 1 : width;
- height = (height<= 0) ? 1 : height;
-@@ -497,8 +505,7 @@ _cairo_directfb_surface_finish (void *data)
- {
- cairo_directfb_surface_t *surface = (cairo_directfb_surface_t *)data;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "%s( surface=%p ).\n", __FUNCTION__, surface);
-+ D_DEBUG_AT (CairoDFB_Surface, "%s( surface=%p ).\n", __FUNCTION__, surface);
-
- if (surface->clips) {
- free (surface->clips);
-@@ -534,8 +541,8 @@ _cairo_directfb_surface_acquire_source_image (void *abstract_s
- {
- cairo_directfb_surface_t *surface = abstract_surface;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "%s( surface=%p ).\n", __FUNCTION__, surface);
-+ D_DEBUG_AT( CairoDFB_Acquire, "%s( %p - %dx%d 0x%x )\n", __FUNCTION__,
-+ surface, surface->width, surface->height, surface->format );
-
- return _directfb_acquire_surface (surface, NULL, image_out,
- NULL, image_extra, DSLF_READ);
-@@ -549,8 +556,7 @@ _cairo_directfb_surface_release_source_image (void *abstract_su
- cairo_directfb_surface_t *surface = abstract_surface;
- IDirectFBSurface *buffer = image_extra;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "%s( surface=%p ).\n", __FUNCTION__, surface);
-+ D_DEBUG_AT (CairoDFB_Acquire, "%s( %p )\n", __FUNCTION__, surface);
-
- buffer->Unlock (buffer);
-
-@@ -564,18 +570,58 @@ _cairo_directfb_surface_acquire_dest_image (void *abstract_s
- cairo_rectangle_int_t *image_rect_out,
- void **image_extra)
- {
-+ cairo_status_t status;
- cairo_directfb_surface_t *surface = abstract_surface;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "%s( surface=%p, interest_rect={ %d %d %d %d } ).\n",
-- __FUNCTION__, surface,
-+ D_DEBUG_AT (CairoDFB_Acquire,
-+ "%s( %p - %dx%d 0x%x { %u %u %u %u } )\n",
-+ __FUNCTION__, surface, surface->width, surface->height, surface->format,
- interest_rect ? interest_rect->x : 0,
- interest_rect ? interest_rect->y : 0,
-- interest_rect ? interest_rect->width : surface->width,
-- interest_rect ? interest_rect->height : surface->height);
-+ interest_rect ? interest_rect->width : (unsigned) surface->width,
-+ interest_rect ? interest_rect->height : (unsigned) surface->height);
-
-- return _directfb_acquire_surface (surface, interest_rect, image_out,
-- image_rect_out, image_extra, DSLF_READ | DSLF_WRITE);
-+ status = _directfb_acquire_surface (surface, interest_rect, image_out,
-+ image_rect_out, image_extra, DSLF_READ | DSLF_WRITE);
-+ if (status)
-+ return status;
-+
-+ /* Ensure that the new image has the same clip, if it's the same buffer */
-+ if ((IDirectFBSurface*) *image_extra == surface->dfbsurface &&
-+ surface->clips)
-+ {
-+ cairo_surface_t *s = (cairo_surface_t*) *image_out;
-+
-+ unsigned int clip_serial = _cairo_surface_allocate_clip_serial (s);
-+
-+ cairo_region_t clip_region;
-+
-+ if (surface->n_clips == 1) {
-+ cairo_rectangle_int_t rect = { surface->clips[0].x1, surface->clips[0].y1,
-+ surface->clips[0].x2 - surface->clips[0].x1 + 1,
-+ surface->clips[0].y2 - surface->clips[0].y1 + 1 };
-+ _cairo_region_init_rect (&clip_region, &rect);
-+ } else {
-+ cairo_box_int_t *boxes = _cairo_malloc_ab (surface->n_clips, sizeof(cairo_box_int_t));
-+ int k;
-+
-+ for (k = 0; k < surface->n_clips; k++) {
-+ boxes[k].p1.x = surface->clips[k].x1;
-+ boxes[k].p1.y = surface->clips[k].y1;
-+ boxes[k].p2.x = surface->clips[k].x2 + 1;
-+ boxes[k].p2.y = surface->clips[k].y2 + 1;
-+ }
-+
-+ _cairo_region_init_boxes (&clip_region, boxes, surface->n_clips);
-+ free (boxes);
-+ }
-+
-+ _cairo_surface_set_clip_region (s, &clip_region, clip_serial);
-+
-+ _cairo_region_fini (&clip_region);
-+ }
-+
-+ return CAIRO_STATUS_SUCCESS;
- }
-
- static void
-@@ -586,21 +632,31 @@ _cairo_directfb_surface_release_dest_image (void *abstract_surf
- void *image_extra)
- {
- cairo_directfb_surface_t *surface = abstract_surface;
-- IDirectFBSurface *buffer = image_extra;
-+ IDirectFBSurface *buffer = image_extra;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "%s( surface=%p ).\n", __FUNCTION__, surface);
-+ D_DEBUG_AT (CairoDFB_Acquire,
-+ "%s( %p - %dx%d 0x%x { %u %u %u %u } )\n",
-+ __FUNCTION__, surface, surface->width, surface->height, surface->format,
-+ interest_rect ? interest_rect->x : 0,
-+ interest_rect ? interest_rect->y : 0,
-+ interest_rect ? interest_rect->width : (unsigned) surface->width,
-+ interest_rect ? interest_rect->height : (unsigned) surface->height);
-
- buffer->Unlock (buffer);
-
- if (surface->dfbsurface != buffer) {
-- DFBRegion region = { .x1 = interest_rect->x, .y1 = interest_rect->y,
-- .x2 = interest_rect->x+interest_rect->width-1,
-- .y2 = interest_rect->y+interest_rect->height-1 };
-- surface->dfbsurface->SetClip (surface->dfbsurface, ®ion);
-+ DFBRectangle sr = { 0, 0, image_rect->width, image_rect->height };
-+
-+ D_DEBUG_AT( CairoDFB_Render, " => Blit( %4d,%4d-%4dx%4d <- 0,0 )\n",
-+ image_rect->x, image_rect->y, sr.w, sr.h );
-+
- surface->dfbsurface->SetBlittingFlags (surface->dfbsurface, DSBLIT_NOFX);
-- surface->dfbsurface->Blit (surface->dfbsurface, buffer,
-- NULL, image_rect->x, image_rect->y);
-+
-+ RUN_CLIPPED( surface, NULL,
-+ surface->dfbsurface->Blit (surface->dfbsurface,
-+ buffer, &sr, image_rect->x, image_rect->y));
-+
-+ surface->dfbsurface->ReleaseSource (surface->dfbsurface);
- }
-
- cairo_surface_destroy (&image->base);
-@@ -618,13 +674,15 @@ _cairo_directfb_surface_clone_similar (void *abstract_surface,
- cairo_directfb_surface_t *surface = abstract_surface;
- cairo_directfb_surface_t *clone;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "%s( surface=%p, src=%p ).\n", __FUNCTION__, surface, src);
-+ D_DEBUG_AT (CairoDFB_Surface, "%s( surface=%p, src=%p [%d,%d-%dx%d] )\n",
-+ __FUNCTION__, surface, src, src_x, src_y, width, height);
-
- if (src->backend == surface->base.backend) {
- cairo_surface_reference (src);
- *clone_out = src;
-
-+ D_DEBUG_AT (CairoDFB_Surface, " -> lightweight - referenced :)\n");
-+
- return CAIRO_STATUS_SUCCESS;
- }
- else if (_cairo_surface_is_image (src)) {
-@@ -640,7 +698,8 @@ _cairo_directfb_surface_clone_similar (void *abstract_surface,
- image_src->width, image_src->height);
- if (!clone)
- return _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
-+
-+
- ret = clone->dfbsurface->Lock (clone->dfbsurface,
- DSLF_WRITE, (void *)&dst, &pitch);
- if (ret) {
-@@ -653,6 +712,8 @@ _cairo_directfb_surface_clone_similar (void *abstract_surface,
- src += image_src->stride * src_y;
-
- if (image_src->format == CAIRO_FORMAT_A1) {
-+ D_DEBUG_AT (CairoDFB_Surface, " ==> converting A1 -> A8 data\n");
-+
- /* A1 -> A8 */
- for (i = 0; i < height; i++) {
- for (j = src_x; j < src_x + width; j++)
-@@ -665,10 +726,14 @@ _cairo_directfb_surface_clone_similar (void *abstract_surface,
- int len;
-
- if (image_src->format == CAIRO_FORMAT_A8) {
-+ D_DEBUG_AT (CairoDFB_Surface, " ==> copying A8 data\n");
-+
- dst += src_x;
- src += src_x;
- len = width;
- } else {
-+ D_DEBUG_AT (CairoDFB_Surface, " ==> copying ARGB data\n");
-+
- dst += src_x * 4;
- src += src_x * 4;
- len = width * 4;
-@@ -722,11 +787,17 @@ _directfb_prepare_composite (cairo_directfb_surface_t *dst,
- cairo_pattern_t *tmp;
- int tmp_x, tmp_y;
-
-- if (src_pattern->type != CAIRO_PATTERN_TYPE_SOLID ||
-- sblend == DSBF_INVDESTALPHA) /* Doesn't work correctly */
-+ if (src_pattern->type != CAIRO_PATTERN_TYPE_SOLID) { /* Doesn't work correctly */
-+ D_DEBUG_AT (CairoDFB_Render, "=> PATTERN TYPE %d WITH MASK NOT SUPPORTED\n", src_pattern->type);
- return CAIRO_INT_STATUS_UNSUPPORTED;
-+ }
-
-- D_DEBUG_AT (Cairo_DirectFB, "Replacing src pattern by mask pattern.\n");
-+ if (sblend == DSBF_INVDESTALPHA) { /* Doesn't work correctly */
-+ D_DEBUG_AT (CairoDFB_Render, "=> SOURCE BLEND %d WITH MASK NOT SUPPORTED\n", sblend);
-+ return CAIRO_INT_STATUS_UNSUPPORTED;
-+ }
-+
-+ D_DEBUG_AT (CairoDFB_Render, "-> Replacing src pattern by mask pattern.\n");
-
- tmp = src_pattern;
- tmp_x = *src_x; tmp_y = *src_y;
-@@ -748,6 +819,10 @@ _directfb_prepare_composite (cairo_directfb_surface_t *dst,
- color.r = pattern->color.red_short >> 8;
- color.g = pattern->color.green_short >> 8;
- color.b = pattern->color.blue_short >> 8;
-+
-+ D_DEBUG_AT (CairoDFB_Render, "-> SOLID MASK (%02x %02x %02x %02x)\n",
-+ pattern->color.alpha_short >> 8, pattern->color.red_short >> 8,
-+ pattern->color.green_short >> 8, pattern->color.blue_short >> 8 );
- }
- else {
- color.a = color.r = color.g = color.b = 0xff;
-@@ -756,6 +831,10 @@ _directfb_prepare_composite (cairo_directfb_surface_t *dst,
- if (src_pattern->type == CAIRO_PATTERN_TYPE_SOLID) {
- cairo_solid_pattern_t *pattern = (cairo_solid_pattern_t *)src_pattern;
-
-+ D_DEBUG_AT (CairoDFB_Render, "-> SOLID PATTERN (%02x %02x %02x %02x)\n",
-+ pattern->color.alpha_short >> 8, pattern->color.red_short >> 8,
-+ pattern->color.green_short >> 8, pattern->color.blue_short >> 8 );
-+
- if (!dst->color) {
- dst->color = _cairo_directfb_surface_create_similar (dst,
- CAIRO_CONTENT_COLOR_ALPHA, 1, 1);
-@@ -777,6 +856,8 @@ _directfb_prepare_composite (cairo_directfb_surface_t *dst,
- src_attr.y_offset = 0;
- }
- else {
-+ D_DEBUG_AT (CairoDFB_Render, "-> PATTERN TYPE %d\n", src_pattern->type );
-+
- ret = _cairo_pattern_acquire_surface (src_pattern, &dst->base,
- *src_x, *src_y, width, height,
- (cairo_surface_t **)&src, &src_attr);
-@@ -838,6 +919,9 @@ _directfb_finish_composite (cairo_directfb_surface_t *dst,
- {
- if (src != dst->color)
- _cairo_pattern_release_surface (src_pattern, src, src_attr);
-+
-+ if (dst->dfbsurface)
-+ dst->dfbsurface->ReleaseSource( dst->dfbsurface );
- }
- #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
-
-@@ -848,20 +932,38 @@ _directfb_categorize_operation (cairo_surface_attributes_t *src_attr)
- cairo_matrix_t *m = &src_attr->matrix;
-
- if (m->xy != 0 || m->yx != 0 || m->xx < 0 || m->yy < 0) {
-- if (src_attr->extend != CAIRO_EXTEND_NONE)
-- return DFXL_NONE;
-+ D_DEBUG_AT (CairoDFB_Render, "-> NON-RECTANGULAR TRANSFORM\n" );
-+
-+ if (src_attr->extend != CAIRO_EXTEND_NONE) {
-+ D_DEBUG_AT (CairoDFB_Render, "=> EXTEND MODE %d NOT SUPPORTED\n", src_attr->extend );
-+ return DFXL_NONE;
-+ }
-+
- return DFXL_TEXTRIANGLES;
- }
-
- if (m->xx != 1 || m->yy != 1) {
-- if (src_attr->extend != CAIRO_EXTEND_NONE)
-- return DFXL_NONE;
-+ D_DEBUG_AT (CairoDFB_Render, "-> RECTANGULAR TRANSFORM\n" );
-+
-+ if (src_attr->extend != CAIRO_EXTEND_NONE) {
-+ D_DEBUG_AT (CairoDFB_Render, "=> EXTEND MODE %d NOT SUPPORTED\n", src_attr->extend );
-+
-+ /* TODO: support EXTEND_PAD in special cases */
-+
-+ return DFXL_NONE;
-+ }
-+
- return DFXL_STRETCHBLIT;
- }
-
-+ D_DEBUG_AT (CairoDFB_Render, "-> NO TRANSFORM\n" );
-+
- if (src_attr->extend != CAIRO_EXTEND_NONE &&
- src_attr->extend != CAIRO_EXTEND_REPEAT)
-+ {
-+ D_DEBUG_AT (CairoDFB_Render, "=> EXTEND MODE %d NOT SUPPORTED\n", src_attr->extend );
- return DFXL_NONE;
-+ }
-
- return DFXL_BLIT;
- }
-@@ -880,13 +982,13 @@ _cairo_directfb_surface_composite (cairo_operator_t op,
- cairo_directfb_surface_t *dst = abstract_dst;
- cairo_directfb_surface_t *src;
- cairo_surface_attributes_t src_attr;
-- DFBAccelerationMask accel, mask;
-+ DFBAccelerationMask accel;
- cairo_int_status_t ret;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "%s( op=%d, src_pattern=%p, mask_pattern=%p, dst=%p,"
-+ D_DEBUG_AT (CairoDFB_Render,
-+ "%s( op=%d, src=%p, mask=%p, dst=%p,"
- " src_x=%d, src_y=%d, mask_x=%d, mask_y=%d, dst_x=%d,"
-- " dst_y=%d, width=%u, height=%u ).\n",
-+ " dst_y=%d, width=%u, height=%u )\n",
- __FUNCTION__, op, src_pattern, mask_pattern, dst,
- src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);
-
-@@ -895,16 +997,12 @@ _cairo_directfb_surface_composite (cairo_operator_t op,
- width, height, &src, &src_attr);
- if (ret)
- return ret;
--
-+
- accel = _directfb_categorize_operation (&src_attr);
--
-- dst->dfbsurface->GetAccelerationMask (dst->dfbsurface, src->dfbsurface, &mask);
-- if (!(mask & accel)) {
-- D_DEBUG_AT (Cairo_DirectFB, "No acceleration (%08x)!\n", accel);
-- if (accel != DFXL_BLIT) {
-- _directfb_finish_composite (dst, src_pattern, &src->base, &src_attr);
-- return CAIRO_INT_STATUS_UNSUPPORTED;
-- }
-+ if (!accel) {
-+ D_DEBUG_AT (CairoDFB_Render, " ====>> UNSUPPORTED!!!\n");
-+ _directfb_finish_composite (dst, src_pattern, &src->base, &src_attr);
-+ return CAIRO_INT_STATUS_UNSUPPORTED;
- }
-
- src_x += src_attr.x_offset;
-@@ -920,7 +1018,8 @@ _cairo_directfb_surface_composite (cairo_operator_t op,
- sr.h = height;
-
- if (src_attr.extend == CAIRO_EXTEND_NONE) {
-- D_DEBUG_AT (Cairo_DirectFB, "Running Blit().\n");
-+ D_DEBUG_AT( CairoDFB_Render, " ==> Blit( %4d,%4d-%4dx%4d <- %4d,%4d )\n",
-+ dst_x, dst_y, sr.w, sr.h, sr.x, sr.y );
-
- RUN_CLIPPED( dst, NULL,
- dst->dfbsurface->Blit (dst->dfbsurface,
-@@ -934,7 +1033,8 @@ _cairo_directfb_surface_composite (cairo_operator_t op,
- clip.x2 = dst_x + width - 1;
- clip.y2 = dst_y + height - 1;
-
-- D_DEBUG_AT (Cairo_DirectFB, "Running TileBlit().\n");
-+ D_DEBUG_AT( CairoDFB_Render, " ==> TileBlit( %4d,%4d-%4dx%4d <- %4d,%4d-%4dx%4d )\n",
-+ dst_x, dst_y, width, height, sr.x, sr.y, sr.w, sr.h );
-
- RUN_CLIPPED( dst, &clip,
- dst->dfbsurface->TileBlit (dst->dfbsurface,
-@@ -944,7 +1044,7 @@ _cairo_directfb_surface_composite (cairo_operator_t op,
-
- case DFXL_STRETCHBLIT: {
- DFBRectangle sr, dr;
-- double x1, y1, x2, y2;
-+ float x1, y1, x2, y2;
-
- TRANSFORM_POINT2X (src_attr.matrix,
- src_x, src_y, x1, y1);
-@@ -961,7 +1061,8 @@ _cairo_directfb_surface_composite (cairo_operator_t op,
- dr.w = width;
- dr.h = height;
-
-- D_DEBUG_AT (Cairo_DirectFB, "Running StretchBlit().\n");
-+ D_DEBUG_AT( CairoDFB_Render, " ==> StretchBlit( %4d,%4d-%4dx%4d <- %4d,%4d-%4dx%4d )\n",
-+ dst_x, dst_y, width, height, sr.x, sr.y, sr.w, sr.h );
-
- RUN_CLIPPED (dst, NULL,
- dst->dfbsurface->StretchBlit (dst->dfbsurface,
-@@ -1019,7 +1120,7 @@ _cairo_directfb_surface_composite (cairo_operator_t op,
- clip.x2 = dst_x + width - 1;
- clip.y2 = dst_y + height - 1;
-
-- D_DEBUG_AT (Cairo_DirectFB, "Running TextureTriangles().\n");
-+ D_DEBUG_AT (CairoDFB_Render, " ==> TextureTriangles( ... )\n");
-
- RUN_CLIPPED (dst, &clip,
- dst->dfbsurface->TextureTriangles (dst->dfbsurface,
-@@ -1052,8 +1153,7 @@ _cairo_directfb_surface_fill_rectangles (void *abstract_surface
- DFBRectangle r[n_rects];
- int i;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "%s( dst=%p, op=%d, color=%p, rects=%p, n_rects=%d ).\n",
-+ D_DEBUG_AT (CairoDFB_Render, "%s( dst=%p, op=%d, color=%p, rects=%p, n_rects=%d )\n",
- __FUNCTION__, dst, op, color, rects, n_rects);
-
- if (_directfb_get_operator (op, &sblend, &dblend))
-@@ -1094,14 +1194,19 @@ _cairo_directfb_surface_fill_rectangles (void *abstract_surface
- color->green_short >> 8,
- color->blue_short >> 8,
- color->alpha_short >> 8 );
-+
-+ D_DEBUG_AT( CairoDFB_Render, " -> %02x %02x %02x %02x\n", color->alpha_short >> 8,
-+ color->red_short >> 8, color->green_short >> 8, color->blue_short >> 8 );
-
- for (i = 0; i < n_rects; i++) {
- r[i].x = rects[i].x;
- r[i].y = rects[i].y;
- r[i].w = rects[i].width;
- r[i].h = rects[i].height;
-+
-+ D_DEBUG_AT( CairoDFB_Render, " ==> Fill %4d,%4d-%4dx%4d [%d]\n", DFB_RECTANGLE_VALS(&r[i]), i );
- }
--
-+
- RUN_CLIPPED (dst, NULL,
- dst->dfbsurface->FillRectangles (dst->dfbsurface, r, n_rects));
-
-@@ -1128,7 +1233,7 @@ _cairo_directfb_surface_composite_trapezoids (cairo_operator_t op,
- cairo_status_t ret;
- DFBAccelerationMask accel;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-+ D_DEBUG_AT (CairoDFB_Render,
- "%s( op=%d, pattern=%p, dst=%p, antialias=%d,"
- " src_x=%d, src_y=%d, dst_x=%d, dst_y=%d,"
- " width=%u, height=%u, traps=%p, num_traps=%d ).\n",
-@@ -1235,7 +1340,7 @@ _cairo_directfb_surface_composite_trapezoids (cairo_operator_t op,
-
- #undef ADD_TRI
-
-- D_DEBUG_AT (Cairo_DirectFB, "Running TextureTriangles().\n");
-+ D_DEBUG_AT (CairoDFB_Render, "Running TextureTriangles().\n");
-
- RUN_CLIPPED (dst, NULL,
- dst->dfbsurface->TextureTriangles (dst->dfbsurface, src->dfbsurface,
-@@ -1256,9 +1361,7 @@ _cairo_directfb_surface_set_clip_region (void *abstract_surface,
- {
- cairo_directfb_surface_t *surface = abstract_surface;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "%s( surface=%p, region=%p ).\n",
-- __FUNCTION__, surface, region);
-+ D_DEBUG_AT (CairoDFB_Clip, "%s( surface=%p, region=%p )\n", __FUNCTION__, surface, region);
-
- if (region) {
- cairo_box_int_t *boxes;
-@@ -1267,15 +1370,33 @@ _cairo_directfb_surface_set_clip_region (void *abstract_surface,
- int i;
-
- status = _cairo_region_get_boxes (region, &n_boxes, &boxes);
-- if (status)
-- return status;
-+ if (status) {
-+ D_DEBUG_AT( CairoDFB_Clip, " -> status %d!\n", status );
-+ return status;
-+ }
-+
-+ if (n_boxes == 0) {
-+ D_DEBUG_AT( CairoDFB_Clip, " -> EMPTY region (fully clipped)\n" );
-+
-+ if (surface->clips) {
-+ free (surface->clips);
-+ surface->clips = NULL;
-+ }
-+
-+ surface->n_clips = -1;
-+
-+ return CAIRO_STATUS_SUCCESS;
-+ }
-+
-+ D_DEBUG_AT( CairoDFB_Clip, " -> %d box%s\n", n_boxes, (n_boxes > 1) ? "es" : "" );
-
-- if (surface->n_clips != n_boxes) {
-+ if (surface->n_clips < n_boxes || surface->n_clips - n_boxes > 10) {
- if (surface->clips)
- free (surface->clips);
-
- surface->clips = _cairo_malloc_ab (n_boxes, sizeof(DFBRegion));
- if (!surface->clips) {
-+ D_OOM();
- surface->n_clips = 0;
- _cairo_region_boxes_fini (region, boxes);
- return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-@@ -1287,18 +1408,24 @@ _cairo_directfb_surface_set_clip_region (void *abstract_surface,
- for (i = 0; i < n_boxes; i++) {
- surface->clips[i].x1 = boxes[i].p1.x;
- surface->clips[i].y1 = boxes[i].p1.y;
-- surface->clips[i].x2 = boxes[i].p2.x;
-- surface->clips[i].y2 = boxes[i].p2.y;
-+ surface->clips[i].x2 = boxes[i].p2.x - 1;
-+ surface->clips[i].y2 = boxes[i].p2.y - 1;
-+
-+ D_DEBUG_AT( CairoDFB_Clip, " = CLIP %4d,%4d-%4dx%4d [%d]\n",
-+ DFB_RECTANGLE_VALS_FROM_REGION(&surface->clips[i]), i );
- }
-
- _cairo_region_boxes_fini (region, boxes);
- }
- else {
-+ D_DEBUG_AT( CairoDFB_Clip, " -> NULL region (unclipped)\n" );
-+
- if (surface->clips) {
- free (surface->clips);
- surface->clips = NULL;
-- surface->n_clips = 0;
- }
-+
-+ surface->n_clips = 0;
- }
-
- return CAIRO_STATUS_SUCCESS;
-@@ -1310,9 +1437,7 @@ _cairo_directfb_abstract_surface_get_extents (void *abstract_su
- {
- cairo_directfb_surface_t *surface = abstract_surface;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "%s( surface=%p, rectangle=%p ).\n",
-- __FUNCTION__, surface, rectangle);
-+ D_DEBUG_AT (CairoDFB_SurfExt, "%s( surface=%p, rectangle=%p )\n", __FUNCTION__, surface, rectangle);
-
- if (rectangle) {
- if (!surface->local) {
-@@ -1323,6 +1448,8 @@ _cairo_directfb_abstract_surface_get_extents (void *abstract_su
- rectangle->y = 0;
- rectangle->width = surface->width;
- rectangle->height = surface->height;
-+
-+ D_DEBUG_AT (CairoDFB_SurfExt, " -> %dx%d\n", surface->width, surface->height);
- }
-
- return CAIRO_STATUS_SUCCESS;
-@@ -1379,21 +1506,29 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t *surface,
- int h = 8;
- int i;
-
-+ D_DEBUG_AT (CairoDFB_Font, "%s( %p [%d] )\n", __FUNCTION__, glyphs, num_glyphs );
-+
- if (scaled_font->surface_private) {
- cache = scaled_font->surface_private;
- x = cache->x;
- y = cache->y;
- }
--
-+
-+ _cairo_cache_freeze( scaled_font->glyphs );
-+
- for (i = 0; i < num_glyphs; i++) {
- cairo_scaled_glyph_t *scaled_glyph;
- cairo_image_surface_t *img;
-
-+ D_DEBUG_AT (CairoDFB_Glyphs, " -> [%2d] = %4lu\n", i, glyphs[i].index );
-+
- ret = _cairo_scaled_glyph_lookup (scaled_font, glyphs[i].index,
- CAIRO_SCALED_GLYPH_INFO_SURFACE,
- &scaled_glyph);
-- if (ret)
-+ if (ret) {
-+ _cairo_cache_thaw( scaled_font->glyphs );
- return ret;
-+ }
-
- img = scaled_glyph->surface;
- switch (img->format) {
-@@ -1402,19 +1537,26 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t *surface,
- case CAIRO_FORMAT_ARGB32:
- break;
- default:
-- D_DEBUG_AT (Cairo_DirectFB,
-- "Unsupported font format %d!\n", img->format);
-+ D_DEBUG_AT (CairoDFB_Glyphs,
-+ " -> Unsupported font format %d!\n", img->format);
-+ _cairo_cache_thaw( scaled_font->glyphs );
- return CAIRO_INT_STATUS_UNSUPPORTED;
- }
-
- points[n].x = _cairo_lround (glyphs[i].x - img->base.device_transform.x0);
- points[n].y = _cairo_lround (glyphs[i].y - img->base.device_transform.y0);
-
-+// D_DEBUG_AT (CairoDFB_Glyphs, " (%4d,%4d) [%2d]\n", points[n].x, points[n].y, n );
-+
- if (points[n].x >= surface->width ||
- points[n].y >= surface->height ||
- points[n].x+img->width <= 0 ||
- points[n].y+img->height <= 0)
-- continue;
-+ {
-+ D_DEBUG_AT (CairoDFB_Glyphs,
-+ " -> Unsupported font format %d!\n", img->format);
-+ continue;
-+ }
-
- if (!scaled_glyph->surface_private) {
- DFBRectangle *rect;
-@@ -1436,30 +1578,31 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t *surface,
-
- /* Remember glyph location */
- rect = malloc (sizeof(DFBRectangle));
-- if (!rect)
-+ if (!rect) {
-+ _cairo_cache_thaw( scaled_font->glyphs );
- return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+ }
- *rect = rects[n];
-
- scaled_glyph->surface_private = rect;
- chars[num_chars++] = scaled_glyph;
-
-- /*D_DEBUG_AT (Cairo_DirectFB,
-- "Glyph %lu will be loaded at (%d,%d).\n",
-- glyphs[i].index, rects[n].x, rects[n].y);*/
-+ D_DEBUG_AT (CairoDFB_Glyphs, " -> loading at %4d,%2d <- rect %p, img %p, entry %p\n",
-+ rects[n].x, rects[n].y, rect, scaled_glyph->surface, scaled_glyph);
- }
- else {
- rects[n] = *((DFBRectangle *)scaled_glyph->surface_private);
-
-- /*D_DEBUG_AT (Cairo_DirectFB,
-- "Glyph %lu already loaded at (%d,%d).\n",
-- glyphs[i].index, rects[n].x, rects[n].y);*/
-+ D_DEBUG_AT (CairoDFB_Glyphs, " -> exists at %4d,%2d\n", rects[n].x, rects[n].y);
- }
-
- n++;
- }
-
-- if (!n)
-+ if (!n) {
-+ _cairo_cache_thaw( scaled_font->glyphs );
- return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+ }
-
- h += y;
- w = MAX (w, 8);
-@@ -1472,27 +1615,30 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t *surface,
- w = MAX (w, cache->width);
- h = MAX (h, cache->height);
-
-- D_DEBUG_AT (Cairo_DirectFB,
-- "Reallocating font cache (%dx%d).\n", w, h);
-+ D_DEBUG_AT (CairoDFB_Font, " -> Reallocating font cache (%dx%d).\n", w, h);
-
- new_cache = _directfb_allocate_font_cache (surface->dfb, w, h);
-- if (!new_cache)
-+ if (!new_cache) {
-+ _cairo_cache_thaw( scaled_font->glyphs );
- return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+ }
-
- new_cache->dfbsurface->Blit (new_cache->dfbsurface,
- cache->dfbsurface, NULL, 0, 0);
-+ new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
-
- _directfb_destroy_font_cache (cache);
- scaled_font->surface_private = cache = new_cache;
- }
- }
- else {
-- D_DEBUG_AT (Cairo_DirectFB,
-- "Allocating font cache (%dx%d).\n", w, h);
-+ D_DEBUG_AT (CairoDFB_Font, " -> Allocating font cache (%dx%d).\n", w, h);
-
- cache = _directfb_allocate_font_cache (surface->dfb, w, h);
-- if (!cache)
-+ if (!cache) {
-+ _cairo_cache_thaw( scaled_font->glyphs );
- return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+ }
-
- scaled_font->surface_backend = &cairo_directfb_surface_backend;
- scaled_font->surface_private = cache;
-@@ -1504,17 +1650,30 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t *surface,
-
- if (cache->dfbsurface->Lock (cache->dfbsurface,
- DSLF_WRITE, (void *)&data, &pitch))
-+ {
-+ _cairo_cache_thaw( scaled_font->glyphs );
- return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+ }
-
-+ D_DEBUG_AT (CairoDFB_Font, " => %d chars to load, cache %dx%d\n", num_chars, cache->width, cache->height);
-+
- for (i = 0; i < num_chars; i++) {
- cairo_image_surface_t *img = chars[i]->surface;
- DFBRectangle *rect = chars[i]->surface_private;
- unsigned char *dst = data;
-- unsigned char *src = img->data;
-+ unsigned char *src;
- int j;
-
-+ D_DEBUG_AT (CairoDFB_Glyphs, " -> loading [%2d] <- rect %p, img %p, entry %p\n", i, rect, img, chars[i]);
-+
-+ src = img->data;
-+
-+ D_DEBUG_AT (CairoDFB_Glyphs, " from %p\n", src);
-+
- dst += rect->y * pitch + (_directfb_argb_font ? (rect->x<<2) : rect->x);
-
-+ D_DEBUG_AT (CairoDFB_Glyphs, " to %4d,%2d (%p)\n", rect->x, rect->y, dst);
-+
- if (img->format == CAIRO_FORMAT_A1) {
- for (h = rect->h; h; h--) {
- if (_directfb_argb_font) {
-@@ -1563,9 +1722,13 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t *surface,
- cache->dfbsurface->Unlock (cache->dfbsurface);
- }
-
-+ _cairo_cache_thaw( scaled_font->glyphs );
-+
- cache->x = x;
- cache->y = y;
-
-+ D_DEBUG_AT (CairoDFB_Font, " => cache %d,%d, %p [%d]\n", x, y, cache, n);
-+
- *ret_cache = cache;
- *ret_num = n;
-
-@@ -1577,7 +1740,7 @@ _cairo_directfb_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font)
- {
- cairo_directfb_font_cache_t *cache = scaled_font->surface_private;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-+ D_DEBUG_AT (CairoDFB_Font,
- "%s( scaled_font=%p ).\n", __FUNCTION__, scaled_font);
-
- if (cache) {
-@@ -1590,7 +1753,7 @@ static void
- _cairo_directfb_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
- cairo_scaled_font_t *scaled_font)
- {
-- D_DEBUG_AT (Cairo_DirectFB,
-+ D_DEBUG_AT (CairoDFB_Font,
- "%s( scaled_glyph=%p, scaled_font=%p ).\n",
- __FUNCTION__, scaled_glyph, scaled_font);
-
-@@ -1619,7 +1782,7 @@ _cairo_directfb_surface_show_glyphs (void *abstract_dst,
- DFBPoint points[num_glyphs];
- int num;
-
-- D_DEBUG_AT (Cairo_DirectFB,
-+ D_DEBUG_AT (CairoDFB_Font,
- "%s( dst=%p, op=%d, pattern=%p, glyphs=%p, num_glyphs=%d, scaled_font=%p ).\n",
- __FUNCTION__, dst, op, pattern, glyphs, num_glyphs, scaled_font);
-
-@@ -1660,12 +1823,14 @@ _cairo_directfb_surface_show_glyphs (void *abstract_dst,
- dst->dfbsurface->SetDstBlendFunction (dst->dfbsurface, dblend);
- dst->dfbsurface->SetColor (dst->dfbsurface, color.r, color.g, color.b, color.a);
-
-- D_DEBUG_AT (Cairo_DirectFB, "Running BatchBlit().\n");
-+ D_DEBUG_AT (CairoDFB_Font, " ===> BatchBlit()\n");
-
- RUN_CLIPPED (dst, NULL,
- dst->dfbsurface->BatchBlit (dst->dfbsurface,
- cache->dfbsurface, rects, points, num));
-
-+ dst->dfbsurface->ReleaseSource (dst->dfbsurface);
-+
- return CAIRO_STATUS_SUCCESS;
- }
- #endif /* DFB_SHOW_GLYPHS */
-@@ -1758,7 +1923,7 @@ cairo_directfb_surface_backend_init (IDirectFB *dfb)
- cairo_directfb_surface_backend.scaled_glyph_fini = NULL;
- cairo_directfb_surface_backend.show_glyphs = NULL;
- #endif
-- D_DEBUG_AT (Cairo_DirectFB, "Acceleration disabled.\n");
-+ D_DEBUG_AT (CairoDFB_Surface, "Acceleration disabled.\n");
- }
- else {
- DFBGraphicsDeviceDescription dsc;
-@@ -1766,19 +1931,19 @@ cairo_directfb_surface_backend_init (IDirectFB *dfb)
- dfb->GetDeviceDescription (dfb, &dsc);
-
- #if DFB_COMPOSITE
-- if (!(dsc.acceleration_mask & DFXL_BLIT))
-- cairo_directfb_surface_backend.composite = NULL;
-+// if (!(dsc.acceleration_mask & DFXL_BLIT))
-+// cairo_directfb_surface_backend.composite = NULL;
- #endif
-
- #if DFB_COMPOSITE_TRAPEZOIDS
-- if (!(dsc.acceleration_mask & DFXL_TEXTRIANGLES))
-- cairo_directfb_surface_backend.composite_trapezoids = NULL;
-+// if (!(dsc.acceleration_mask & DFXL_TEXTRIANGLES))
-+// cairo_directfb_surface_backend.composite_trapezoids = NULL;
- #endif
- }
-
- if (getenv ("CAIRO_DIRECTFB_ARGB_FONT")) {
- _directfb_argb_font = 1;
-- D_DEBUG_AT (Cairo_DirectFB, "Using ARGB fonts.\n");
-+ D_DEBUG_AT (CairoDFB_Surface, "Using ARGB fonts.\n");
- }
-
- done = 1;
diff --git a/package/cairo/cairo-1.8.8-directfb.patch b/package/cairo/cairo-1.8.8-directfb.patch
new file mode 100644
index 0000000..12a51ec
--- /dev/null
+++ b/package/cairo/cairo-1.8.8-directfb.patch
@@ -0,0 +1,39 @@
+diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
+index bb02dbf..65f2d55 100644
+--- a/src/cairo-directfb-surface.c
++++ b/src/cairo-directfb-surface.c
+@@ -609,6 +609,8 @@ _cairo_directfb_surface_release_dest_image (void *abstract_surf
+ surface->dfbsurface->Blit (surface->dfbsurface,
+ buffer, NULL,
+ image_rect->x, image_rect->y));
++
++ surface->dfbsurface->ReleaseSource (surface->dfbsurface);
+ }
+
+ cairo_surface_destroy (&image->base);
+@@ -848,6 +850,9 @@ _directfb_finish_composite (cairo_directfb_surface_t *dst,
+ cairo_surface_attributes_t *src_attr)
+ {
+ _cairo_pattern_release_surface (src_pattern, src, src_attr);
++
++ if (dst->dfbsurface)
++ dst->dfbsurface->ReleaseSource( dst->dfbsurface );
+ }
+ #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
+
+@@ -1555,6 +1560,7 @@ _directfb_acquire_font_cache (cairo_directfb_surface_t *surface,
+
+ new_cache->dfbsurface->Blit (new_cache->dfbsurface,
+ cache->dfbsurface, NULL, 0, 0);
++ new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
+
+ _directfb_destroy_font_cache (cache);
+ scaled_font->surface_private = cache = new_cache;
+@@ -1778,6 +1784,7 @@ _cairo_directfb_surface_show_glyphs (void *abstract_dst,
+ RUN_CLIPPED (dst, NULL,
+ dst->dfbsurface->BatchBlit (dst->dfbsurface,
+ cache->dfbsurface, rects, points, num));
++ dst->dfbsurface->ReleaseSource (dst->dfbsurface);
+
+ return CAIRO_STATUS_SUCCESS;
+ }
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 0ca99aa..a4513bc 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -3,10 +3,10 @@
# cairo
#
#############################################################
-CAIRO_VERSION = 1.6.4
+CAIRO_VERSION = 1.8.10
CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
CAIRO_SITE = http://cairographics.org/releases
-CAIRO_AUTORECONF = NO
+CAIRO_LIBTOOL_PATCH = NO
CAIRO_INSTALL_STAGING = YES
CAIRO_INSTALL_TARGET = YES
@@ -81,6 +81,7 @@ endif
HOST_CAIRO_DEPENDENCIES = host-pkg-config host-pixman host-fontconfig
+HOST_CAIRO_LIBTOOL_PATCH = NO
HOST_CAIRO_CONF_OPT = \
--enable-ps \
--enable-pdf \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 18/41] cairo: bump to 1.8.10
2010-04-13 23:05 ` [Buildroot] [PATCH 18/41] cairo: bump to 1.8.10 llandwerlin at gmail.com
@ 2010-04-14 7:54 ` Peter Korsgaard
0 siblings, 0 replies; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 7:54 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> ---
llandwerlin> package/cairo/cairo-1.6.4-directfb-all.patch | 1012 --------------------------
llandwerlin> package/cairo/cairo-1.8.8-directfb.patch | 39 +
llandwerlin> package/cairo/cairo.mk | 5 +-
llandwerlin> 3 files changed, 42 insertions(+), 1014 deletions(-)
llandwerlin> delete mode 100644 package/cairo/cairo-1.6.4-directfb-all.patch
llandwerlin> create mode 100644 package/cairo/cairo-1.8.8-directfb.patch
why not name it cairo-1.8.10-directfb.patch? Are you the author of the
patch? Has it been pushed upstream? It's nice if you add (git-like)
patch header to the file with that info.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 19/41] cairo: drop target installation option (it's on by default)
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (17 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 18/41] cairo: bump to 1.8.10 llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 20/41] systat: bump to 9.0.6 llandwerlin at gmail.com
` (21 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/cairo/cairo.mk | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index a4513bc..d6cfe42 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -8,7 +8,6 @@ CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
CAIRO_SITE = http://cairographics.org/releases
CAIRO_LIBTOOL_PATCH = NO
CAIRO_INSTALL_STAGING = YES
-CAIRO_INSTALL_TARGET = YES
CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
glib_cv_uscore=no ac_cv_func_strtod=yes \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 20/41] systat: bump to 9.0.6
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (18 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 19/41] cairo: drop target installation option (it's on by default) llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 21/41] automake: bump to 1.11 llandwerlin at gmail.com
` (20 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/sysstat/sysstat.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 2b220d6..99d419c 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -4,7 +4,7 @@
#
#############################################################
-SYSSTAT_VERSION = 9.0.5
+SYSSTAT_VERSION = 9.0.6
SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard/
SYSSTAT_AUTORECONF = NO
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 21/41] automake: bump to 1.11
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (19 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 20/41] systat: bump to 9.0.6 llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 22/41] libtool: added LIBTOOLIZE variable to point on $(HOST_DIR)/usr/bin/libtoolize llandwerlin at gmail.com
` (19 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.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 db935a4..e413287 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -3,7 +3,7 @@
# automake
#
#############################################################
-AUTOMAKE_VERSION = 1.10
+AUTOMAKE_VERSION = 1.11
AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 22/41] libtool: added LIBTOOLIZE variable to point on $(HOST_DIR)/usr/bin/libtoolize
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (20 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 21/41] automake: bump to 1.11 llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 23/41] autoconf: added AUTOHEADER variable llandwerlin at gmail.com
` (18 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libtool/libtool.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index bbabbb0..4278029 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -25,3 +25,4 @@ $(eval $(call AUTOTARGETS,package,libtool,host))
# variables used by other packages
LIBTOOL:=$(HOST_DIR)/usr/bin/libtool
+LIBTOOLIZE:=$(HOST_DIR)/usr/bin/libtoolize
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 23/41] autoconf: added AUTOHEADER variable
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (21 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 22/41] libtool: added LIBTOOLIZE variable to point on $(HOST_DIR)/usr/bin/libtoolize llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 8:18 ` Peter Korsgaard
2010-04-13 23:05 ` [Buildroot] [PATCH 24/41] target: Added ttyAS[0-3] devices llandwerlin at gmail.com
` (17 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/autoconf/autoconf.mk | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index d82c2c5..81233a5 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -17,7 +17,7 @@ AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
AUTOCONF_DEPENDENCIES = microperl host-m4
HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
- ac_cv_prog_gnu_m4_gnu=no
+ ac_cv_prog_gnu_m4_gnu=no
HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
@@ -26,4 +26,5 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
# variables used by other packages
AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
+AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 23/41] autoconf: added AUTOHEADER variable
2010-04-13 23:05 ` [Buildroot] [PATCH 23/41] autoconf: added AUTOHEADER variable llandwerlin at gmail.com
@ 2010-04-14 8:18 ` Peter Korsgaard
2010-04-14 8:37 ` Lionel Landwerlin
0 siblings, 1 reply; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 8:18 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> ---
llandwerlin> package/autoconf/autoconf.mk | 3 ++-
llandwerlin> 1 files changed, 2 insertions(+), 1 deletions(-)
llandwerlin> diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
llandwerlin> index d82c2c5..81233a5 100644
llandwerlin> --- a/package/autoconf/autoconf.mk
llandwerlin> +++ b/package/autoconf/autoconf.mk
llandwerlin> @@ -17,7 +17,7 @@ AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
llandwerlin> AUTOCONF_DEPENDENCIES = microperl host-m4
llandwerlin> HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
llandwerlin> - ac_cv_prog_gnu_m4_gnu=no
llandwerlin> + ac_cv_prog_gnu_m4_gnu=no
llandwerlin> HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
llandwerlin> @@ -26,4 +26,5 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
llandwerlin> # variables used by other packages
llandwerlin> AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
llandwerlin> +AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
Why? What uses it?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 23/41] autoconf: added AUTOHEADER variable
2010-04-14 8:18 ` Peter Korsgaard
@ 2010-04-14 8:37 ` Lionel Landwerlin
2010-04-14 9:44 ` Peter Korsgaard
0 siblings, 1 reply; 73+ messages in thread
From: Lionel Landwerlin @ 2010-04-14 8:37 UTC (permalink / raw)
To: buildroot
On Wed, Apr 14, 2010 at 10:18 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "llandwerlin" == llandwerlin ?<llandwerlin@gmail.com> writes:
>
> ?llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
> ?llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
> ?llandwerlin> ---
> ?llandwerlin> ?package/autoconf/autoconf.mk | ? ?3 ++-
> ?llandwerlin> ?1 files changed, 2 insertions(+), 1 deletions(-)
>
> ?llandwerlin> diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
> ?llandwerlin> index d82c2c5..81233a5 100644
> ?llandwerlin> --- a/package/autoconf/autoconf.mk
> ?llandwerlin> +++ b/package/autoconf/autoconf.mk
> ?llandwerlin> @@ -17,7 +17,7 @@ AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
> ?llandwerlin> ?AUTOCONF_DEPENDENCIES = microperl host-m4
>
> ?llandwerlin> ?HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
> ?llandwerlin> - ? ? ? ? ? ? ? ? ? ? ? ? ?ac_cv_prog_gnu_m4_gnu=no
> ?llandwerlin> + ? ? ? ? ? ? ? ? ac_cv_prog_gnu_m4_gnu=no
>
> ?llandwerlin> ?HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
>
> ?llandwerlin> @@ -26,4 +26,5 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
>
> ?llandwerlin> ?# variables used by other packages
> ?llandwerlin> ?AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
> ?llandwerlin> +AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
>
> Why? What uses it?
>
autoreconf uses it, otherwise it will use the system's one.
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 23/41] autoconf: added AUTOHEADER variable
2010-04-14 8:37 ` Lionel Landwerlin
@ 2010-04-14 9:44 ` Peter Korsgaard
2010-04-14 9:48 ` Lionel Landwerlin
0 siblings, 1 reply; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 9:44 UTC (permalink / raw)
To: buildroot
>>>>> "Lionel" == Lionel Landwerlin <llandwerlin@gmail.com> writes:
Hi,
>> ?llandwerlin> ?AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
>> ?llandwerlin> +AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
>>
>> Why? What uses it?
Lionel> autoreconf uses it, otherwise it will use the system's one.
Ok, thanks - That might be useful info for the commit message.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 23/41] autoconf: added AUTOHEADER variable
2010-04-14 9:44 ` Peter Korsgaard
@ 2010-04-14 9:48 ` Lionel Landwerlin
0 siblings, 0 replies; 73+ messages in thread
From: Lionel Landwerlin @ 2010-04-14 9:48 UTC (permalink / raw)
To: buildroot
On Wed, Apr 14, 2010 at 11:44 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "Lionel" == Lionel Landwerlin <llandwerlin@gmail.com> writes:
>
> Hi,
>
> ?>> ?llandwerlin> ?AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
> ?>> ?llandwerlin> +AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
> ?>>
> ?>> Why? What uses it?
>
> ?Lionel> autoreconf uses it, otherwise it will use the system's one.
>
> Ok, thanks - That might be useful info for the commit message.
>
Patch 39 is the same thing with automake.
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 24/41] target: Added ttyAS[0-3] devices
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (22 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 23/41] autoconf: added AUTOHEADER variable llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 25/41] openssh: added empty login option llandwerlin at gmail.com
` (16 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Some set top boxes use /dev/ttyAS[0-3] devices to output traces.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
target/generic/Config.in | 16 ++++++++++++++++
target/generic/device_table.txt | 9 +++++----
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/target/generic/Config.in b/target/generic/Config.in
index 54ff1d6..c995341 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -102,6 +102,18 @@ config BR2_TARGET_GENERIC_GETTY_TTYCPM2
config BR2_TARGET_GENERIC_GETTY_TTYCPM3
bool "ttyCPM3"
depends on BR2_powerpc
+config BR2_TARGET_GENERIC_GETTY_TTYAS0
+ bool "ttyAS0"
+ depends on BR2_sh
+config BR2_TARGET_GENERIC_GETTY_TTYAS1
+ bool "ttyAS1"
+ depends on BR2_sh
+config BR2_TARGET_GENERIC_GETTY_TTYAS2
+ bool "ttyAS2"
+ depends on BR2_sh
+config BR2_TARGET_GENERIC_GETTY_TTYAS3
+ bool "ttyAS3"
+ depends on BR2_sh
endchoice
config BR2_TARGET_GENERIC_GETTY_PORT
@@ -134,6 +146,10 @@ 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 "ttyAS0" if BR2_TARGET_GENERIC_GETTY_TTYAS0
+ default "ttyAS1" if BR2_TARGET_GENERIC_GETTY_TTYAS1
+ default "ttyAS2" if BR2_TARGET_GENERIC_GETTY_TTYAS2
+ default "ttyAS3" if BR2_TARGET_GENERIC_GETTY_TTYAS3
choice
prompt "Baudrate to use"
diff --git a/target/generic/device_table.txt b/target/generic/device_table.txt
index c054000..bdaec77 100644
--- a/target/generic/device_table.txt
+++ b/target/generic/device_table.txt
@@ -1,5 +1,5 @@
# When building a target filesystem, it is desirable to not have to
-# become root and then run 'mknod' a thousand times. Using a device
+# become root and then run 'mknod' a thousand times. Using a device
# table you can create device nodes and directories "on the fly".
#
# This is a sample device table file for use with genext2fs. You can
@@ -14,17 +14,17 @@
# I could just use the following two table entries:
# /dev/hda b 640 0 0 3 0 0 0 -
# /dev/hda b 640 0 0 3 1 1 1 15
-#
+#
# Device table entries take the form of:
# <name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
-# where name is the file name, type can be one of:
+# where name is the file name, type can be one of:
# f A regular file
# d Directory
# c Character special device file
# b Block special device file
# p Fifo (named pipe)
# uid is the user id for the target file, gid is the group id for the
-# target file. The rest of the entries (major, minor, etc) apply only
+# target file. The rest of the entries (major, minor, etc) apply only
# to device special files.
# Have fun
@@ -78,6 +78,7 @@
/dev/ttyPSC c 666 0 0 204 148 0 1 4
/dev/ttyUL c 666 0 0 204 187 0 1 4
/dev/ttymxc c 666 0 0 207 16 0 1 3
+/dev/ttyAS c 666 0 0 204 40 0 1 4
# Input stuff
/dev/input d 755 0 0 - - - - -
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 25/41] openssh: added empty login option
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (23 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 24/41] target: Added ttyAS[0-3] devices llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 7:51 ` Peter Korsgaard
2010-04-13 23:05 ` [Buildroot] [PATCH 26/41] linux-fusion: bump to 8.1.1 llandwerlin at gmail.com
` (15 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/openssh/Config.in | 4 ++++
package/openssh/openssh.mk | 8 ++++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/package/openssh/Config.in b/package/openssh/Config.in
index 0c3d993..fb5daf8 100644
--- a/package/openssh/Config.in
+++ b/package/openssh/Config.in
@@ -7,3 +7,7 @@ config BR2_PACKAGE_OPENSSH
tools. The standard 'ssh', 'sshd', 'scp', and friends.
http://www.openssh.com/
+
+config BR2_PACKAGE_OPENSSH_EMPTY_PASSWORDS
+ bool "allow empty passwords"
+ depends on BR2_PACKAGE_OPENSSH
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 9a06d12..b499075 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -14,6 +14,14 @@ OPENSSH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
OPENSSH_DEPENDENCIES = zlib openssl
+define OPENSSH_CONFIG_EMPTY_PASSWORDS
+ $(SED) "s/^.*PermitEmptyPasswords.*/PermitEmptyPasswords yes/;" $(TARGET_DIR)/etc/sshd_config
+endef
+
+ifeq ($(BR2_PACKAGE_OPENSSH_EMPTY_PASSWORDS),y)
+OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_CONFIG_EMPTY_PASSWORDS
+endif
+
$(eval $(call AUTOTARGETS,package,openssh))
$(OPENSSH_HOOK_POST_INSTALL):
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 25/41] openssh: added empty login option
2010-04-13 23:05 ` [Buildroot] [PATCH 25/41] openssh: added empty login option llandwerlin at gmail.com
@ 2010-04-14 7:51 ` Peter Korsgaard
0 siblings, 0 replies; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 7:51 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> ---
llandwerlin> package/openssh/Config.in | 4 ++++
llandwerlin> package/openssh/openssh.mk | 8 ++++++++
llandwerlin> 2 files changed, 12 insertions(+), 0 deletions(-)
llandwerlin> diff --git a/package/openssh/Config.in b/package/openssh/Config.in
llandwerlin> index 0c3d993..fb5daf8 100644
llandwerlin> --- a/package/openssh/Config.in
llandwerlin> +++ b/package/openssh/Config.in
llandwerlin> @@ -7,3 +7,7 @@ config BR2_PACKAGE_OPENSSH
llandwerlin> tools. The standard 'ssh', 'sshd', 'scp', and friends.
llandwerlin> http://www.openssh.com/
llandwerlin> +
llandwerlin> +config BR2_PACKAGE_OPENSSH_EMPTY_PASSWORDS
llandwerlin> + bool "allow empty passwords"
llandwerlin> + depends on BR2_PACKAGE_OPENSSH
Indentation should be with a <tab>
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 26/41] linux-fusion: bump to 8.1.1
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (24 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 25/41] openssh: added empty login option llandwerlin at gmail.com
@ 2010-04-13 23:05 ` llandwerlin at gmail.com
2010-04-14 8:16 ` Peter Korsgaard
2010-04-13 23:06 ` [Buildroot] [PATCH 27/41] linux-fusion: drop target installation option (it's on by default) llandwerlin at gmail.com
` (14 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:05 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
.../linux-fusion-8.0.2-cross-compile.patch | 100 --------------------
package/linux-fusion/linux-fusion.mk | 70 +++++---------
2 files changed, 24 insertions(+), 146 deletions(-)
delete mode 100644 package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch
diff --git a/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch b/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch
deleted file mode 100644
index 443ddf3..0000000
--- a/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -urN linux-fusion-8.0.2-0rig//linux/drivers/char/fusion/shmpool.c linux-fusion-8.0.2/linux/drivers/char/fusion/shmpool.c
---- linux-fusion-8.0.2-0rig//linux/drivers/char/fusion/shmpool.c 2008-09-29 12:20:44.000000000 +0200
-+++ linux-fusion-8.0.2/linux/drivers/char/fusion/shmpool.c 2009-01-11 17:00:19.000000000 +0100
-@@ -20,6 +20,8 @@
- #include <linux/slab.h>
- #include <linux/smp_lock.h>
- #include <linux/sched.h>
-+#include <asm/page.h>
-+#include <linux/mm.h>
-
- #include <linux/fusion.h>
-
-@@ -28,8 +30,6 @@
- #include "list.h"
- #include "shmpool.h"
-
--
--
- typedef struct {
- FusionLink link;
- unsigned long next_base;
-diff -urN linux-fusion-8.0.2-0rig//Makefile linux-fusion-8.0.2/Makefile
---- linux-fusion-8.0.2-0rig//Makefile 2008-09-29 12:20:44.000000000 +0200
-+++ linux-fusion-8.0.2/Makefile 2009-01-11 18:07:54.000000000 +0100
-@@ -17,13 +17,15 @@
-
-
- DESTDIR ?= $(SYSROOT)
--
-+HEADERDIR ?= $(SYSROOT)
-+# This location is valid for at least 2.6.27.10
-+KERNEL_FUSION_LIB=$(KERNEL_MODLIB)/kernel/drivers/char/fusion
-
- SUB = linux/drivers/char/fusion
-
- export CONFIG_FUSION_DEVICE=m
-
--
-+ARCH=$(ARCH)
- ifeq ($(DEBUG),yes)
- CPPFLAGS += -DFUSION_DEBUG_SKIRMISH_DEADLOCK
- endif
-@@ -45,25 +47,41 @@
- ln -s Makefile-2.$(K_PATCHLEVEL) $(SUB)/Makefile
- ifeq ($(call check-version,2,6,24),1)
- $(MAKE) -C $(KERNEL_BUILD) \
-- KCPPFLAGS="$(CPPFLAGS) -I`pwd`/linux/include" \
-+ ARCH=$(ARCH) \
-+ CC=$(CROSS_COMPILE)gcc \
-+ AS=$(CROSS_COMPILE)as \
-+ KCPPFLAGS="$(CPPFLAGS) \
-+ -I`pwd`/linux/include \
-+ -I$(KERNEL_SOURCE)/include \
-+ -I$(KERNEL_SOURCE)/arch/$(ARCH)/include" \
- SUBDIRS=`pwd`/$(SUB) modules
- else
- $(MAKE) -C $(KERNEL_BUILD) \
-- CPPFLAGS="$(CPPFLAGS) -D__KERNEL__ -I`pwd`/linux/include -I$(KERNEL_BUILD)/include -I$(KERNEL_SOURCE)/include $(AUTOCONF_H)" \
-+ ARCH=$(ARCH) \
-+ CC=$(CROSS_COMPILE)gcc \
-+ AS=$(CROSS_COMPILE)as \
-+ CPPFLAGS="$(CPPFLAGS) \
-+ -I`pwd`/linux/include \
-+ -I$(KERNEL_BUILD)/include \
-+ -I$(KERNEL_SOURCE)/include \
-+ -I$(KERNEL_SOURCE)/arch/$(ARCH)/include \
-+ $(AUTOCONF_H)" \
- SUBDIRS=`pwd`/$(SUB) modules
- endif
-
--install: all
-+#-D__KERNEL__
-+#-DHAVE_LINUX_CONFIG_H \
-+
-+install: all install-header
- install -d $(DESTDIR)/usr/include/linux
- install -m 644 linux/include/linux/fusion.h $(DESTDIR)/usr/include/linux
--
-- install -d $(DESTDIR)$(KERNEL_MODLIB)/drivers/char/fusion
-+ install -d $(DESTDIR)$(KERNEL_FUSION_LIB)
-
- ifeq ($(K_PATCHLEVEL),4)
-- install -m 644 $(SUB)/fusion.o $(DESTDIR)$(KERNEL_MODLIB)/drivers/char/fusion
-+ install -m 644 $(SUB)/fusion.o $(DESTDIR)$(KERNEL_FUSION_LIB)
- rm -f $(DESTDIR)$(KERNEL_MODLIB)/fusion.o
- else
-- install -m 644 $(SUB)/fusion.ko $(DESTDIR)$(KERNEL_MODLIB)/drivers/char/fusion
-+ install -m 644 $(SUB)/fusion.ko $(DESTDIR)$(KERNEL_FUSION_LIB)
- rm -f $(DESTDIR)$(KERNEL_MODLIB)/fusion.ko
- endif
- ifneq ($(strip $(DESTDIR)),)
-@@ -72,6 +90,8 @@
- /sbin/depmod -ae $(KERNEL_VERSION)
- endif
-
-+install-header:
-+ install -m 644 linux/include/linux/fusion.h $(HEADERDIR)/usr/include/linux
-
-
- clean:
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index 058e965..abce465 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -3,77 +3,55 @@
# linux-fusion
#
#############################################################
-LINUX_FUSION_VERSION = 8.0.2
+LINUX_FUSION_VERSION = 8.1.1
LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
-LINUX_FUSION_SITE = http://www.directfb.org/downloads/Core/
-LINUX_FUSION_AUTORECONF = NO
+LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
LINUX_FUSION_INSTALL_STAGING = YES
LINUX_FUSION_INSTALL_TARGET = YES
# BR2_LINUX26_VERSION is not really dependable
# LINUX26_VERSION is not yet set.
# Retrieve REAL kernel version from file.
-LINUX_FOR_FUSION=`cat $(BUILD_DIR)/.linux-version`
+LINUX_FOR_FUSION=$(LINUX_VERSION)
+# `cat $(BUILD_DIR)/.linux-version`
+LINUX_FUSION_ETC_DIR=$(TARGET_DIR)/etc/udev/rules.d
-LINUX_FUSION_DIR:=$(BUILD_DIR)/linux-fusion-$(LINUX_FUSION_VERSION)
-LINUX_FUSION_ETC_DIR:=$(TARGET_DIR)/etc/udev/rules.d
+LINUX_FUSION_CAT=$(ZCAT)
-LINUX_FUSION_CAT:=$(ZCAT)
-
-LINUX_FUSION_MAKE_OPTS:= KERNEL_VERSION=$(LINUX_FOR_FUSION)
+LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION)
LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(BUILD_DIR)/linux-$(LINUX_FOR_FUSION)
LINUX_FUSION_MAKE_OPTS += KERNEL_SOURCE=$(BUILD_DIR)/linux-$(LINUX_FOR_FUSION)
LINUX_FUSION_MAKE_OPTS += SYSROOT=$(STAGING_DIR)
-LINUX_FUSION_MAKE_OPTS += ARCH=$(BR2_ARCH)
+LINUX_FUSION_MAKE_OPTS += ARCH=$(KERNEL_ARCH)
LINUX_FUSION_MAKE_OPTS += CROSS_COMPILE=$(TARGET_CROSS)
LINUX_FUSION_MAKE_OPTS += KERNEL_MODLIB=/lib/modules/$(LINUX_FOR_FUSION)
LINUX_FUSION_MAKE_OPTS += DESTDIR=$(BUILD_DIR)/root
LINUX_FUSION_MAKE_OPTS += HEADERDIR=$(STAGING_DIR)
-#LINUX_FUSION_MAKE_OPTS +=
+#LINUX_FUSION_MAKE_OPTS +=
#LINUX_FUSION_MAKE_OPTS += __KERNEL__=$(LINUX26_VERSION)
-$(DL_DIR)/$(LINUX_FUSION_SOURCE):
- $(call DOWNLOAD,$(LINUX_FUSION_SITE),$(LINUX_FUSION_SOURCE))
-
-$(LINUX_FUSION_DIR)/.unpacked: $(DL_DIR)/$(LINUX_FUSION_SOURCE)
- $(LINUX_FUSION_CAT) $(DL_DIR)/$(LINUX_FUSION_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LINUX_FUSION_DIR) package/linux-fusion/ linux-fusion\*.patch
- touch $@
-$(LINUX_FUSION_DIR)/.install: $(LINUX_FUSION_DIR)/.unpacked
+define LINUX_FUSION_INSTALL_STAGING_CMDS
mkdir -p $(STAGING_DIR)/lib/modules/$(LINUX_FOR_FUSION)/source/include/linux
- echo "LINUX=$(LINUX26_VERSION)"
$(MAKE) $(TARGET_CONFIGURE_OPTS) \
$(LINUX_FUSION_MAKE_OPTS) \
- -C $(LINUX_FUSION_DIR) install
- rm -f $(TARGET_DIR)/usr/include/linux/fusion.h
+ INSTALL_MOD_PATH=$(STAGING_DIR) \
+ -C $(@D) headers_install
+endef
+
+define LINUX_FUSION_INSTALL_TARGET_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+ $(LINUX_FUSION_MAKE_OPTS) \
+ INSTALL_MOD_PATH=$(TARGET_DIR) \
+ -C $(@D) install
mkdir -p $(LINUX_FUSION_ETC_DIR)
cp -dpf package/linux-fusion/40-fusion.rules $(LINUX_FUSION_ETC_DIR)
- touch $@
-
-
-linux-fusion-source: $(DL_DIR)/$(LINUX_FUSION_SOURCE)
+endef
-linux-fusion-unpacked: $(LINUX_FUSION_DIR)/.unpacked
-
-linux-fusion: linux26 $(LINUX_FUSION_DIR)/.install
-
-linux-fusion-clean:
- -$(MAKE) -C $(LINUX_FUSION_DIR) clean
- rm -f $(STAGING_DIR)/usr/include/linux/fusion.h
- rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_FOR_FUSION)/drivers/char/fusion
- rm -f $(LINUX_FUSION_DIR)/.install
-
-linux-fusion-dirclean:
- rm -rf $(LINUX_FUSION_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LINUX_FUSION),y)
-TARGETS+=linux-fusion
-endif
+define LINUX_FUSION_UNINSTALL_TARGET_UDEV
+ rm -f $(LINUX_FUSION_ETC_DIR)/40-fusion.rules
+endef
+$(eval $(call GENTARGETS,package,linux-fusion))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 26/41] linux-fusion: bump to 8.1.1
2010-04-13 23:05 ` [Buildroot] [PATCH 26/41] linux-fusion: bump to 8.1.1 llandwerlin at gmail.com
@ 2010-04-14 8:16 ` Peter Korsgaard
2010-04-14 8:35 ` Lionel Landwerlin
0 siblings, 1 reply; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 8:16 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
You should probably also mention in the commit msg that you've converted
it to GENTARGETS.
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> +define LINUX_FUSION_UNINSTALL_TARGET_UDEV
llandwerlin> + rm -f $(LINUX_FUSION_ETC_DIR)/40-fusion.rules
llandwerlin> +endef
This doesn't seem to be referred from anywhere?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 26/41] linux-fusion: bump to 8.1.1
2010-04-14 8:16 ` Peter Korsgaard
@ 2010-04-14 8:35 ` Lionel Landwerlin
0 siblings, 0 replies; 73+ messages in thread
From: Lionel Landwerlin @ 2010-04-14 8:35 UTC (permalink / raw)
To: buildroot
On Wed, Apr 14, 2010 at 10:16 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "llandwerlin" == llandwerlin ?<llandwerlin@gmail.com> writes:
>
> You should probably also mention in the commit msg that you've converted
> it to GENTARGETS.
>
> ?llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> ?llandwerlin> +define LINUX_FUSION_UNINSTALL_TARGET_UDEV
> ?llandwerlin> + rm -f $(LINUX_FUSION_ETC_DIR)/40-fusion.rules
> ?llandwerlin> +endef
>
> This doesn't seem to be referred from anywhere?
>
Thx !
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 27/41] linux-fusion: drop target installation option (it's on by default)
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (25 preceding siblings ...)
2010-04-13 23:05 ` [Buildroot] [PATCH 26/41] linux-fusion: bump to 8.1.1 llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-14 8:16 ` Peter Korsgaard
2010-04-13 23:06 ` [Buildroot] [PATCH 28/41] valgrind: conversion to autotool infrastructure llandwerlin at gmail.com
` (13 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/linux-fusion/linux-fusion.mk | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index abce465..4dbf45e 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -7,7 +7,6 @@ LINUX_FUSION_VERSION = 8.1.1
LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
LINUX_FUSION_INSTALL_STAGING = YES
-LINUX_FUSION_INSTALL_TARGET = YES
# BR2_LINUX26_VERSION is not really dependable
# LINUX26_VERSION is not yet set.
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 27/41] linux-fusion: drop target installation option (it's on by default)
2010-04-13 23:06 ` [Buildroot] [PATCH 27/41] linux-fusion: drop target installation option (it's on by default) llandwerlin at gmail.com
@ 2010-04-14 8:16 ` Peter Korsgaard
0 siblings, 0 replies; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 8:16 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> ---
llandwerlin> package/linux-fusion/linux-fusion.mk | 1 -
llandwerlin> 1 files changed, 0 insertions(+), 1 deletions(-)
llandwerlin> diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
llandwerlin> index abce465..4dbf45e 100644
llandwerlin> --- a/package/linux-fusion/linux-fusion.mk
llandwerlin> +++ b/package/linux-fusion/linux-fusion.mk
llandwerlin> @@ -7,7 +7,6 @@ LINUX_FUSION_VERSION = 8.1.1
llandwerlin> LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
llandwerlin> LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
llandwerlin> LINUX_FUSION_INSTALL_STAGING = YES
llandwerlin> -LINUX_FUSION_INSTALL_TARGET = YES
You might as well just not add it in patch #26.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 28/41] valgrind: conversion to autotool infrastructure
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (26 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 27/41] linux-fusion: drop target installation option (it's on by default) llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 29/41] valgrind: bump to 3.5.0 llandwerlin at gmail.com
` (12 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/valgrind/valgrind.mk | 97 ++++++++++--------------------------------
1 files changed, 23 insertions(+), 74 deletions(-)
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 5bf0a9d..ef36023 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -4,85 +4,34 @@
#
#############################################################
-VALGRIND_VERSION=3.2.3
-VALGRIND_SITE:=http://valgrind.org/downloads/
-VALGRIND_DIR:=$(BUILD_DIR)/valgrind-$(VALGRIND_VERSION)
-VALGRIND_SOURCE:=valgrind-$(VALGRIND_VERSION).tar.bz2
-VALGRIND_CAT:=$(BZCAT)
-
-$(DL_DIR)/$(VALGRIND_SOURCE):
- $(call DOWNLOAD,$(VALGRIND_SITE),$(VALGRIND_SOURCE))
-
-$(VALGRIND_DIR)/.unpacked: $(DL_DIR)/$(VALGRIND_SOURCE)
- $(VALGRIND_CAT) $(DL_DIR)/$(VALGRIND_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(VALGRIND_DIR)/.unpacked
-
-$(VALGRIND_DIR)/.patched: $(VALGRIND_DIR)/.unpacked
- toolchain/patch-kernel.sh $(VALGRIND_DIR) package/valgrind/ valgrind\*.patch
- touch $(VALGRIND_DIR)/.patched
-
-$(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched
- (cd $(VALGRIND_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- CC="$(TARGET_CC) $(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include" \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- $(DISABLE_NLS) \
- --without-uiout --disable-valgrindmi \
- --disable-tui --disable-valgrindtk \
- --without-x --without-included-gettext \
- --disable-tls \
- )
- touch $(VALGRIND_DIR)/.configured
-
-$(VALGRIND_DIR)/coregrind/valgrind: $(VALGRIND_DIR)/.configured
- $(MAKE) -C $(VALGRIND_DIR)
- touch -c $@
-
-$(TARGET_DIR)/usr/bin/valgrind: $(VALGRIND_DIR)/coregrind/valgrind
- $(MAKE) \
- prefix=$(TARGET_DIR)/usr \
- exec_prefix=$(TARGET_DIR)/usr \
- bindir=$(TARGET_DIR)/usr/bin \
- sbindir=$(TARGET_DIR)/usr/sbin \
- libexecdir=$(TARGET_DIR)/usr/lib \
- datadir=$(TARGET_DIR)/usr/share \
- sysconfdir=$(TARGET_DIR)/etc \
- sharedstatedir=$(TARGET_DIR)/usr/com \
- localstatedir=$(TARGET_DIR)/var \
- libdir=$(TARGET_DIR)/usr/lib \
- infodir=$(TARGET_DIR)/usr/info \
- mandir=$(TARGET_DIR)/usr/man \
- includedir=$(TARGET_DIR)/usr/include \
- -C $(VALGRIND_DIR) install
+VALGRIND_VERSION = 3.2.3
+VALGRIND_SITE = http://valgrind.org/downloads/
+VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
+
+VALGRIND_CONF_OPT = \
+ --without-uiout \
+ --disable-valgrindmi \
+ --disable-tui \
+ --disable-valgrindtk \
+ --without-x \
+ --without-included-gettext \
+ --disable-tls
+
+define VALGRIND_EXTRA_INSTALL
mv $(TARGET_DIR)/usr/bin/valgrind $(TARGET_DIR)/usr/bin/valgrind.bin
cp package/valgrind/uclibc.supp $(TARGET_DIR)/usr/lib/valgrind/
cp package/valgrind/valgrind.sh $(TARGET_DIR)/usr/bin/valgrind
chmod a+x $(TARGET_DIR)/usr/bin/valgrind
- rm -rf $(TARGET_DIR)/usr/share/doc/valgrind
- touch -c $@
+endef
-valgrind: $(TARGET_DIR)/usr/bin/valgrind
+VALGRIND_POST_TARGET_INSTALL_HOOK += VALGRIND_EXTRA_INSTALL
-valgrind-source: $(DL_DIR)/$(VALGRIND_SOURCE)
+define VALGRIND_EXTRA_UNINSTALL
+ rm -f $(TARGET_DIR)/usr/bin/valgrind.bin
+ rm -f $(TARGET_DIR)/usr/bin/valgrind/valgrind.sh
+ rm -f $(TARGET_DIR)/usr/lib/valgrind/uclibc.supp
+endef
-valgrind-clean:
- -$(MAKE) -C $(VALGRIND_DIR) clean
- -rm -f $(TARGET_DIR)/usr/bin/valgrind*
- rm -rf $(TARGET_DIR)/usr/lib/valgrind
+VALGRIND_POST_UNINSTALL_TARGET_HOOKS += VALGRIND_EXTRA_UNINSTALL
-valgrind-dirclean:
- rm -rf $(VALGRIND_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_VALGRIND),y)
-TARGETS+=valgrind
-endif
+$(eval $(call AUTOTARGETS,package,valgrind))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 29/41] valgrind: bump to 3.5.0
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (27 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 28/41] valgrind: conversion to autotool infrastructure llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 30/41] webkit: setup icu-config util path llandwerlin at gmail.com
` (11 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/valgrind/valgrind-largefile.patch | 27 ----
package/valgrind/valgrind.mk | 7 +-
package/valgrind/valgrind.patch | 205 -----------------------------
3 files changed, 6 insertions(+), 233 deletions(-)
delete mode 100644 package/valgrind/valgrind-largefile.patch
delete mode 100644 package/valgrind/valgrind.patch
diff --git a/package/valgrind/valgrind-largefile.patch b/package/valgrind/valgrind-largefile.patch
deleted file mode 100644
index 9ef5708..0000000
--- a/package/valgrind/valgrind-largefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-[PATCH] valgrind: don't enable largefile support unconditionally on uClibc
-
-uClibc can be compiled without largefile support (and errors out if
-_FILE_OFFSET_BITS is set to 64), so don't define it if that combination
-is detected.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- coregrind/m_ume.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: valgrind-3.2.3/coregrind/m_ume.c
-===================================================================
---- valgrind-3.2.3.orig/coregrind/m_ume.c
-+++ valgrind-3.2.3/coregrind/m_ume.c
-@@ -31,7 +31,11 @@
-
-
- #define _GNU_SOURCE
-+#include <features.h>
-+/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
- #define _FILE_OFFSET_BITS 64
-+#endif
-
- // It seems that on SuSE 9.1 (x86) something in <fcntl.h> messes up stuff
- // acquired indirectly from vki-x86-linux.h. Therefore our headers must be
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index ef36023..29d0691 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -4,10 +4,15 @@
#
#############################################################
-VALGRIND_VERSION = 3.2.3
+VALGRIND_VERSION = 3.5.0
VALGRIND_SITE = http://valgrind.org/downloads/
VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
+VALGRIND_CONF_ENV = \
+ ac_cv_file__proc_self_fd=yes \
+ ac_cv_file__proc_self_exe=yes \
+ ac_cv_file__proc_self_maps=yes
+
VALGRIND_CONF_OPT = \
--without-uiout \
--disable-valgrindmi \
diff --git a/package/valgrind/valgrind.patch b/package/valgrind/valgrind.patch
deleted file mode 100644
index afdd53e..0000000
--- a/package/valgrind/valgrind.patch
+++ /dev/null
@@ -1,205 +0,0 @@
---- valgrind/coregrind/m_syswrap/syswrap-amd64-linux.c.orig 2006-08-02 16:51:51.000000000 -0600
-+++ valgrind/coregrind/m_syswrap/syswrap-amd64-linux.c 2006-08-02 16:53:19.000000000 -0600
-@@ -1124,7 +1124,7 @@
- GENXY(__NR_times, sys_times), // 100
- PLAXY(__NR_ptrace, sys_ptrace), // 101
- GENX_(__NR_getuid, sys_getuid), // 102
-- // (__NR_syslog, sys_syslog), // 103
-+ LINXY(__NR_syslog, sys_syslog), // 103
- GENX_(__NR_getgid, sys_getgid), // 104
-
- GENX_(__NR_setuid, sys_setuid), // 105
---- valgrind/include/vki-linux.h.orig 2006-08-02 18:22:21.000000000 -0600
-+++ valgrind/include/vki-linux.h 2006-08-02 18:38:02.000000000 -0600
-@@ -1556,7 +1556,9 @@
-
- #define VKI_BLKROSET _VKI_IO(0x12,93) /* set device read-only (0 = read-write) */
- #define VKI_BLKROGET _VKI_IO(0x12,94) /* get read-only status (0 = read_write) */
-+#define VKI_BLKRRPART _VKI_IO(0x12,95) /* re-read partition table */
- #define VKI_BLKGETSIZE _VKI_IO(0x12,96) /* return device size /512 (long *arg) */
-+#define VKI_BLKFLSBUF _VKI_IO(0x12,97) /* flush buffer cache */
- #define VKI_BLKRASET _VKI_IO(0x12,98) /* set read ahead for block device */
- #define VKI_BLKRAGET _VKI_IO(0x12,99) /* get current read ahead setting */
- #define VKI_BLKFRASET _VKI_IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
-@@ -1631,6 +1633,54 @@
- //#define SG_GET_COMMAND_Q 0x2270 /* Yields 0 (queuing off) or 1 (on) */
- #define VKI_SG_SET_COMMAND_Q 0x2271 /* Change queuing state with 0 or 1 */
-
-+
-+typedef struct vki_scsi_idlun
-+{
-+ int mux4;
-+ int host_unique_id;
-+
-+} vki_scsi_idlun_t;
-+#define VKI_SCSI_IOCTL_GET_IDLUN 0x5382 /* Gets a struct vki_scsi_idlun */
-+#define VKI_SCSI_IOCTL_PROBE_HOST 0x5385 /* Gets an arrary describing the SCSI host */
-+#define VKI_SCSI_IOCTL_GET_BUS_NUMBER 0x5386 /* Get the bus number for a device */
-+
-+//----------------------------------------------------------------------
-+// From linux-2.6.8.1/include/linux/fd.h
-+//----------------------------------------------------------------------
-+#define VKI_FDRESET 0x254 /* Takes an int by value */
-+#define VKI_FDGETDRVTYP 0x20f /* Returns char floppy_drive_name[16] */
-+typedef struct vki_floppy_drive_struct {
-+ unsigned long flags;
-+ unsigned long spinup_date;
-+ unsigned long select_date;
-+ unsigned long first_read_date;
-+ short probed_format;
-+ short track;
-+ short maxblock;
-+ short maxtrack;
-+ int generation;
-+ int keep_data;
-+ int fd_ref;
-+ int fd_device;
-+ unsigned long last_checked;
-+ char *dmabuf;
-+ int bufblocks;
-+} vki_floppy_drive_struct_t;
-+#define VKI_FDPOLLDRVSTAT 0x213 /* returns a struct floppy_drive_struct */
-+typedef struct vki_floppy_struct {
-+ unsigned int size;
-+ unsigned int sect;
-+ unsigned int head;
-+ unsigned int track;
-+ unsigned int stretch;
-+ unsigned char gap;
-+ unsigned char rate;
-+ unsigned char spec1;
-+ unsigned char fmt_gap;
-+ const char * name;
-+} vki_floppy_struct_t;
-+#define VKI_FDGETPRM 0x204 /* returns a struct floppy_struct */
-+
- //----------------------------------------------------------------------
- // From linux-2.6.8.1/include/linux/cdrom.h
- //----------------------------------------------------------------------
-@@ -1640,6 +1690,7 @@
- (struct cdrom_tochdr) */
- #define VKI_CDROMREADTOCENTRY 0x5306 /* Read TOC entry
- (struct cdrom_tocentry) */
-+#define VKI_CDROMEJECT 0x5309 /* Eject cdrom media */
- #define VKI_CDROMSUBCHNL 0x530b /* Read subchannel data
- (struct cdrom_subchnl) */
- #define VKI_CDROMREADMODE2 0x530c /* Read CDROM mode 2 data (2336 Bytes)
---- valgrind/coregrind/m_syswrap/syswrap-generic.c.orig 2006-08-02 18:22:13.000000000 -0600
-+++ valgrind/coregrind/m_syswrap/syswrap-generic.c 2006-08-02 18:43:49.000000000 -0600
-@@ -3227,6 +3227,33 @@
- case VKI_SG_GET_SG_TABLESIZE: /* 0x227f */
- PRE_MEM_WRITE( "ioctl(SG_GET_SG_TABLESIZE)", ARG3, sizeof(int) );
- break;
-+ case VKI_SCSI_IOCTL_GET_IDLUN:
-+ PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_GET_IDLUN)", ARG3, sizeof(vki_scsi_idlun_t) );
-+ break;
-+ case VKI_SCSI_IOCTL_PROBE_HOST:
-+ {
-+ int arraylen;
-+ char *array = (char*)ARG3;
-+ PRE_MEM_READ("ioctl(SCSI_IOCTL_PROBE_HOST)", ARG3, sizeof(char)*4 );
-+ arraylen = array[0] + (array[1]<<8) + (array[2]<<16) + (array[3]<<24);
-+ PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_PROBE_HOST)", ARG3, sizeof(char)*arraylen );
-+ }
-+ break;
-+ case VKI_SCSI_IOCTL_GET_BUS_NUMBER:
-+ PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_GET_BUS_NUMBER)", ARG3, sizeof(int) );
-+ break;
-+
-+ case VKI_FDRESET:
-+ break;
-+ case VKI_FDGETDRVTYP:
-+ PRE_MEM_WRITE( "ioctl(FDGETDRVTYP)", ARG3, sizeof(char)*16 );
-+ break;
-+ case VKI_FDPOLLDRVSTAT:
-+ PRE_MEM_WRITE( "ioctl(FDPOLLDRVSTAT)", ARG3, sizeof(vki_floppy_drive_struct_t) );
-+ break;
-+ case VKI_FDGETPRM:
-+ PRE_MEM_WRITE( "ioctl(FDGETPRM)", ARG3, sizeof(vki_floppy_struct_t) );
-+ break;
-
- case VKI_IIOCGETCPS:
- PRE_MEM_WRITE( "ioctl(IIOCGETCPS)", ARG3,
-@@ -3550,6 +3578,8 @@
- case VKI_BLKROGET:
- PRE_MEM_WRITE( "ioctl(BLKROGET)", ARG3, sizeof(int));
- break;
-+ case VKI_BLKRRPART:
-+ break;
- case VKI_BLKGETSIZE:
- PRE_MEM_WRITE( "ioctl(BLKGETSIZE)", ARG3, sizeof(unsigned long));
- break;
-@@ -3558,6 +3588,8 @@
- case VKI_BLKRAGET:
- PRE_MEM_WRITE( "ioctl(BLKRAGET)", ARG3, sizeof(long));
- break;
-+ case VKI_BLKFLSBUF:
-+ break;
- case VKI_BLKFRASET:
- break;
- case VKI_BLKFRAGET:
-@@ -3624,6 +3656,8 @@
- PRE_MEM_WRITE( "ioctl(CDROMREADTOCENTRY)", ARG3,
- sizeof(struct vki_cdrom_tocentry));
- break;
-+ case VKI_CDROMEJECT:
-+ break;
- case VKI_CDROMMULTISESSION: /* 0x5310 */
- PRE_MEM_WRITE( "ioctl(CDROMMULTISESSION)", ARG3,
- sizeof(struct vki_cdrom_multisession));
-@@ -4042,6 +4076,28 @@
- case VKI_SG_GET_SG_TABLESIZE:
- POST_MEM_WRITE(ARG3, sizeof(int));
- break;
-+ case VKI_SCSI_IOCTL_GET_IDLUN:
-+ POST_MEM_WRITE(ARG3, sizeof(vki_scsi_idlun_t));
-+ break;
-+ case VKI_SCSI_IOCTL_PROBE_HOST:
-+ if (RES > 0 && ARG3 )
-+ POST_MEM_WRITE(ARG3, sizeof(char)*RES);
-+ break;
-+ case VKI_SCSI_IOCTL_GET_BUS_NUMBER:
-+ POST_MEM_WRITE(ARG3, sizeof(int));
-+ break;
-+
-+ case VKI_FDRESET:
-+ break;
-+ case VKI_FDGETDRVTYP:
-+ POST_MEM_WRITE( ARG3, sizeof(char)*16 );
-+ break;
-+ case VKI_FDPOLLDRVSTAT:
-+ POST_MEM_WRITE( ARG3, sizeof(vki_floppy_drive_struct_t) );
-+ break;
-+ case VKI_FDGETPRM:
-+ POST_MEM_WRITE( ARG3, sizeof(vki_floppy_struct_t) );
-+ break;
-
- case VKI_IIOCGETCPS:
- POST_MEM_WRITE( ARG3, VKI_ISDN_MAX_CHANNELS * 2 * sizeof(unsigned long) );
-@@ -4260,6 +4317,8 @@
- case VKI_BLKROGET:
- POST_MEM_WRITE(ARG3, sizeof(int));
- break;
-+ case VKI_BLKRRPART:
-+ break;
- case VKI_BLKGETSIZE:
- POST_MEM_WRITE(ARG3, sizeof(unsigned long));
- break;
-@@ -4268,6 +4327,8 @@
- case VKI_BLKRAGET:
- POST_MEM_WRITE(ARG3, sizeof(long));
- break;
-+ case VKI_BLKFLSBUF:
-+ break;
- case VKI_BLKFRASET:
- break;
- case VKI_BLKFRAGET:
-@@ -4309,6 +4370,8 @@
- case VKI_CDROMREADTOCENTRY:
- POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_tocentry));
- break;
-+ case VKI_CDROMEJECT:
-+ break;
- case VKI_CDROMMULTISESSION:
- POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_multisession));
- break;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 30/41] webkit: setup icu-config util path
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (28 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 29/41] valgrind: bump to 3.5.0 llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 31/41] webkit: drop target installation option (it's on by default) llandwerlin at gmail.com
` (10 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/webkit/webkit.mk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 2121f4b..0402f9a 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -24,6 +24,8 @@ endif
WEBKIT_CONF_OPT += --disable-video
+WEBKIT_CONF_ENV = icu_config=$(STAGING_DIR)/usr/bin/icu-config
+
define WEBKIT_AUTOGEN_PATCH
$(SED) 's%ACLOCAL_FLAGS=.*%ACLOCAL_FLAGS="-I autotools -I $(STAGING_DIR)/usr/share/aclocal"%' $(WEBKIT_DIR)/autogen.sh
$(SED) 's/AUTOMAKE_FLAGS=.*/AUTOMAKE_FLAGS="--foreign --add-missing --copy"/' $(WEBKIT_DIR)/autogen.sh
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 31/41] webkit: drop target installation option (it's on by default)
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (29 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 30/41] webkit: setup icu-config util path llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 32/41] package: add libgnutls package llandwerlin at gmail.com
` (9 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/webkit/webkit.mk | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 0402f9a..a3ba690 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -8,7 +8,6 @@ WEBKIT_SOURCE = WebKit-$(WEBKIT_VERSION).tar.bz2
WEBKIT_SITE = http://nightly.webkit.org/files/trunk/src/
WEBKIT_INSTALL_STAGING = YES
-WEBKIT_INSTALL_TARGET = YES
WEBKIT_LIBTOOL_PATCH = NO
WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 32/41] package: add libgnutls package
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (30 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 31/41] webkit: drop target installation option (it's on by default) llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-14 7:56 ` Peter Korsgaard
2010-04-14 15:26 ` Thomas Petazzoni
2010-04-13 23:06 ` [Buildroot] [PATCH 33/41] libsoup: bump to 2.28.2 llandwerlin at gmail.com
` (8 subsequent siblings)
40 siblings, 2 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/Config.in | 1 +
package/libgnutls/Config.in | 9 +++++++++
package/libgnutls/libgnutls.mk | 18 ++++++++++++++++++
3 files changed, 28 insertions(+), 0 deletions(-)
create mode 100644 package/libgnutls/Config.in
create mode 100644 package/libgnutls/libgnutls.mk
diff --git a/package/Config.in b/package/Config.in
index 582d435..5b951a6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -225,6 +225,7 @@ endmenu
menu "Crypto"
source "package/beecrypt/Config.in"
source "package/libgcrypt/Config.in"
+source "package/libgnutls/Config.in"
source "package/libgpg-error/Config.in"
source "package/openssl/Config.in"
endmenu
diff --git a/package/libgnutls/Config.in b/package/libgnutls/Config.in
new file mode 100644
index 0000000..b323912
--- /dev/null
+++ b/package/libgnutls/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBGNUTLS
+ bool "libgnutls"
+ select BR2_PACKAGE_LIBGCRYPT
+ help
+ GNUTLS implements the TLS/SSL (Transport Layer Security aka
+ Secure Sockets Layer) protocol. Gnutls is a GNU project.
+ More up to date information can be found at
+
+ http://www.gnu.org/software/gnutls/
diff --git a/package/libgnutls/libgnutls.mk b/package/libgnutls/libgnutls.mk
new file mode 100644
index 0000000..34f6384
--- /dev/null
+++ b/package/libgnutls/libgnutls.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# libgnutls
+#
+#############################################################
+
+LIBGNUTLS_VERSION = 2.8.6
+LIBGNUTLS_SOURCE = gnutls-$(LIBGNUTLS_VERSION).tar.bz2
+LIBGNUTLS_SITE = http://ftp.gnu.org/pub/gnu/gnutls
+LIBGNUTLS_LIBTOOL_PATCH = NO
+LIBGNUTLS_INSTALL_STAGING = YES
+
+LIBGNUTLS_DEPENDENCIES = libgcrypt
+
+LIBGNUTLS_CONF_OPT = \
+ --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+
+$(eval $(call AUTOTARGETS,package,libgnutls))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 32/41] package: add libgnutls package
2010-04-13 23:06 ` [Buildroot] [PATCH 32/41] package: add libgnutls package llandwerlin at gmail.com
@ 2010-04-14 7:56 ` Peter Korsgaard
2010-04-14 15:26 ` Thomas Petazzoni
1 sibling, 0 replies; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 7:56 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
Hi,
llandwerlin> +++ b/package/libgnutls/Config.in
llandwerlin> @@ -0,0 +1,9 @@
llandwerlin> +config BR2_PACKAGE_LIBGNUTLS
llandwerlin> + bool "libgnutls"
llandwerlin> + select BR2_PACKAGE_LIBGCRYPT
llandwerlin> + help
llandwerlin> + GNUTLS implements the TLS/SSL (Transport Layer Security aka
llandwerlin> + Secure Sockets Layer) protocol. Gnutls is a GNU project.
llandwerlin> + More up to date information can be found at
llandwerlin> +
llandwerlin> + http://www.gnu.org/software/gnutls/
Indentation is also wrong here - The normal options are indented with a
<tab>, and the help text with <tab><space><space>.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 32/41] package: add libgnutls package
2010-04-13 23:06 ` [Buildroot] [PATCH 32/41] package: add libgnutls package llandwerlin at gmail.com
2010-04-14 7:56 ` Peter Korsgaard
@ 2010-04-14 15:26 ` Thomas Petazzoni
1 sibling, 0 replies; 73+ messages in thread
From: Thomas Petazzoni @ 2010-04-14 15:26 UTC (permalink / raw)
To: buildroot
On Wed, 14 Apr 2010 01:06:05 +0200
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Besides Peter's comment on indentation:
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
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] 73+ messages in thread
* [Buildroot] [PATCH 33/41] libsoup: bump to 2.28.2
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (31 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 32/41] package: add libgnutls package llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-14 7:58 ` Peter Korsgaard
2010-04-13 23:06 ` [Buildroot] [PATCH 34/41] libsoup: drop target installation option (it's on by default) llandwerlin at gmail.com
` (7 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Also, remove --disable-gtk-doc (it's already in package/Makefile.in)
and fix libsoup dependencies. When compiled with ssl support it
requires libgnutls and libgcrypt.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libsoup/Config.in | 1 +
package/libsoup/libsoup.mk | 13 ++++++-------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 6bccd11..596a638 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSOUP
bool "libsoup"
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_LIBGNUTLS
help
libsoup is an HTTP client/server library. It uses GObject
and the GLib main loop, to integrate well with GNOME
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 3829a81..2f16408 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -4,10 +4,10 @@
#
#############################################################
-LIBSOUP_MAJOR_VERSION:=2.26
-LIBSOUP_VERSION:=$(LIBSOUP_MAJOR_VERSION).2
-LIBSOUP_SOURCE:=libsoup-$(LIBSOUP_VERSION).tar.bz2
-LIBSOUP_SITE:=http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
+LIBSOUP_MAJOR_VERSION = 2.28
+LIBSOUP_VERSION = $(LIBSOUP_MAJOR_VERSION).2
+LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.bz2
+LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
LIBSOUP_AUTORECONF = YES
LIBSOUP_INSTALL_STAGING = YES
LIBSOUP_INSTALL_TARGET = YES
@@ -23,9 +23,8 @@ LIBSOUP_CONF_OPT = \
--enable-static \
--disable-explicit-deps \
--disable-glibtest \
- --without-gnome \
- --disable-gtk-doc
+ --without-gnome
-LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2
+LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2 libgnutls libgcrypt
$(eval $(call AUTOTARGETS,package,libsoup))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 33/41] libsoup: bump to 2.28.2
2010-04-13 23:06 ` [Buildroot] [PATCH 33/41] libsoup: bump to 2.28.2 llandwerlin at gmail.com
@ 2010-04-14 7:58 ` Peter Korsgaard
2010-05-04 22:15 ` Sven Neumann
0 siblings, 1 reply; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 7:58 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Also, remove --disable-gtk-doc (it's already in package/Makefile.in)
llandwerlin> and fix libsoup dependencies. When compiled with ssl support it
llandwerlin> requires libgnutls and libgcrypt.
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> ---
llandwerlin> package/libsoup/Config.in | 1 +
llandwerlin> package/libsoup/libsoup.mk | 13 ++++++-------
llandwerlin> 2 files changed, 7 insertions(+), 7 deletions(-)
llandwerlin> diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
llandwerlin> index 6bccd11..596a638 100644
llandwerlin> --- a/package/libsoup/Config.in
llandwerlin> +++ b/package/libsoup/Config.in
llandwerlin> @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSOUP
llandwerlin> bool "libsoup"
llandwerlin> select BR2_PACKAGE_LIBXML2
llandwerlin> select BR2_PACKAGE_LIBGLIB2
llandwerlin> + select BR2_PACKAGE_LIBGNUTLS
<tab> please.
llandwerlin> -LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2
llandwerlin> +LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2 libgnutls libgcrypt
So how do you compile it WITHOUT ssl support?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 33/41] libsoup: bump to 2.28.2
2010-04-14 7:58 ` Peter Korsgaard
@ 2010-05-04 22:15 ` Sven Neumann
0 siblings, 0 replies; 73+ messages in thread
From: Sven Neumann @ 2010-05-04 22:15 UTC (permalink / raw)
To: buildroot
On Wed, 2010-04-14 at 09:58 +0200, Peter Korsgaard wrote:
> >>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
>
> llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
> llandwerlin> Also, remove --disable-gtk-doc (it's already in package/Makefile.in)
> llandwerlin> and fix libsoup dependencies. When compiled with ssl support it
> llandwerlin> requires libgnutls and libgcrypt.
>
> llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
> llandwerlin> ---
> llandwerlin> package/libsoup/Config.in | 1 +
> llandwerlin> package/libsoup/libsoup.mk | 13 ++++++-------
> llandwerlin> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> llandwerlin> diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
> llandwerlin> index 6bccd11..596a638 100644
> llandwerlin> --- a/package/libsoup/Config.in
> llandwerlin> +++ b/package/libsoup/Config.in
> llandwerlin> @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSOUP
> llandwerlin> bool "libsoup"
> llandwerlin> select BR2_PACKAGE_LIBXML2
> llandwerlin> select BR2_PACKAGE_LIBGLIB2
> llandwerlin> + select BR2_PACKAGE_LIBGNUTLS
>
> <tab> please.
>
> llandwerlin> -LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2
> llandwerlin> +LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2 libgnutls libgcrypt
>
>
> So how do you compile it WITHOUT ssl support?
I have a patch sitting in our repository that adds
BR2_PACKAGE_LIBSOUP_SSL to make SSL support optional. Would you be
interested in that patch?
I very much hope that we will get the time next week to update our
buildroot tree to the latest version. That would finally allow me to
submit patches again...
Sven
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 34/41] libsoup: drop target installation option (it's on by default)
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (32 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 33/41] libsoup: bump to 2.28.2 llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 35/41] package: add libgail package llandwerlin at gmail.com
` (6 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libsoup/libsoup.mk | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 2f16408..1cd9b9b 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -10,7 +10,6 @@ LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.bz2
LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
LIBSOUP_AUTORECONF = YES
LIBSOUP_INSTALL_STAGING = YES
-LIBSOUP_INSTALL_TARGET = YES
LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 35/41] package: add libgail package
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (33 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 34/41] libsoup: drop target installation option (it's on by default) llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-14 8:13 ` Peter Korsgaard
2010-04-13 23:06 ` [Buildroot] [PATCH 36/41] libgtk2: force to compile png loader in gdk-pixbuf llandwerlin at gmail.com
` (5 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
This package include a patch for directfb support. This patch has been
proposed for upstream integration
(https://bugzilla.gnome.org/show_bug.cgi?id=614199).
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/Config.in | 1 +
package/libgail/Config.in | 15 +++++++
.../libgail-1.22.3-Relax-X11-dependencies.patch | 42 ++++++++++++++++++++
package/libgail/libgail.mk | 28 +++++++++++++
4 files changed, 86 insertions(+), 0 deletions(-)
create mode 100644 package/libgail/Config.in
create mode 100644 package/libgail/libgail-1.22.3-Relax-X11-dependencies.patch
create mode 100644 package/libgail/libgail.mk
diff --git a/package/Config.in b/package/Config.in
index 5b951a6..dc90aa9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -256,6 +256,7 @@ source "package/gtk2-themes/Config.in"
source "package/jpeg/Config.in"
source "package/libart/Config.in"
source "package/libdrm/Config.in"
+source "package/libgail/Config.in"
source "package/libglade/Config.in"
source "package/libgtk12/Config.in"
source "package/libgtk2/Config.in"
diff --git a/package/libgail/Config.in b/package/libgail/Config.in
new file mode 100644
index 0000000..533fb9c
--- /dev/null
+++ b/package/libgail/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBGAIL
+ bool "libgail"
+ select BR2_PACKAGE_GTK2
+ help
+ GAIL provides accessibility support for gtk+ and
+ libgnomecanvas by implementing AtkObjects for widgets in
+ gtk+ and libgnomecanvas. The GAIL library is a GTK+ module.
+ For example, if the module is loaded in a program which
+ calls gtk_widget_get_accessible() for a GtkEntry an instance
+ of GailEntry is returned. This module is normally used with
+ the atk-bridge GTK+ module from at-spi to allow an assistive
+ technology, e.g a screenreader, to query or drive the
+ program.
+
+ http://developer.gnome.org/projects/gap
diff --git a/package/libgail/libgail-1.22.3-Relax-X11-dependencies.patch b/package/libgail/libgail-1.22.3-Relax-X11-dependencies.patch
new file mode 100644
index 0000000..97e5656
--- /dev/null
+++ b/package/libgail/libgail-1.22.3-Relax-X11-dependencies.patch
@@ -0,0 +1,42 @@
+From cca72c48b5643fa62e1d55b7b181e147f5ba7fe9 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin@gmail.com>
+Date: Sun, 28 Mar 2010 21:47:38 +0200
+Subject: [PATCH] Relax X11 dependency
+
+Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
+---
+ configure.in | 4 +++-
+ gail/gailwindow.c | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3801655..abaf417 100644
+--- a/configure.in
++++ b/configure.in
+@@ -86,7 +86,9 @@ GTK_REQUIRED_VERSION=2.9.4
+ PKG_CHECK_MODULES(DEP, $ATK_PACKAGES >= $ATK_REQUIRED_VERSION \
+ $GTK_PACKAGES >= $GTK_REQUIRED_VERSION)
+
+-if test "$gail_native_win32" != "yes"; then
++AC_ARG_ENABLE(x, [ --disable-x disable x11 backend ],x11_backend=no,x11_backend=yes)
++
++if test "$gail_native_win32" != "yes" -a "$x11_backend" != "no"; then
+
+ PKG_CHECK_MODULES(X, x11, :, [
+ # pkg-config modules not found (only present since X11R7 aka Xorg); use
+diff --git a/gail/gailwindow.c b/gail/gailwindow.c
+index 616b25e..add454b 100644
+--- a/gail/gailwindow.c
++++ b/gail/gailwindow.c
+@@ -1071,7 +1071,7 @@ gail_window_get_mdi_zorder (AtkComponent *component)
+ return get_window_zorder (widget->window);
+ }
+
+-#elif defined (GDK_WINDOWING_WIN32)
++#elif defined (GDK_WINDOWING_WIN32) || defined (GDK_WINDOWING_DIRECTFB)
+
+ static gint
+ gail_window_get_mdi_zorder (AtkComponent *component)
+--
+1.7.0.2
+
diff --git a/package/libgail/libgail.mk b/package/libgail/libgail.mk
new file mode 100644
index 0000000..58ff93d
--- /dev/null
+++ b/package/libgail/libgail.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# libgail
+#
+#############################################################
+LIBGAIL_VERSION_MAJOR = 1.22
+LIBGAIL_VERSION_MINOR = 3
+LIBGAIL_VERSION = $(LIBGAIL_VERSION_MAJOR).$(LIBGAIL_VERSION_MINOR)
+LIBGAIL_SOURCE = gail-$(LIBGAIL_VERSION).tar.bz2
+LIBGAIL_SITE = http://ftp.gnome.org/pub/gnome/sources/gail/$(LIBGAIL_VERSION_MAJOR)
+
+LIBGAIL_AUTORECONF = YES
+LIBGAIL_LIBTOOL_PATCH = NO
+LIBGAIL_INSTALL_STAGING = YES
+LIBGAIL_INSTALL_TARGET = YES
+
+LIBGAIL_CONF_OPT = --enable-shared \
+ --enable-static
+
+ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)
+LIBGAIL_CONF_OPT += --disable-x
+endif
+
+LIBGAIL_DEPENDENCIES = libgtk2 pango
+
+HOST_LIBGAIL_DEPENDENCIES = host-pkg-config
+
+$(eval $(call AUTOTARGETS,package,libgail))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 35/41] package: add libgail package
2010-04-13 23:06 ` [Buildroot] [PATCH 35/41] package: add libgail package llandwerlin at gmail.com
@ 2010-04-14 8:13 ` Peter Korsgaard
2010-04-14 8:33 ` Lionel Landwerlin
0 siblings, 1 reply; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 8:13 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> This package include a patch for directfb support. This patch has been
llandwerlin> proposed for upstream integration
llandwerlin> (https://bugzilla.gnome.org/show_bug.cgi?id=614199).
llandwerlin> +++ b/package/libgail/Config.in
llandwerlin> @@ -0,0 +1,15 @@
llandwerlin> +config BR2_PACKAGE_LIBGAIL
llandwerlin> + bool "libgail"
llandwerlin> + select BR2_PACKAGE_GTK2
llandwerlin> + help
llandwerlin> + GAIL provides accessibility support for gtk+ and
llandwerlin> + libgnomecanvas by implementing AtkObjects for widgets in
llandwerlin> + gtk+ and libgnomecanvas. The GAIL library is a GTK+ module.
llandwerlin> + For example, if the module is loaded in a program which
llandwerlin> + calls gtk_widget_get_accessible() for a GtkEntry an instance
llandwerlin> + of GailEntry is returned. This module is normally used with
llandwerlin> + the atk-bridge GTK+ module from at-spi to allow an assistive
llandwerlin> + technology, e.g a screenreader, to query or drive the
llandwerlin> + program.
Indentation wrong from line 2 of help text.
llandwerlin> +
llandwerlin> +ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)
llandwerlin> +LIBGAIL_CONF_OPT += --disable-x
llandwerlin> +endif
llandwerlin> +
llandwerlin> +LIBGAIL_DEPENDENCIES = libgtk2 pango
No host-pkg-config?
llandwerlin> +HOST_LIBGAIL_DEPENDENCIES = host-pkg-config
No libgtk2 / pango?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 35/41] package: add libgail package
2010-04-14 8:13 ` Peter Korsgaard
@ 2010-04-14 8:33 ` Lionel Landwerlin
0 siblings, 0 replies; 73+ messages in thread
From: Lionel Landwerlin @ 2010-04-14 8:33 UTC (permalink / raw)
To: buildroot
On Wed, Apr 14, 2010 at 10:13 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "llandwerlin" == llandwerlin ?<llandwerlin@gmail.com> writes:
>
> ?llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
> ?llandwerlin> This package include a patch for directfb support. This patch has been
> ?llandwerlin> proposed for upstream integration
> ?llandwerlin> (https://bugzilla.gnome.org/show_bug.cgi?id=614199).
>
> ?llandwerlin> +++ b/package/libgail/Config.in
> ?llandwerlin> @@ -0,0 +1,15 @@
> ?llandwerlin> +config BR2_PACKAGE_LIBGAIL
> ?llandwerlin> + bool "libgail"
> ?llandwerlin> + select BR2_PACKAGE_GTK2
> ?llandwerlin> + help
> ?llandwerlin> + ? GAIL provides accessibility support for gtk+ and
> ?llandwerlin> + ? ? ? ? ?libgnomecanvas by implementing AtkObjects for widgets in
> ?llandwerlin> + ? ? ? ? ?gtk+ and libgnomecanvas. The GAIL library is a GTK+ module.
> ?llandwerlin> + ? ? ? ? ?For example, if the module is loaded in a program which
> ?llandwerlin> + ? ? ? ? ?calls gtk_widget_get_accessible() for a GtkEntry an instance
> ?llandwerlin> + ? ? ? ? ?of GailEntry is returned. This module is normally used with
> ?llandwerlin> + ? ? ? ? ?the atk-bridge GTK+ module from at-spi to allow an assistive
> ?llandwerlin> + ? ? ? ? ?technology, e.g a screenreader, to query or drive the
> ?llandwerlin> + ? ? ? ? ?program.
>
> Indentation wrong from line 2 of help text.
>
> ?llandwerlin> +
> ?llandwerlin> +ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)
> ?llandwerlin> +LIBGAIL_CONF_OPT += --disable-x
> ?llandwerlin> +endif
> ?llandwerlin> +
> ?llandwerlin> +LIBGAIL_DEPENDENCIES = libgtk2 pango
>
> No host-pkg-config?
>
> ?llandwerlin> +HOST_LIBGAIL_DEPENDENCIES = host-pkg-config
>
> No libgtk2 / pango?
>
Oops... Will fix, thx
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 36/41] libgtk2: force to compile png loader in gdk-pixbuf
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (34 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 35/41] package: add libgail package llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-14 8:00 ` Peter Korsgaard
2010-04-13 23:06 ` [Buildroot] [PATCH 37/41] libglib2: bump to 2.24.0 llandwerlin at gmail.com
` (4 subsequent siblings)
40 siblings, 1 reply; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libgtk2/libgtk2.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 1e732d0..f041ce2 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -133,6 +133,7 @@ HOST_LIBGTK2_CONF_OPT = \
--disable-glibtest \
--without-libtiff \
--without-libjpeg \
+ --with-included-loaders=png \
--with-gdktarget=none \
--disable-cups \
--disable-debug
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 36/41] libgtk2: force to compile png loader in gdk-pixbuf
2010-04-13 23:06 ` [Buildroot] [PATCH 36/41] libgtk2: force to compile png loader in gdk-pixbuf llandwerlin at gmail.com
@ 2010-04-14 8:00 ` Peter Korsgaard
0 siblings, 0 replies; 73+ messages in thread
From: Peter Korsgaard @ 2010-04-14 8:00 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> ---
llandwerlin> package/libgtk2/libgtk2.mk | 1 +
llandwerlin> 1 files changed, 1 insertions(+), 0 deletions(-)
llandwerlin> diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
llandwerlin> index 1e732d0..f041ce2 100644
llandwerlin> --- a/package/libgtk2/libgtk2.mk
llandwerlin> +++ b/package/libgtk2/libgtk2.mk
llandwerlin> @@ -133,6 +133,7 @@ HOST_LIBGTK2_CONF_OPT = \
llandwerlin> --disable-glibtest \
llandwerlin> --without-libtiff \
llandwerlin> --without-libjpeg \
llandwerlin> + --with-included-loaders=png \
Only for the host? Why?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 73+ messages in thread
* [Buildroot] [PATCH 37/41] libglib2: bump to 2.24.0
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (35 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 36/41] libgtk2: force to compile png loader in gdk-pixbuf llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 38/41] atk: bump to 1.30 llandwerlin at gmail.com
` (3 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libglib2/libglib2.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index f122491..a3cb446 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -3,8 +3,8 @@
# libglib2
#
#############################################################
-LIBGLIB2_VERSION_MAJOR = 2.22
-LIBGLIB2_VERSION_MINOR = 5
+LIBGLIB2_VERSION_MAJOR = 2.24
+LIBGLIB2_VERSION_MINOR = 0
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 [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 38/41] atk: bump to 1.30
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (36 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 37/41] libglib2: bump to 2.24.0 llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 39/41] autoconf: added missing AUTOMAKE variable setting llandwerlin at gmail.com
` (2 subsequent siblings)
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/atk/atk.mk | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index e357f49..6f3a3b6 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -3,11 +3,13 @@
# atk
#
#############################################################
-ATK_VERSION = 1.22.0
+ATK_VERSION_MAJOR = 1.30
+ATK_VERSION = $(ATK_VERSION_MAJOR).0
ATK_SOURCE = atk-$(ATK_VERSION).tar.bz2
-ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/1.22/
+ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)/
ATK_INSTALL_STAGING = YES
ATK_INSTALL_TARGET = YES
+ATK_LIBTOOL_PATCH = NO
ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 39/41] autoconf: added missing AUTOMAKE variable setting
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (37 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 38/41] atk: bump to 1.30 llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 40/41] pango: bump to 1.28 llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 41/41] webkit: bump to 1.2.0 llandwerlin at gmail.com
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/autoconf/autoconf.mk | 2 +-
package/automake/automake.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 81233a5..1c0cc1d 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -27,4 +27,4 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
# variables used by other packages
AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
-AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"
+AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOMAKE="$(AUTOMAKE)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index e413287..7bd1908 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -25,6 +25,6 @@ $(eval $(call AUTOTARGETS,package,automake))
$(eval $(call AUTOTARGETS,package,automake,host))
# variables used by other packages
-AUTOMAKE:=$(HOST_DIR)/usr/bin/automake
+AUTOMAKE = $(HOST_DIR)/usr/bin/automake
ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 40/41] pango: bump to 1.28
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (38 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 39/41] autoconf: added missing AUTOMAKE variable setting llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 41/41] webkit: bump to 1.2.0 llandwerlin at gmail.com
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/pango/pango.mk | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 38e163e..7721676 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -3,9 +3,12 @@
# pango
#
#############################################################
-PANGO_VERSION = 1.20.5
+PANGO_VERSION_MAJOR = 1.28
+PANGO_VERSION_MINOR = 0
+PANGO_VERSION = $(PANGO_VERSION_MAJOR).$(PANGO_VERSION_MINOR)
+
PANGO_SOURCE = pango-$(PANGO_VERSION).tar.bz2
-PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/1.20
+PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR)
PANGO_AUTORECONF = YES
PANGO_INSTALL_STAGING = YES
PANGO_INSTALL_TARGET = YES
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread* [Buildroot] [PATCH 41/41] webkit: bump to 1.2.0
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
` (39 preceding siblings ...)
2010-04-13 23:06 ` [Buildroot] [PATCH 40/41] pango: bump to 1.28 llandwerlin at gmail.com
@ 2010-04-13 23:06 ` llandwerlin at gmail.com
40 siblings, 0 replies; 73+ messages in thread
From: llandwerlin at gmail.com @ 2010-04-13 23:06 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Also add patchs for autoreconf and directfb compilation
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/webkit/Config.in | 1 +
.../webkit-Fix-automake-failure-on-cxx-check.patch | 25 ++++
.../webkit-Fix-compilation-on-DirectFB.patch | 144 ++++++++++++++++++++
package/webkit/webkit.mk | 23 +--
4 files changed, 177 insertions(+), 16 deletions(-)
create mode 100644 package/webkit/webkit-Fix-automake-failure-on-cxx-check.patch
create mode 100644 package/webkit/webkit-Fix-compilation-on-DirectFB.patch
diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 10c8b38..5bd5506 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -11,6 +11,7 @@ config BR2_PACKAGE_WEBKIT
select BR2_PACKAGE_ENCHANT
select BR2_PACKAGE_LIBSOUP
select BR2_PACKAGE_CAIRO_PNG
+ select BR2_PACKAGE_LIBGAIL
help
WebKit is an open source, standards compliant web browser engine.
diff --git a/package/webkit/webkit-Fix-automake-failure-on-cxx-check.patch b/package/webkit/webkit-Fix-automake-failure-on-cxx-check.patch
new file mode 100644
index 0000000..6ba69f8
--- /dev/null
+++ b/package/webkit/webkit-Fix-automake-failure-on-cxx-check.patch
@@ -0,0 +1,25 @@
+From dff75872a4bf38d781ee606df7aa21f5e5cbafaf Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin@gmail.com>
+Date: Sun, 28 Mar 2010 23:35:29 +0200
+Subject: [PATCH] Fix automake failure on cxx check
+
+Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
+---
+ configure.ac | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0d3a7ea..6ddf18a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,6 +82,7 @@ esac
+ WEBKIT_INIT
+ AC_DISABLE_STATIC
+ AC_LIBTOOL_WIN32_DLL
++AC_PROG_CXX
+ AC_PROG_LIBTOOL
+ # use dolt to speedup the build
+ DOLT
+--
+1.7.0.2
+
diff --git a/package/webkit/webkit-Fix-compilation-on-DirectFB.patch b/package/webkit/webkit-Fix-compilation-on-DirectFB.patch
new file mode 100644
index 0000000..256f8a1
--- /dev/null
+++ b/package/webkit/webkit-Fix-compilation-on-DirectFB.patch
@@ -0,0 +1,144 @@
+From 91a2bf4c3a21720a27223ba293ba90f58c349959 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin@gmail.com>
+Date: Sun, 11 Apr 2010 14:38:57 +0200
+Subject: [PATCH] Fix compilation with DirectFB
+
+Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
+---
+ GNUmakefile.am | 2 ++
+ WebCore/plugins/PluginView.h | 6 +++---
+ WebCore/plugins/gtk/PluginViewGtk.cpp | 17 ++++++++---------
+ 3 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/GNUmakefile.am b/GNUmakefile.am
+index 3bdfe53..8626bbb 100644
+--- a/GNUmakefile.am
++++ b/GNUmakefile.am
+@@ -122,8 +122,10 @@ corekit_cppflags += \
+
+ # For the Gtk port we want to use XP_UNIX both in X11 and Mac
+ if !TARGET_WIN32
++if !TARGET_DIRECTFB
+ corekit_cppflags += -DXP_UNIX
+ endif
++endif
+
+ # Default compiler flags
+ global_cflags += \
+diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
+index 21a25f6..8116864 100644
+--- a/WebCore/plugins/PluginView.h
++++ b/WebCore/plugins/PluginView.h
+@@ -22,7 +22,7 @@
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+ #ifndef PluginView_h
+@@ -312,7 +312,7 @@ namespace WebCore {
+ bool m_haveInitialized;
+ bool m_isWaitingToStart;
+
+-#if defined(XP_UNIX)
++#if defined(XP_UNIX) || PLATFORM(DIRECTFB)
+ bool m_needsXEmbed;
+ #endif
+
+@@ -340,7 +340,7 @@ public:
+
+ private:
+
+-#if defined(XP_UNIX) || OS(SYMBIAN)
++#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(DIRECTFB)
+ void setNPWindowIfNeeded();
+ #elif defined(XP_MACOSX)
+ NP_CGContext m_npCgContext;
+diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
+index 8de63e0..039a845 100644
+--- a/WebCore/plugins/gtk/PluginViewGtk.cpp
++++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
+@@ -23,7 +23,7 @@
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+ #include "config.h"
+@@ -45,6 +45,7 @@
+ #include "Image.h"
+ #include "KeyboardEvent.h"
+ #include "MouseEvent.h"
++#include "NotImplemented.h"
+ #include "Page.h"
+ #include "PlatformKeyboardEvent.h"
+ #include "PlatformMouseEvent.h"
+@@ -137,7 +138,7 @@ void PluginView::updatePluginWidget()
+ if (!m_isWindowed) {
+ if (m_drawable)
+ XFreePixmap(GDK_DISPLAY(), m_drawable);
+-
++
+ m_drawable = XCreatePixmap(GDK_DISPLAY(), getRootWindow(m_parentFrame.get()),
+ m_windowRect.width(), m_windowRect.height(),
+ ((NPSetWindowCallbackStruct*)m_npWindow.ws_info)->depth);
+@@ -571,7 +572,7 @@ NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32 len, const c
+
+ //FIXME - read the file data into buffer
+ FILE* fileHandle = fopen((filename.utf8()).data(), "r");
+-
++
+ if (fileHandle == 0)
+ return NPERR_FILE_NOT_FOUND;
+
+@@ -706,6 +707,7 @@ void PluginView::forceRedraw()
+ gtk_widget_queue_draw(m_parentFrame->view()->hostWindow()->platformPageClient());
+ }
+
++#if defined(XP_UNIX)
+ static Display* getPluginDisplay()
+ {
+ // The plugin toolkit might have a different X connection open. Since we're
+@@ -713,14 +715,9 @@ static Display* getPluginDisplay()
+ // plugins, so we can return that. We might want to add other implementations here
+ // later.
+
+-#if defined(XP_UNIX)
+ return GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+-#else
+- return 0;
+-#endif
+ }
+
+-#if defined(XP_UNIX)
+ static void getVisualAndColormap(int depth, Visual** visual, Colormap* colormap)
+ {
+ *visual = 0;
+@@ -794,9 +791,9 @@ bool PluginView::platformStart()
+ }
+
+ if (m_isWindowed) {
+-#if defined(XP_UNIX)
+ GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
+
++#if defined(XP_UNIX)
+ if (m_needsXEmbed) {
+ // If our parent is not anchored the startup process will
+ // fail miserably for XEmbed plugins a bit later on when
+@@ -817,7 +814,9 @@ bool PluginView::platformStart()
+ #endif
+ } else {
+ setPlatformWidget(0);
++#if defined(XP_UNIX)
+ m_pluginDisplay = getPluginDisplay();
++#endif
+ }
+
+ show();
+--
+1.7.0.4
+
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index a3ba690..1ed9c82 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -3,15 +3,17 @@
# webkit
#
#############################################################
-WEBKIT_VERSION = r44552
-WEBKIT_SOURCE = WebKit-$(WEBKIT_VERSION).tar.bz2
-WEBKIT_SITE = http://nightly.webkit.org/files/trunk/src/
-
+WEBKIT_VERSION = 1.2.0
+WEBKIT_SOURCE = webkit-$(WEBKIT_VERSION).tar.gz
+WEBKIT_SITE = http://www.webkitgtk.org
WEBKIT_INSTALL_STAGING = YES
+WEBKIT_AUTORECONF = YES
WEBKIT_LIBTOOL_PATCH = NO
WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt \
- libgtk2 sqlite enchant libsoup
+ libgtk2 sqlite enchant libsoup libgail
+
+WEBKIT_AUTORECONF_OPT = -Iautotools
ifeq ($(BR2_PACKAGE_WEBKIT_X11),y)
WEBKIT_CONF_OPT = --with-target=x11
@@ -25,15 +27,4 @@ WEBKIT_CONF_OPT += --disable-video
WEBKIT_CONF_ENV = icu_config=$(STAGING_DIR)/usr/bin/icu-config
-define WEBKIT_AUTOGEN_PATCH
-$(SED) 's%ACLOCAL_FLAGS=.*%ACLOCAL_FLAGS="-I autotools -I $(STAGING_DIR)/usr/share/aclocal"%' $(WEBKIT_DIR)/autogen.sh
-$(SED) 's/AUTOMAKE_FLAGS=.*/AUTOMAKE_FLAGS="--foreign --add-missing --copy"/' $(WEBKIT_DIR)/autogen.sh
-$(SED) 's/LIBTOOLIZE_FLAGS=.*/LIBTOOLIZE_FLAGS="--force --automake --copy"/' $(WEBKIT_DIR)/autogen.sh
-cp package/webkit/gtk-doc.make $(WEBKIT_DIR)/
-# Don't run the configure step yet
-cd $(WEBKIT_DIR); $(HOST_CONFIGURE_OPTS) AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh
-endef
-
-WEBKIT_POST_EXTRACT_HOOKS += WEBKIT_AUTOGEN_PATCH
-
$(eval $(call AUTOTARGETS,package,webkit))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 73+ messages in thread