summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2008-05-21 05:52:12 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2008-05-21 05:52:12 +0000
commitfb5144e589315c49e631ec90c354bd00bc10e2fc (patch)
tree5e4d4f2e0a28bb23732db71080872bc73c1ced51
parent6c5f3f2ec8d898584858637381c20fab9df89c58 (diff)
add SVG selection to Qtopia 4 and fix strip command
-rw-r--r--package/qtopia4/Config.in6
-rw-r--r--package/qtopia4/qtopia4.mk13
2 files changed, 17 insertions, 2 deletions
diff --git a/package/qtopia4/Config.in b/package/qtopia4/Config.in
index 94c29326e..1f7153e3a 100644
--- a/package/qtopia4/Config.in
+++ b/package/qtopia4/Config.in
@@ -147,6 +147,12 @@ config BR2_PACKAGE_QTOPIA4_QTTIFF
endchoice
+config BR2_PACKAGE_QTOPIA4_SVG
+ bool "Enable SVG support"
+ depends BR2_PACKAGE_QTOPIA4
+ help
+ Enable the QtSvg library.
+
config BR2_PACKAGE_QTOPIA4_SQL
bool "Enable SQL support"
depends BR2_PACKAGE_QTOPIA4
diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk
index a5319c9c9..ee33339bf 100644
--- a/package/qtopia4/qtopia4.mk
+++ b/package/qtopia4/qtopia4.mk
@@ -154,6 +154,12 @@ else
QTOPIA4_OPENSSL=-no-openssl
endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_SVG),y)
+QTOPIA4_SVG=-svg
+else
+QTOPIA4_SVG=-no-svg
+endif
+
ifeq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
QTOPIA4_SQL_IBASE=-qt-sql-ibase
QTOPIA4_SQL_MYSQL=-qt-sql-mysql
@@ -220,6 +226,7 @@ endif
$(QTOPIA4_PNG) \
$(QTOPIA4_TIFF) \
$(QTOPIA4_ZLIB) \
+ $(QTOPIA4_SVG) \
$(QTOPIA4_SQL_IBASE) \
$(QTOPIA4_SQL_MYSQL) \
$(QTOPIA4_SQL_ODBC) \
@@ -260,20 +267,22 @@ $(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la
cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
cp -dpf $(STAGING_DIR)/usr/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
- -$(STRIPCMD) --strip-unneeded $(TARGET_DIR)/usr/lib/libQt*.so.*
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*
endif
# Install image plugins if they are built
if [ -d $(STAGING_DIR)/usr/plugins/imageformats ]; then \
mkdir -p $(TARGET_DIR)/usr/plugins; \
cp -dpfr $(STAGING_DIR)/usr/plugins/imageformats $(TARGET_DIR)/usr/plugins/; \
- $(STRIPCMD) --strip-unneeded $(TARGET_DIR)/usr/plugins/imageformats/*; \
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/imageformats/*; \
fi
ifneq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
# Remove Sql libraries, not needed
-rm $(TARGET_DIR)/usr/lib/libQtSql*
endif
+ifneq ($(BR2_PACKAGE_QTOPIA4_SVG),y)
# Remove Svg libraries, not needed
-rm $(TARGET_DIR)/usr/lib/libQtSvg*
+endif
qtopia4: uclibc zlib $(QTOPIA4_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4