summaryrefslogtreecommitdiffstats
path: root/meta-moblin
diff options
context:
space:
mode:
Diffstat (limited to 'meta-moblin')
-rw-r--r--meta-moblin/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch123
-rw-r--r--meta-moblin/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf1
-rw-r--r--meta-moblin/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch22
-rw-r--r--meta-moblin/packages/qmake/qmake2-cross_2.10a.bb69
-rw-r--r--meta-moblin/packages/uicmoc/uicmoc4-native.inc62
-rw-r--r--meta-moblin/packages/uicmoc/uicmoc4-native_4.3.2.bb1
6 files changed, 0 insertions, 278 deletions
diff --git a/meta-moblin/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch b/meta-moblin/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch
deleted file mode 100644
index abebfdfa27..0000000000
--- a/meta-moblin/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch
+++ /dev/null
@@ -1,123 +0,0 @@
1From 594157753a24d0575aaf948dc0e9500f6bdb2178 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Sat, 2 Jun 2007 16:39:58 +0200
4Subject: [PATCH] fix mkspecs
5
6---
7 mkspecs/common/g++.conf | 18 +++++++++---------
8 mkspecs/common/linux.conf | 26 +++++++++++++-------------
9 2 files changed, 22 insertions(+), 22 deletions(-)
10
11diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
12index f5a5c8e..4007c7e 100644
13--- a/mkspecs/common/g++.conf
14+++ b/mkspecs/common/g++.conf
15@@ -2,12 +2,12 @@
16 # qmake configuration for common gcc
17 #
18
19-QMAKE_CC = gcc
20-QMAKE_CFLAGS += -pipe
21+QMAKE_CC = $(OE_QMAKE_CC)
22+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
23 QMAKE_CFLAGS_DEPS += -M
24 QMAKE_CFLAGS_WARN_ON += -Wall -W
25 QMAKE_CFLAGS_WARN_OFF += -w
26-QMAKE_CFLAGS_RELEASE += -O2
27+QMAKE_CFLAGS_RELEASE += -O2
28 QMAKE_CFLAGS_DEBUG += -g
29 QMAKE_CFLAGS_SHLIB += -fPIC
30 QMAKE_CFLAGS_STATIC_LIB += -fPIC
31@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
32 QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
33 QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
34
35-QMAKE_CXX = g++
36-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
37+QMAKE_CXX = $(OE_QMAKE_CXX)
38+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
39 QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
40 QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
41 QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
42@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
43 QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
44 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
45
46-QMAKE_LINK = g++
47-QMAKE_LINK_SHLIB = g++
48-QMAKE_LFLAGS +=
49+QMAKE_LINK = $(OE_QMAKE_LINK)
50+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
51+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
52 QMAKE_LFLAGS_RELEASE +=
53 QMAKE_LFLAGS_DEBUG +=
54 QMAKE_LFLAGS_APP +=
55@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared
56 QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
57 QMAKE_LFLAGS_SONAME += -Wl,-soname,
58 QMAKE_LFLAGS_THREAD +=
59-QMAKE_RPATH = -Wl,-rpath,
60+QMAKE_RPATH = -Wl,-rpath-link,
61
62 QMAKE_PCH_OUTPUT_EXT = .gch
63
64diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
65index 3796a87..52acf16 100644
66--- a/mkspecs/common/linux.conf
67+++ b/mkspecs/common/linux.conf
68@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
69
70 QMAKE_INCDIR =
71 QMAKE_LIBDIR =
72-QMAKE_INCDIR_X11 = /usr/X11R6/include
73-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
74-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
75-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
76-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
77-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
78+QMAKE_INCDIR_X11 =
79+QMAKE_LIBDIR_X11 =
80+QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
81+QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
82+QMAKE_INCDIR_OPENGL =
83+QMAKE_LIBDIR_OPENGL =
84
85 QMAKE_LIBS =
86 QMAKE_LIBS_DYNLOAD = -ldl
87-QMAKE_LIBS_X11 = -lXext -lX11 -lm
88-QMAKE_LIBS_X11SM = -lSM -lICE
89+QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
90+QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
91 QMAKE_LIBS_NIS = -lnsl
92 QMAKE_LIBS_OPENGL = -lGLU -lGL
93 QMAKE_LIBS_OPENGL_QT = -lGL
94 QMAKE_LIBS_THREAD = -lpthread
95
96-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
97-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
98+QMAKE_MOC = $(OE_QMAKE_MOC)
99+QMAKE_UIC = $(OE_QMAKE_UIC)
100
101-QMAKE_AR = ar cqs
102+QMAKE_AR = $(OE_QMAKE_AR) cqs
103 QMAKE_RANLIB =
104
105 QMAKE_TAR = tar -cf
106@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r
107 QMAKE_MOVE = mv -f
108 QMAKE_DEL_FILE = rm -f
109 QMAKE_DEL_DIR = rmdir
110-QMAKE_STRIP = strip
111+QMAKE_STRIP = $(OE_QMAKE_STRIP)
112 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
113 QMAKE_CHK_DIR_EXISTS = test -d
114 QMAKE_MKDIR = mkdir -p
115 QMAKE_INSTALL_FILE = install -m 644 -p
116 QMAKE_INSTALL_PROGRAM = install -m 755 -p
117
118-include(unix.conf)
119\ No newline at end of file
120+include(unix.conf)
121--
1221.5.1.6
123
diff --git a/meta-moblin/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf b/meta-moblin/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf
deleted file mode 100644
index f58481a693..0000000000
--- a/meta-moblin/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf
+++ /dev/null
@@ -1 +0,0 @@
1include(../linux-g++/qmake.conf)
diff --git a/meta-moblin/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch b/meta-moblin/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch
deleted file mode 100644
index 4197dbbf64..0000000000
--- a/meta-moblin/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Index: qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp
2===================================================================
3--- qtopia-core-opensource-src-4.3.1.orig/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:45:26.000000000 +0200
4+++ qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:57:09.000000000 +0200
5@@ -416,7 +416,7 @@
6 t << "\n\t" << mkdir_p_asstring(destdir) << "\n\t";
7 if(!project->isEmpty("QMAKE_PRE_LINK"))
8 t << var("QMAKE_PRE_LINK") << "\n\t";
9- t << "$(LINK) $(LFLAGS) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS)";
10+ t << "$(LINK) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS) $(LFLAGS)";
11 if(!project->isEmpty("QMAKE_POST_LINK"))
12 t << "\n\t" << var("QMAKE_POST_LINK");
13 t << endl << endl;
14@@ -430,7 +430,7 @@
15 t << mkdir_p_asstring(destdir) << "\n\t";
16 if(!project->isEmpty("QMAKE_PRE_LINK"))
17 t << var("QMAKE_PRE_LINK") << "\n\t";
18- t << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)";
19+ t << "$(LINK) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LFLAGS)";
20 if(!project->isEmpty("QMAKE_POST_LINK"))
21 t << "\n\t" << var("QMAKE_POST_LINK");
22 t << endl << endl;
diff --git a/meta-moblin/packages/qmake/qmake2-cross_2.10a.bb b/meta-moblin/packages/qmake/qmake2-cross_2.10a.bb
deleted file mode 100644
index c4f5867669..0000000000
--- a/meta-moblin/packages/qmake/qmake2-cross_2.10a.bb
+++ /dev/null
@@ -1,69 +0,0 @@
1DESCRIPTION = "TrollTech Makefile Generator"
2PRIORITY = "optional"
3HOMEPAGE = "http://www.trolltech.com"
4SECTION = "devel"
5LICENSE = "GPL"
6PR = "r2"
7
8QTVER = "qtopia-core-opensource-src-4.3.2"
9
10SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
11 file://0001-fix-mkspecs.patch;patch=1 \
12 file://use-lflags-last.patch;patch=1 \
13 file://linux-oe-qmake.conf"
14S = "${WORKDIR}/${QTVER}"
15
16# we need the real target system here
17CROSS_SYS := "${TARGET_SYS}"
18CROSS_BINDIR := "${STAGING_BINDIR_CROSS}"
19inherit autotools cross
20
21export QTDIR = "${S}"
22EXTRA_OEMAKE = "-e"
23
24do_configure() {
25 # Install the OE build templates
26 for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
27 do
28 install -d ${S}/mkspecs/$template
29 install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
30 ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
31 done
32
33 QMAKESPEC=
34 PLATFORM=${HOST_OS}-oe-g++
35 export PLATFORM
36 # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M:
37 export OE_QMAKE_CC="${CC}"
38 export OE_QMAKE_CFLAGS="${CFLAGS}"
39 export OE_QMAKE_CXX="${CXX}"
40 export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
41 export OE_QMAKE_LDFLAGS="${LDFLAGS}"
42 export OE_QMAKE_LINK="${CCLD}"
43 export OE_QMAKE_AR="${AR}"
44 export OE_QMAKE_STRIP="${STRIP}"
45 export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic4"
46 export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4"
47 export OE_QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4"
48 export OE_QMAKE_QMAKE="${CROSS_BINDIR}/qmake2"
49 export OE_QMAKE_RPATH="-Wl,-rpath-link,"
50 echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
51}
52
53do_compile() {
54 :
55}
56
57do_stage() {
58 install -d ${CROSS_BINDIR}/
59 install -m 0755 bin/qmake ${CROSS_BINDIR}/qmake2
60 install -m 0755 bin/qmake ${CROSS_BINDIR}/qmake-qt4
61 install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/
62 cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
63 install -d ${STAGING_DIR}/${HOST_SYS}/qt4/
64 cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/
65}
66
67do_install() {
68 :
69}
diff --git a/meta-moblin/packages/uicmoc/uicmoc4-native.inc b/meta-moblin/packages/uicmoc/uicmoc4-native.inc
deleted file mode 100644
index 8c4787866e..0000000000
--- a/meta-moblin/packages/uicmoc/uicmoc4-native.inc
+++ /dev/null
@@ -1,62 +0,0 @@
1DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
2DEPENDS = "zlib-native"
3SECTION = "libs"
4HOMEPAGE = "http://www.trolltech.com"
5PRIORITY = "optional"
6LICENSE = "GPL"
7PR = "r1"
8
9SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
10S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
11
12inherit native
13
14EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \
15 -qt-libjpeg -qt-gif -system-zlib \
16 -no-nis -no-cups -no-exceptions \
17 -no-accessibility -no-libjpeg \
18 -no-nas-sound -no-sm \
19 -no-xshape -no-xinerama \
20 -no-xcursor -no-xrandr \
21 -no-xrender -no-fontconfig \
22 -no-tablet -no-xkb \
23 -no-libpng \
24 -verbose -release -fast -static \
25 -L ${STAGING_LIBDIR_NATIVE} \
26 -qt3support "
27# yank default -e
28EXTRA_OEMAKE = " "
29
30do_configure() {
31 sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
32 echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
33}
34
35TOBUILD = "\
36 src/tools/moc \
37 src/corelib \
38 src/sql \
39 src/qt3support \
40 src/xml \
41 src/tools/uic \
42 src/tools/rcc \
43 src/network \
44 src/gui \
45 src/tools/uic3 \
46"
47
48do_compile() {
49 unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
50 for i in ${TOBUILD}; do
51 cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
52 done
53}
54
55do_stage() {
56 install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
57 install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
58 install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
59 install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
60 install -d ${STAGING_DIR_NATIVE}/qt4/
61 install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/
62}
diff --git a/meta-moblin/packages/uicmoc/uicmoc4-native_4.3.2.bb b/meta-moblin/packages/uicmoc/uicmoc4-native_4.3.2.bb
deleted file mode 100644
index 1950f63068..0000000000
--- a/meta-moblin/packages/uicmoc/uicmoc4-native_4.3.2.bb
+++ /dev/null
@@ -1 +0,0 @@
1require uicmoc4-native.inc