[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-43-g9204956
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-43-g9204956
|
From: jscheer <js...@us...> - 2010-10-05 08:21:06
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9204956b330d6568692ea98bb55271950ef45f20 (commit)
from abd13787added6092f3d61185f74eb4f3f6e9adb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9204956b330d6568692ea98bb55271950ef45f20
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Oct 5 10:20:03 2010 +0200
[BUILDROOT] Add new package QWT 5.2.1 to Buildroot with examples that can be added to rootfs.
[BUILDROOT] Add the possibility to build and install demos and examples in package Qt Embedded 4.6.2
-----------------------------------------------------------------------
Summary of changes:
...-qt-full_integration_with_cross_compiling.patch | 74 +++++++++
patches/buildroot/133-qwt-add_package.patch | 163 ++++++++++++++++++++
...-qt-full_integration_with_cross_compiling.patch | 74 +++++++++
.../buildroot/2010.05/133-qwt-add_package.patch | 163 ++++++++++++++++++++
patches/buildroot/2010.05/cleanup_buildroot.sh | 1 +
patches/buildroot/cleanup_buildroot.sh | 1 +
6 files changed, 476 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
create mode 100644 patches/buildroot/133-qwt-add_package.patch
create mode 100644 patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
create mode 100644 patches/buildroot/2010.05/133-qwt-add_package.patch
diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
new file mode 100644
index 0000000..251bc1f
--- /dev/null
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -0,0 +1,74 @@
+Add the possibility to build & install the Qt's demos and examples.
+This patch is still to be evolved toward Qt full integration in Buildroot.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/qtopia4/Config.in
+===================================================================
+--- buildroot.orig/package/qtopia4/Config.in 2010-10-04 15:36:08.000000000 +0200
++++ buildroot/package/qtopia4/Config.in 2010-10-04 15:36:39.000000000 +0200
+@@ -325,4 +325,14 @@
+ Build the Qt Script Tools module.
+ if unsure, say n.
+
++config BR2_PACKAGE_QT_DEMOS
++ bool "Demos"
++ help
++ Build the Qt Demos.
++
++config BR2_PACKAGE_QT_EXAMPLES
++ bool "Examples"
++ help
++ Build the Qt Examples.
++
+ endif # BR2_PACKAGE_QT
+Index: buildroot/package/qtopia4/qtopia4.mk
+===================================================================
+--- buildroot.orig/package/qtopia4/qtopia4.mk 2010-10-04 15:36:02.000000000 +0200
++++ buildroot/package/qtopia4/qtopia4.mk 2010-10-04 15:37:11.000000000 +0200
+@@ -345,6 +345,14 @@
+ QT_CONFIGURE+= -no-stl
+ endif
+
++ifneq ($(BR2_PACKAGE_QT_DEMOS),y)
++QT_CONFIGURE+= -nomake demos
++endif
++
++ifneq ($(BR2_PACKAGE_QT_EXAMPLES),y)
++QT_CONFIGURE+= -nomake examples
++endif
++
+ # ccache and precompiled headers don't play well together
+ ifeq ($(BR2_CCACHE),y)
+ QT_CONFIGURE += -no-pch
+@@ -482,12 +490,10 @@
+ -no-nis \
+ -no-accessibility \
+ -no-separate-debug-info \
+- -prefix /usr \
++ -prefix $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm \
+ -hostprefix $(STAGING_DIR)/usr \
+ -fast \
+ -no-rpath \
+- -nomake examples \
+- -nomake demos \
+ )
+ touch $@
+
+@@ -560,8 +566,15 @@
+ cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
+ endif
+
++demos: $(STAGING_DIR)/usr/lib/libQtCore.la
++ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos
++ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/
++
++examples: $(STAGING_DIR)/usr/lib/libQtCore.la
++ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples
++ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/
+
+-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) demos examples
+ # Strip all installed libs
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+ cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
diff --git a/patches/buildroot/133-qwt-add_package.patch b/patches/buildroot/133-qwt-add_package.patch
new file mode 100644
index 0000000..53af43f
--- /dev/null
+++ b/patches/buildroot/133-qwt-add_package.patch
@@ -0,0 +1,163 @@
+Add package QWT 5.2.1 to Buildroot. An option enables the build of the examples.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-09-29 16:56:33.000000000 +0200
++++ buildroot/package/Config.in 2010-09-29 16:57:07.000000000 +0200
+@@ -357,6 +357,7 @@
+ comment "other GUIs"
+ source "package/qte/Config.in"
+ source "package/qtopia4/Config.in"
++source "package/qwt/Config.in"
+
+ #source "package/microwin/Config.in"
+
+Index: buildroot/package/qwt/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/Config.in 2010-09-29 16:58:58.000000000 +0200
+@@ -0,0 +1,20 @@
++comment "Qwt requires Qt to be installed"
++ depends on !BR2_PACKAGE_QT
++
++menuconfig BR2_PACKAGE_QWT
++ bool "Qwt"
++ depends on BR2_PACKAGE_QT
++ help
++ Qwt for Embedded Linux.
++
++ http://qwt.sourceforge.net/
++
++if BR2_PACKAGE_QWT
++
++config BR2_PACKAGE_QWT_EXAMPLES
++ bool "Examples"
++ select BR2_PACKAGE_QT_SVG
++ help
++ Compile & install the examples.
++
++endif #BR2_PACKAGE_QWT
+Index: buildroot/package/qwt/qwt.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/qwt.mk 2010-09-29 17:00:04.000000000 +0200
+@@ -0,0 +1,82 @@
++######################################################################
++#
++# QWT
++#
++######################################################################
++
++QWT_VERSION:=5.2.1
++QWT_SOURCE:=qwt-$(QWT_VERSION).zip
++QWT_SITE:=https://sourceforge.net/projects/qwt/files/qwt/$(QWT_VERSION)
++QWT_UNZIP:=unzip
++QWT_TARGET_DIR:=$(BUILD_DIR)/qwt-$(QWT_VERSION)
++QWT_CONFIG_FILE:=qwt.pro
++QWT_EXAMPLES_CONFIG_FILE:=examples.pro
++QT_DIR:=$(STAGING_DIR)/usr
++
++$(DL_DIR)/$(QWT_SOURCE):
++ $(call DOWNLOAD,$(QWT_SITE),$(QWT_SOURCE))
++
++qwt-source: $(DL_DIR)/$(QWT_SOURCE)
++
++
++$(QWT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QWT_SOURCE)
++ $(QWT_UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(QWT_SOURCE)
++ toolchain/patch-kernel.sh $(QWT_TARGET_DIR) package/qwt/ \
++ qwt-$(QWT_VERSION)-\*.patch \
++ qwt-$(QWT_VERSION)-\*.patch.$(ARCH)
++ touch $@
++
++$(QWT_TARGET_DIR)/.configured: $(QWT_TARGET_DIR)/.unpacked
++ -[ -f $(QWT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR) distclean
++ $(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/$(QWT_CONFIG_FILE)
++ touch $@
++
++$(QWT_TARGET_DIR)/.compiled: $(QWT_TARGET_DIR)/.configured
++ $(MAKE) -C $(QWT_TARGET_DIR)
++ touch $@
++
++$(STAGING_DIR)/usr/lib/libqwt.so: $(QWT_TARGET_DIR)/.compiled
++ (export INSTALL_ROOT=$(STAGING_DIR); $(MAKE) -C $(QWT_TARGET_DIR) install)
++
++$(TARGET_DIR)/usr/lib/libqwt.so: $(STAGING_DIR)/usr/lib/libqwt.so
++ cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so.* $(TARGET_DIR)/usr/lib/
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so.*
++
++$(QWT_TARGET_DIR)/examples/.configured: $(TARGET_DIR)/usr/lib/libqwt.so
++ -[ -f $(QWT_TARGET_DIR)/examples/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR)/examples distclean
++ $(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
++ touch $@
++
++$(QWT_TARGET_DIR)/examples/.compiled: $(QWT_TARGET_DIR)/examples/.configured
++ $(MAKE) -C $(QWT_TARGET_DIR)/examples
++ touch $@
++
++$(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/bode: $(QWT_TARGET_DIR)/examples/.compiled
++ mkdir -p $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
++ cp -f $(QWT_TARGET_DIR)/examples/bin/* $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
++
++$(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin/bode: $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/bode
++ mkdir -p $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
++ cp -f $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/* $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
++
++ifneq ($(BR2_PACKAGE_QWT_EXAMPLES),y)
++qwt: qt $(TARGET_DIR)/usr/lib/libqwt.so
++else
++qwt: qt $(TARGET_DIR)/usr/lib/libqwt.so $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin/bode
++endif
++
++qwt-clean:
++ -$(MAKE) -C $(QWT_TARGET_DIR) clean
++ -rm $(TARGET_DIR)/usr/lib/libqwt.so.*
++
++qwt-dirclean:
++ rm -rf $(QWT_TARGET_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(BR2_PACKAGE_QWT),y)
++TARGETS+=qwt
++endif
+Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2010-09-29 17:00:52.000000000 +0200
+@@ -0,0 +1,30 @@
++--- qwt-5.2.1/qwtconfig.pri.orig 2010-09-28 14:34:01.000000000 +0200
+++++ qwt-5.2.1/qwtconfig.pri 2010-09-28 15:37:02.000000000 +0200
++@@ -115,7 +115,7 @@
++ # Otherwise you have to build it from the designer directory.
++ ######################################################################
++
++-CONFIG += QwtDesigner
+++#CONFIG += QwtDesigner
++
++ ######################################################################
++ # If you want to auto build the examples, enable the line below
++
++--- qwt-5.2.1/src/src.pro.orig 2010-09-28 14:40:39.000000000 +0200
+++++ qwt-5.2.1/src/src.pro 2010-09-28 14:41:29.000000000 +0200
++@@ -218,9 +218,12 @@
++ }
++
++ # Install directives
++-
++-headers.files = $$HEADERS
++-doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
+++
+++target.path = /usr/lib
+++headers.files = $$HEADERS
+++headers.path = /usr/include/qwt-5.2.1
+++doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
+++doc.path = /usr/doc/qwt-5.2.1
++ unix {
++ doc.files += $${QWT_ROOT}/doc/man
++ }
diff --git a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
new file mode 100644
index 0000000..f14c745
--- /dev/null
+++ b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
@@ -0,0 +1,74 @@
+Add the possibility to build & install the Qt's demos and examples.
+This patch is still to be evolved toward Qt full integration in Buildroot.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/qt/Config.in
+===================================================================
+--- buildroot.orig/package/qt/Config.in 2010-10-04 15:50:09.000000000 +0200
++++ buildroot/package/qt/Config.in 2010-10-04 15:52:44.000000000 +0200
+@@ -372,4 +372,14 @@
+ Build the Qt Script Tools module.
+ if unsure, say n.
+
++config BR2_PACKAGE_QT_DEMOS
++ bool "Demos"
++ help
++ Build the Qt Demos.
++
++config BR2_PACKAGE_QT_EXAMPLES
++ bool "Examples"
++ help
++ Build the Qt Examples.
++
+ endif # BR2_PACKAGE_QT
+Index: buildroot/package/qt/qt.mk
+===================================================================
+--- buildroot.orig/package/qt/qt.mk 2010-10-04 15:49:36.000000000 +0200
++++ buildroot/package/qt/qt.mk 2010-10-04 15:59:03.000000000 +0200
+@@ -362,6 +362,14 @@
+ QT_CONFIGURE+= -no-stl
+ endif
+
++ifneq ($(BR2_PACKAGE_QT_DEMOS),y)
++QT_CONFIGURE+= -nomake demos
++endif
++
++ifneq ($(BR2_PACKAGE_QT_EXAMPLES),y)
++QT_CONFIGURE+= -nomake examples
++endif
++
+ # ccache and precompiled headers don't play well together
+ ifeq ($(BR2_CCACHE),y)
+ QT_CONFIGURE += -no-pch
+@@ -506,12 +514,10 @@
+ -no-nis \
+ -no-accessibility \
+ -no-separate-debug-info \
+- -prefix /usr \
++ -prefix $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm \
+ -hostprefix $(STAGING_DIR)/usr \
+ -fast \
+ -no-rpath \
+- -nomake examples \
+- -nomake demos \
+ )
+ touch $@
+
+@@ -589,8 +595,15 @@
+ cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
+ endif
+
++demos: $(STAGING_DIR)/usr/lib/libQtCore.la
++ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos
++ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/
++
++examples: $(STAGING_DIR)/usr/lib/libQtCore.la
++ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples
++ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/
+
+-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) demos examples
+ # Strip all installed libs
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+ cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
diff --git a/patches/buildroot/2010.05/133-qwt-add_package.patch b/patches/buildroot/2010.05/133-qwt-add_package.patch
new file mode 100644
index 0000000..490bdd7
--- /dev/null
+++ b/patches/buildroot/2010.05/133-qwt-add_package.patch
@@ -0,0 +1,163 @@
+Add package QWT 5.2.1 to Buildroot. An option enables the build of the examples.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-10-04 16:17:20.000000000 +0200
++++ buildroot/package/Config.in 2010-10-04 16:22:39.000000000 +0200
+@@ -126,6 +126,7 @@
+
+ comment "other GUIs"
+ source "package/qt/Config.in"
++source "package/qwt/Config.in"
+
+ #source "package/microwin/Config.in"
+
+Index: buildroot/package/qwt/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/Config.in 2010-10-04 16:23:25.000000000 +0200
+@@ -0,0 +1,20 @@
++comment "Qwt requires Qt to be installed"
++ depends on !BR2_PACKAGE_QT
++
++menuconfig BR2_PACKAGE_QWT
++ bool "Qwt"
++ depends on BR2_PACKAGE_QT
++ help
++ Qwt for Embedded Linux.
++
++ http://qwt.sourceforge.net/
++
++if BR2_PACKAGE_QWT
++
++config BR2_PACKAGE_QWT_EXAMPLES
++ bool "Examples"
++ select BR2_PACKAGE_QT_SVG
++ help
++ Compile & install the examples.
++
++endif #BR2_PACKAGE_QWT
+Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2010-10-04 16:24:24.000000000 +0200
+@@ -0,0 +1,30 @@
++--- qwt-5.2.1/qwtconfig.pri.orig 2010-09-28 14:34:01.000000000 +0200
+++++ qwt-5.2.1/qwtconfig.pri 2010-09-28 15:37:02.000000000 +0200
++@@ -115,7 +115,7 @@
++ # Otherwise you have to build it from the designer directory.
++ ######################################################################
++
++-CONFIG += QwtDesigner
+++#CONFIG += QwtDesigner
++
++ ######################################################################
++ # If you want to auto build the examples, enable the line below
++
++--- qwt-5.2.1/src/src.pro.orig 2010-09-28 14:40:39.000000000 +0200
+++++ qwt-5.2.1/src/src.pro 2010-09-28 14:41:29.000000000 +0200
++@@ -218,9 +218,12 @@
++ }
++
++ # Install directives
++-
++-headers.files = $$HEADERS
++-doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
+++
+++target.path = /usr/lib
+++headers.files = $$HEADERS
+++headers.path = /usr/include/qwt-5.2.1
+++doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
+++doc.path = /usr/doc/qwt-5.2.1
++ unix {
++ doc.files += $${QWT_ROOT}/doc/man
++ }
+Index: buildroot/package/qwt/qwt.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/qwt.mk 2010-10-04 16:24:00.000000000 +0200
+@@ -0,0 +1,82 @@
++######################################################################
++#
++# QWT
++#
++######################################################################
++
++QWT_VERSION:=5.2.1
++QWT_SOURCE:=qwt-$(QWT_VERSION).zip
++QWT_SITE:=https://sourceforge.net/projects/qwt/files/qwt/$(QWT_VERSION)
++QWT_UNZIP:=unzip
++QWT_TARGET_DIR:=$(BUILD_DIR)/qwt-$(QWT_VERSION)
++QWT_CONFIG_FILE:=qwt.pro
++QWT_EXAMPLES_CONFIG_FILE:=examples.pro
++QT_DIR:=$(STAGING_DIR)/usr
++
++$(DL_DIR)/$(QWT_SOURCE):
++ $(call DOWNLOAD,$(QWT_SITE),$(QWT_SOURCE))
++
++qwt-source: $(DL_DIR)/$(QWT_SOURCE)
++
++
++$(QWT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QWT_SOURCE)
++ $(QWT_UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(QWT_SOURCE)
++ toolchain/patch-kernel.sh $(QWT_TARGET_DIR) package/qwt/ \
++ qwt-$(QWT_VERSION)-\*.patch \
++ qwt-$(QWT_VERSION)-\*.patch.$(ARCH)
++ touch $@
++
++$(QWT_TARGET_DIR)/.configured: $(QWT_TARGET_DIR)/.unpacked
++ -[ -f $(QWT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR) distclean
++ $(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/$(QWT_CONFIG_FILE)
++ touch $@
++
++$(QWT_TARGET_DIR)/.compiled: $(QWT_TARGET_DIR)/.configured
++ $(MAKE) -C $(QWT_TARGET_DIR)
++ touch $@
++
++$(STAGING_DIR)/usr/lib/libqwt.so: $(QWT_TARGET_DIR)/.compiled
++ (export INSTALL_ROOT=$(STAGING_DIR); $(MAKE) -C $(QWT_TARGET_DIR) install)
++
++$(TARGET_DIR)/usr/lib/libqwt.so: $(STAGING_DIR)/usr/lib/libqwt.so
++ cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so.* $(TARGET_DIR)/usr/lib/
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so.*
++
++$(QWT_TARGET_DIR)/examples/.configured: $(TARGET_DIR)/usr/lib/libqwt.so
++ -[ -f $(QWT_TARGET_DIR)/examples/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR)/examples distclean
++ $(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
++ touch $@
++
++$(QWT_TARGET_DIR)/examples/.compiled: $(QWT_TARGET_DIR)/examples/.configured
++ $(MAKE) -C $(QWT_TARGET_DIR)/examples
++ touch $@
++
++$(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/bode: $(QWT_TARGET_DIR)/examples/.compiled
++ mkdir -p $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
++ cp -f $(QWT_TARGET_DIR)/examples/bin/* $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
++
++$(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin/bode: $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/bode
++ mkdir -p $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
++ cp -f $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/* $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
++
++ifneq ($(BR2_PACKAGE_QWT_EXAMPLES),y)
++qwt: qt $(TARGET_DIR)/usr/lib/libqwt.so
++else
++qwt: qt $(TARGET_DIR)/usr/lib/libqwt.so $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin/bode
++endif
++
++qwt-clean:
++ -$(MAKE) -C $(QWT_TARGET_DIR) clean
++ -rm $(TARGET_DIR)/usr/lib/libqwt.so.*
++
++qwt-dirclean:
++ rm -rf $(QWT_TARGET_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(BR2_PACKAGE_QWT),y)
++TARGETS+=qwt
++endif
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index 339312b..41b3922 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -47,3 +47,4 @@ rm -rf buildroot/package/opentyrian/
rm -rf buildroot/package/ipsec-tools/
rm -rf buildroot/package/lbreakout2/
rm -rf buildroot/package/ltris/
+rm -rf buildroot/package/qwt/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 556f19a..bf4397e 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -47,3 +47,4 @@ rm -rf buildroot/package/cwiid/
rm -rf buildroot/package/urg/
rm -rf buildroot/package/joysticktest/
rm -rf buildroot/package/pickit2/
+rm -rf buildroot/package/qwt/
hooks/post-receive
--
armadeus
|
