Skip to contentSkip to conversation

Various fixes and new infrastructure conversion

GIT PULL New llandwerlin at gmail.com 2 participants 17 messages Jan 17, 2010 – Jan 28, 2010

lore
Share & tools
lore

llandwerlin at gmail.com

author
#0 lore raw

Hi all,

Here is a patch list containing fixes and conversions to the new infrastructure :

[PATCH 01/15] flex: fix prog-ar patch
[PATCH 02/15] flex: bump to 2.5.35
[PATCH 03/15] flex: convert to autotools infrastructure [PATCH 04/15] gperf: convert to autotools infrastructure [PATCH 05/15] bash: remove CC variable when calling make [PATCH 06/15] bash: fix configuration
[PATCH 07/15] ncurses: convert to autotools infrastructure [PATCH 08/15] ncurses: fix path to patch ncurses5-config [PATCH 09/15] readline: convert to autotools infrastructure [PATCH 10/15] lua: conversion to new package infrastructure [PATCH 11/15] Rework icu package on top of the generic infrastructure [PATCH 12/15] package: Added post uninstall hooks
[PATCH 13/15] libxslt: fix dependency on libxml
[PATCH 14/15] dbus: fix target installation with BR2_HAVE_DEVFILES [PATCH 15/15] external toolchain: fix strip of libraries

Changes are available in the git repository at:

git://git.potipota.net/buildroot various-fixes

author
#1 lore raw

PATCH 1/15 flex: fix prog-ar patch

From: Lionel Landwerlin <[email protected]>

Could not apply when missing top level Makefile, which is also regenerated by the configure script.

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/flex/flex-2.5.33-prog-ar.patch |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)
package/flex/flex-2.5.33-prog-ar.patch +1 -12
index b556b63..e0626ff 100644
@@ -1,18 +1,7 @@
-diff -rup flex-2.5.33.orig/Makefile flex-2.5.33/Makefile
---- flex-2.5.33.orig/Makefile	2007-01-18 17:29:32.000000000 +0100
-+++ flex-2.5.33/Makefile	2007-01-18 18:28:29.000000000 +0100
-@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- 	"$(DESTDIR)$(includedir)"
- libLIBRARIES_INSTALL = $(INSTALL_DATA)
- LIBRARIES = $(lib_LIBRARIES)
--AR = ar
- ARFLAGS = cru
- libfl_a_AR = $(AR) $(ARFLAGS)
- libfl_a_LIBADD =
 diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in
 --- flex-2.5.33.orig/Makefile.in	2007-01-18 17:29:25.000000000 +0100
 +++ flex-2.5.33/Makefile.in	2007-01-18 18:28:22.000000000 +0100
-@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
  	"$(DESTDIR)$(includedir)"
  libLIBRARIES_INSTALL = $(INSTALL_DATA)
  LIBRARIES = $(lib_LIBRARIES)
Signature · 1 line
1.6.5.7
author
#2 lore raw

PATCH 2/15 flex: bump to 2.5.35

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/flex/flex.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
package/flex/flex.mk +2 -2
index b4e0cb9..d8a85bd 100644
@@ -3,8 +3,8 @@
 # flex
 #
 #############################################################
-FLEX_VERSION:=2.5.33
-FLEX_PATCH_VERSION:=11
+FLEX_VERSION:=2.5.35
+FLEX_PATCH_VERSION:=9
 FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
 FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
 FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
Signature · 1 line
1.6.5.7
author
#3 lore raw

PATCH 3/15 flex: convert to autotools infrastructure

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/flex/flex.mk |  125 ++++++++------------------------------------------
 1 files changed, 19 insertions(+), 106 deletions(-)
package/flex/flex.mk +19 -106
index d8a85bd..223f58e 100644
@@ -9,118 +9,31 @@ FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
 FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
 FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
 FLEX_DIR:=$(BUILD_DIR)/flex-$(FLEX_VERSION)
-FLEX_CAT:=$(ZCAT)
-FLEX_BINARY:=flex
-FLEX_TARGET_BINARY:=usr/bin/flex
 
-$(DL_DIR)/$(FLEX_SOURCE):
-	 $(call DOWNLOAD,$(FLEX_SITE),$(FLEX_SOURCE))
+# lex -> flex
+define FLEX_INSTALL_LEX
+cd $(TARGET_DIR)/usr/bin && ln -snf flex lex
+endef
 
-$(DL_DIR)/$(FLEX_PATCH):
-	 $(call DOWNLOAD,$(FLEX_SITE),$(FLEX_PATCH))
+define FLEX_UNINSTALL_LEX
+-rm $(TARGET_DIR)/usr/bin/lex
+endef
 
-flex-source: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
+FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX
+FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LEX
 
-$(FLEX_DIR)/.unpacked: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
-	$(FLEX_CAT) $(DL_DIR)/$(FLEX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-ifneq ($(FLEX_PATCH),)
-	toolchain/patch-kernel.sh $(FLEX_DIR) $(DL_DIR) $(FLEX_PATCH)
-	if [ -d $(FLEX_DIR)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(FLEX_DIR) $(FLEX_DIR)/debian/patches \*.patch; \
-	fi
-endif
-	$(CONFIG_UPDATE) $(FLEX_DIR)
-	touch $@
-
-$(FLEX_DIR)/.configured: $(FLEX_DIR)/.unpacked
-	(cd $(FLEX_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--includedir=$(TARGET_DIR)/usr/include \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
-	)
-	touch $@
-
-$(FLEX_DIR)/$(FLEX_BINARY): $(FLEX_DIR)/.configured
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FLEX_DIR)
-
-$(TARGET_DIR)/$(FLEX_TARGET_BINARY): $(FLEX_DIR)/$(FLEX_BINARY)
-	$(MAKE1) \
-	    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 $(FLEX_DIR) install
+# libfl installation
 ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y)
-	install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
-endif
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/share/man
-endif
-	rm -rf $(TARGET_DIR)/share/locale
-	rm -rf $(TARGET_DIR)/usr/share/doc
-	(cd $(TARGET_DIR)/usr/bin; ln -snf flex lex)
+define FLEX_INSTALL_LIBFL
+install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
+endef
 
-flex: $(TARGET_DIR)/$(FLEX_TARGET_BINARY)
+define FLEX_UNINSTALL_LIBFL
+-rm $(STAGING_DIR)/lib/libfl.a
+endef
 
-flex-clean:
-	$(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/share/info \
-	    mandir=$(TARGET_DIR)/usr/share/man \
-	    includedir=$(TARGET_DIR)/usr/include \
-		-C $(FLEX_DIR) uninstall
-	rm -f $(TARGET_DIR)/usr/bin/lex
-ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y)
-	-rm $(STAGING_DIR)/lib/libfl.a
+FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL
+FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LIBFL
 endif
-	-$(MAKE) -C $(FLEX_DIR) clean
-
-flex-dirclean:
-	rm -rf $(FLEX_DIR)
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_FLEX),y)
-TARGETS+=flex
-endif
+$(eval $(call AUTOTARGETS,package,flex))
Signature · 1 line
1.6.5.7
author
#4 lore raw

PATCH 4/15 gperf: convert to autotools infrastructure

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/gperf/gperf.mk |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
package/gperf/gperf.mk +7 -5
index 0dc6d6e..bb2d4f3 100644
@@ -9,12 +9,14 @@ GPERF_SITE = $(BR2_GNU_MIRROR)/gperf
 GPERF_AUTORECONF = NO
 GPERF_INSTALL_STAGING = NO
 GPERF_INSTALL_TARGET = YES
-GPERF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
+
+# install-strip rule does not exist in gperf's makefiles
 GPERF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
-$(eval $(call AUTOTARGETS,package,gperf))
+define GPERF_INSTALL_STRIP
+$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/gperf
+endef
 
-$(GPERF_HOOK_POST_INSTALL): $(GPERF_TARGET_INSTALL_TARGET)
-	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/gperf
-	touch $@
+GPERF_POST_INSTALL_HOOKS += GPERF_INSTALL_STRIP
 
+$(eval $(call AUTOTARGETS,package,gperf))
Signature · 1 line
1.6.5.7
author
#5 lore raw

PATCH 5/15 bash: remove CC variable when calling make

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

So "/opt/whatever_toolchain/gcc --sysroot $(STAGING_DIR)" isn't stripped to "/opt/whatever_toolchain/gcc".

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/bash/bash.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
package/bash/bash.mk +3 -3
index fbb9cfb..705ce8d 100644
@@ -72,11 +72,11 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
 	touch $@
 
 $(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured
-	$(MAKE1) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)
+	$(MAKE1) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)
 
 $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
 	mkdir -p $(TARGET_DIR)/bin
-	$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) install
+	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(BASH_DIR) install
 	rm -f $(TARGET_DIR)/bin/bash*
 	mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/
 	(cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh)

@@ -100,7 +100,7 @@ endif
 # If both bash and busybox are selected, the /bin/sh symlink
 # may need to be reinstated by the clean targets.
 bash-clean:
-	-$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
+	-$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(BASH_DIR) uninstall
 	rm -f $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 	-$(MAKE1) -C $(BASH_DIR) clean
Signature · 1 line
1.6.5.7
author
#6 lore raw

PATCH 6/15 bash: fix configuration

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Patch bash32-011 modifies the configure.in script. Therefor we need to run autoconf before launching the configure script. Otherwise, once the configure script called, the makefile's dependencies over configure.in will relaunch autoconf without options/environnement variables we usually set when calling configure.

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/bash/bash.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
package/bash/bash.mk +2 -1
index 705ce8d..08039e2 100644
@@ -32,7 +32,8 @@ $(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE)
 $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
 	# bash_cv_have_mbstate_t=yes
 	(cd $(BASH_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
+                autoconf && \
+	        $(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
 		ac_cv_func_setvbuf_reversed=no \
Signature · 1 line
1.6.5.7
#7 lore raw

PATCH 6/15 bash: fix configuration

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

"llandwerlin" == llandwerlin <[email protected]> writes:

llandwerlin> From: Lionel Landwerlin <[email protected]> llandwerlin> Patch bash32-011 modifies the configure.in script. Therefor we need to llandwerlin> run autoconf before launching the configure script. Otherwise, once llandwerlin> the configure script called, the makefile's dependencies over llandwerlin> configure.in will relaunch autoconf without options/environnement llandwerlin> variables we usually set when calling configure.

llandwerlin> Signed-off-by: Lionel Landwerlin <[email protected]> llandwerlin> ---

 llandwerlin>  package/bash/bash.mk |    3 ++-

llandwerlin> 1 files changed, 2 insertions(+), 1 deletions(-)

llandwerlin> diff --git a/package/bash/bash.mk b/package/bash/bash.mk llandwerlin> index 705ce8d..08039e2 100644
llandwerlin> --- a/package/bash/bash.mk
llandwerlin> +++ b/package/bash/bash.mk
llandwerlin> @@ -32,7 +32,8 @@ $(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE)

 llandwerlin>  $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
 llandwerlin>  	# bash_cv_have_mbstate_t=yes
 llandwerlin>  	(cd $(BASH_DIR); rm -rf config.cache; \

llandwerlin> - $(TARGET_CONFIGURE_OPTS) \
llandwerlin> + autoconf && \

That should be $(AUTOCONF) and we need a dependency on host-autoconf. Will fix myself.

Signature · 1 line
Bye, Peter Korsgaard
author
#8 lore raw

PATCH 7/15 ncurses: convert to autotools infrastructure

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/ncurses/ncurses.mk |  188 +++++++++++++++-----------------------------
 1 files changed, 65 insertions(+), 123 deletions(-)
package/ncurses/ncurses.mk +65 -123
index fb22c6c..a19e6c8 100644
@@ -23,99 +23,84 @@
 # 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_INSTALL_TARGET = 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 +115,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))
Signature · 1 line
1.6.5.7
author
#9 lore raw

PATCH 8/15 ncurses: fix path to patch ncurses5-config

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/ncurses/ncurses.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/ncurses/ncurses.mk +1 -1
index a19e6c8..7eafa87 100644
@@ -53,7 +53,7 @@ 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
Signature · 1 line
1.6.5.7
author
#10 lore raw

PATCH 9/15 readline: convert to autotools infrastructure

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/readline/readline.mk |  107 ++++++++---------------------------------
 1 files changed, 21 insertions(+), 86 deletions(-)
package/readline/readline.mk +21 -86
index 34c02d8..641cd71 100644
@@ -3,89 +3,24 @@
 # build GNU readline
 #
 #############################################################
-READLINE_VERSION:=5.2
-READLINE_SITE:=$(BR2_GNU_MIRROR)/readline
-READLINE_SOURCE:=readline-$(READLINE_VERSION).tar.gz
-READLINE_DIR:=$(BUILD_DIR)/readline-$(READLINE_VERSION)
-READLINE_CAT:=$(ZCAT)
-READLINE_BINARY:=libhistory.a
-READLINE_SHARED_BINARY:=libhistory.so
-READLINE_TARGET_BINARY:=usr/lib/$(READLINE_BINARY)
-READLINE_TARGET_SHARED_BINARY:=usr/lib/$(READLINE_SHARED_BINARY)
-
-$(DL_DIR)/$(READLINE_SOURCE):
-	$(call DOWNLOAD,$(READLINE_SITE),$(READLINE_SOURCE))
-
-readline-source: $(DL_DIR)/$(READLINE_SOURCE)
-
-$(READLINE_DIR)/.unpacked: $(DL_DIR)/$(READLINE_SOURCE)
-	mkdir -p $(READLINE_DIR)
-	tar -C $(BUILD_DIR) -zxf $(DL_DIR)/$(READLINE_SOURCE)
-	toolchain/patch-kernel.sh $(READLINE_DIR) package/readline/ readline??-???
-	$(CONFIG_UPDATE) $(READLINE_DIR)
-	$(CONFIG_UPDATE) $(READLINE_DIR)/support
-	touch $@
-
-$(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked
-	(cd $(READLINE_DIR); rm -rf config.cache; \
-		bash_cv_func_sigsetjmp=yes \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/usr/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--with-shared \
-		--includedir=/usr/include \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-	)
-	touch $@
-
-$(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured
-	$(MAKE) -C $(READLINE_DIR) SHLIB_LIBS="-lncurses"
-	ls $(READLINE_DIR)/$(READLINE_BINARY)
-	touch -c $@
-
-$(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/.configured
-	$(MAKE) -C $(READLINE_DIR) install
-	touch -c $@
-
-# Install to Staging area
-$(STAGING_DIR)/usr/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY)
-	BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \
-	$(MAKE1) DESTDIR=$(STAGING_DIR) -C $(READLINE_DIR) install
-	touch -c $@
-
-# Install to Target directory
-$(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY): $(READLINE_DIR)/$(READLINE_BINARY)
-	# make sure we don't end up with lib{readline,history}...old
-	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall
-	BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \
-	$(MAKE1) DESTDIR=$(TARGET_DIR) \
-		-C $(READLINE_DIR) install-shared uninstall-doc
-	chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
-	$(STRIPCMD) $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
-
-readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)
-
-readline-clean:
-	-$(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall
-	-$(MAKE) -C $(READLINE_DIR) DESTDIR=$(TARGET_DIR) uninstall
-	-$(MAKE) -C $(READLINE_DIR) clean
-
-readline-dirclean:
-	rm -rf $(READLINE_DIR)
-
-ifeq ($(BR2_PACKAGE_READLINE),y)
-TARGETS+=readline
-endif
+READLINE_VERSION = 5.2
+READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz
+READLINE_SITE = $(BR2_GNU_MIRROR)/readline
+READLINE_INSTALL_STAGING = YES
+READLINE_INSTALL_TARGET = YES
+
+READLINE_DEPENDENCIES = ncurses
+
+READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes
+
+define READLINE_INSTALL_TARGET_CMDS
+	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall
+	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(@D) install-shared uninstall-doc
+	chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) \
+		$(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) \
+		$(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) \
+		$(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
+endef
+
+$(eval $(call AUTOTARGETS,package,readline))
Signature · 1 line
1.6.5.7
author
#11 lore raw

PATCH 10/15 lua: conversion to new package infrastructure

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Also install development files to staging by default and to target if requested.

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/lua/lua.mk |  124 +++++++++++++++++++++++++--------------------------
 1 files changed, 61 insertions(+), 63 deletions(-)
package/lua/lua.mk +61 -63
index aeb6c82..9cb1675 100644
@@ -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))
Signature · 1 line
1.6.5.7
author
#12 lore raw

PATCH 11/15 Rework icu package on top of the generic infrastructure

In reply to llandwerlin at gmail.com

From: Thomas Petazzoni <[email protected]>

This patch is based on a previous attempt by Thomas Petazzoni.

Signed-off-by Lionel Landwerlin <[email protected]>
---
 ...icu-4c-3_8_1-fix-compilation-with-gcc-4.4.patch |   77 +++
 .../icu/icu-4c-3_8_1-fix-cross-compilation.patch   |  400 ++++++++++++
 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                                 |  111 ++--
 6 files changed, 1231 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
package/icu/icu-4c-3_8_1-fix-compilation-with-gcc-4.4.patch new file +77 -0
new file mode 100644
index 0000000..8c88f1c
@@ -0,0 +1,77 @@
+From b515227d0ca1ca61e033645cd2a99e829574c31a Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Tue, 5 Jan 2010 16:24:57 +0100
+Subject: [PATCH] icu: fix compilation with gcc 4.4
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+---
+ 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
+
package/icu/icu-4c-3_8_1-fix-cross-compilation.patch new file +400 -0

400 lines not on this page · raw message

package/icu/icu-4c-3_8_1-lsupc++.patch +12 -12
index 891ddce..8f5d72b 100644
@@ -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)
package/icu/icu-config new file +684 -0

684 lines not on this page · raw message

package/icu/icu-cross-compile.patch deleted +0 -314

314 lines not on this page · raw message

package/icu/icu.mk +58 -53

131 lines not on this page · raw message

Signature · 1 line
1.6.5.7
author
#13 lore raw

PATCH 12/15 package: Added post uninstall hooks

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

$(PKG)_POST_UNINSTALL_STAGING_HOOKS and $(PKG)_POST_UNINSTALL_TARGET_HOOKS

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/Makefile.package.in |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
package/Makefile.package.in +11 -7
index fbd7f69..d02706d 100644
@@ -192,8 +192,10 @@ $(BUILD_DIR)/%/.stamp_cleaned:
 $(BUILD_DIR)/%/.stamp_uninstalled:
 	@$(call MESSAGE,"Uninstalling")
 	$($(PKG)_UNINSTALL_STAGING_CMDS)
+	$(foreach hook,$($(PKG)_POST_UNINSTALL_STAGING_HOOKS),$(call $(hook))$(sep))
 	rm -f $($(PKG)_TARGET_INSTALL_STAGING)
 	$($(PKG)_UNINSTALL_TARGET_CMDS)
+	$(foreach hook,$($(PKG)_POST_UNINSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
 	rm -f $($(PKG)_TARGET_INSTALL_TARGET) $($(PKG)_HOOK_POST_INSTALL)
 
 # Remove package sources

@@ -277,13 +279,15 @@ $(2)_TARGET_CLEAN =		$$($(2)_DIR)/.stamp_cleaned
 $(2)_TARGET_DIRCLEAN =		$$($(2)_DIR)/.stamp_dircleaned
 
 # new-style hooks
-$(2)_POST_EXTRACT_HOOKS         ?=
-$(2)_POST_PATCH_HOOKS           ?=
-$(2)_POST_CONFIGURE_HOOKS       ?=
-$(2)_POST_BUILD_HOOKS           ?=
-$(2)_POST_INSTALL_HOOKS         ?=
-$(2)_POST_INSTALL_STAGING_HOOKS ?=
-$(2)_POST_INSTALL_TARGET_HOOKS  ?=
+$(2)_POST_EXTRACT_HOOKS           ?=
+$(2)_POST_PATCH_HOOKS             ?=
+$(2)_POST_CONFIGURE_HOOKS         ?=
+$(2)_POST_BUILD_HOOKS             ?=
+$(2)_POST_INSTALL_HOOKS           ?=
+$(2)_POST_INSTALL_STAGING_HOOKS   ?=
+$(2)_POST_INSTALL_TARGET_HOOKS    ?=
+$(2)_POST_UNINSTALL_STAGING_HOOKS ?=
+$(2)_POST_UNINSTALL_TARGET_HOOKS  ?=
 
 # old-style hooks
 $(2)_HOOK_POST_EXTRACT =	$$($(2)_DIR)/.stamp_hook_post_extract
Signature · 1 line
1.6.5.7
author
#14 lore raw

PATCH 13/15 libxslt: fix dependency on libxml

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/libxslt/Config.in  |    1 +
 package/libxslt/libxslt.mk |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
package/libxslt/Config.in +1 -0
index c318966..23acd18 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBXSLT
 	bool "libxslt"
+        select BR2_PACKAGE_LIBXML2
 	help
 	  Install the xslt library which is used
 	  to transform XML files to other XML files.
package/libxslt/libxslt.mk +1 -1
index 2478800..03c1131 100644
@@ -23,7 +23,7 @@ LIBXSLT_CONF_OPT = --with-gnu-ld --enable-shared \
 		--without-threads \
 		--with-libxml-prefix=$(STAGING_DIR)/usr/
 
-LIBXSLT_DEPENDENCIES = $(LIBXSLT_DEPENDENCIES_EXTRA)
+LIBXSLT_DEPENDENCIES = libxml2 $(LIBXSLT_DEPENDENCIES_EXTRA)
 
 $(eval $(call AUTOTARGETS,package,libxslt))
Signature · 1 line
1.6.5.7
author
#15 lore raw

PATCH 14/15 dbus: fix target installation with BR2_HAVE_DEVFILES

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>
---
 package/dbus/dbus.mk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
package/dbus/dbus.mk +2 -0
index 276009c..a97fc02 100644
@@ -81,7 +81,9 @@ $(DBUS_HOOK_POST_BUILD): $(DBUS_TARGET_BUILD)
 	touch $@
 
 $(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET)
+ifneq ($(BR2_HAVE_DEVFILES),y)
 	rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
+endif
 	rm -rf $(TARGET_DIR)/var/lib/dbus
 	ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus
 	$(INSTALL) -m 0755 package/dbus/S30dbus $(TARGET_DIR)/etc/init.d
Signature · 1 line
1.6.5.7
author
#16 lore raw

PATCH 15/15 external toolchain: fix strip of libraries

In reply to llandwerlin at gmail.com

From: Lionel Landwerlin <[email protected]>

Signed-off-by Lionel Landwerlin <[email protected]>
---
 toolchain/external-toolchain/ext-tool.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
toolchain/external-toolchain/ext-tool.mk +2 -2
index 1f5aa19..39faf84 100644
@@ -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; \
Signature · 1 line
1.6.5.7