diff options
21 files changed, 1102 insertions, 0 deletions
diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass new file mode 100644 index 0000000000..d0f59d2cd4 --- /dev/null +++ b/meta/classes/qmake2.bbclass | |||
@@ -0,0 +1,20 @@ | |||
1 | # | ||
2 | # QMake variables for Qt4 | ||
3 | # | ||
4 | inherit qmake_base | ||
5 | |||
6 | DEPENDS_prepend = "qmake2-native uicmoc4-native " | ||
7 | |||
8 | export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" | ||
9 | export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" | ||
10 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" | ||
11 | export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" | ||
12 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" | ||
13 | export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4" | ||
14 | export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2" | ||
15 | export OE_QMAKE_LINK = "${CXX}" | ||
16 | export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" | ||
17 | export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" | ||
18 | export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" | ||
19 | export OE_QMAKE_LIBS_QT = "qt" | ||
20 | export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" | ||
diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass new file mode 100644 index 0000000000..ea8903c278 --- /dev/null +++ b/meta/classes/qmake_base.bbclass | |||
@@ -0,0 +1,88 @@ | |||
1 | |||
2 | OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" | ||
3 | QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" | ||
4 | |||
5 | # We override this completely to eliminate the -e normally passed in | ||
6 | EXTRA_OEMAKE = ' MAKEFLAGS= ' | ||
7 | |||
8 | export OE_QMAKE_CC="${CC}" | ||
9 | export OE_QMAKE_CFLAGS="${CFLAGS}" | ||
10 | export OE_QMAKE_CXX="${CXX}" | ||
11 | export OE_QMAKE_LDFLAGS="${LDFLAGS}" | ||
12 | export OE_QMAKE_AR="${AR}" | ||
13 | export OE_QMAKE_STRIP="echo" | ||
14 | export OE_QMAKE_RPATH="-Wl,-rpath-link," | ||
15 | |||
16 | # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 | ||
17 | |||
18 | oe_qmake_mkspecs () { | ||
19 | mkdir -p mkspecs/${OE_QMAKE_PLATFORM} | ||
20 | for f in ${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}/*; do | ||
21 | if [ -L $f ]; then | ||
22 | lnk=`readlink $f` | ||
23 | if [ -f mkspecs/${OE_QMAKE_PLATFORM}/$lnk ]; then | ||
24 | ln -s $lnk mkspecs/${OE_QMAKE_PLATFORM}/`basename $f` | ||
25 | else | ||
26 | cp $f mkspecs/${OE_QMAKE_PLATFORM}/ | ||
27 | fi | ||
28 | else | ||
29 | cp $f mkspecs/${OE_QMAKE_PLATFORM}/ | ||
30 | fi | ||
31 | done | ||
32 | } | ||
33 | |||
34 | qmake_base_do_configure() { | ||
35 | case ${QMAKESPEC} in | ||
36 | *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++) | ||
37 | ;; | ||
38 | *-oe-g++) | ||
39 | die Unsupported target ${TARGET_OS} for oe-g++ qmake spec | ||
40 | ;; | ||
41 | *) | ||
42 | oenote Searching for qmake spec file | ||
43 | paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++" | ||
44 | paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths" | ||
45 | |||
46 | if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then | ||
47 | paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-x86-g++ $paths" | ||
48 | fi | ||
49 | for i in $paths; do | ||
50 | if test -e $i; then | ||
51 | export QMAKESPEC=$i | ||
52 | break | ||
53 | fi | ||
54 | done | ||
55 | ;; | ||
56 | esac | ||
57 | |||
58 | oenote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'" | ||
59 | |||
60 | if [ -z "${QMAKE_PROFILES}" ]; then | ||
61 | PROFILES="`ls *.pro`" | ||
62 | else | ||
63 | PROFILES="${QMAKE_PROFILES}" | ||
64 | fi | ||
65 | |||
66 | if [ -z "$PROFILES" ]; then | ||
67 | die "QMAKE_PROFILES not set and no profiles found in $PWD" | ||
68 | fi | ||
69 | |||
70 | if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then | ||
71 | AFTER="-after" | ||
72 | QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}" | ||
73 | oenote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}" | ||
74 | fi | ||
75 | |||
76 | if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then | ||
77 | QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}" | ||
78 | oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" | ||
79 | fi | ||
80 | |||
81 | #oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" | ||
82 | unset QMAKESPEC || true | ||
83 | ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES" | ||
84 | } | ||
85 | |||
86 | EXPORT_FUNCTIONS do_configure | ||
87 | |||
88 | addtask configure after do_unpack do_patch before do_compile | ||
diff --git a/meta/packages/gperf/files/autoreconf.patch b/meta/packages/gperf/files/autoreconf.patch new file mode 100644 index 0000000000..432023067b --- /dev/null +++ b/meta/packages/gperf/files/autoreconf.patch | |||
@@ -0,0 +1,435 @@ | |||
1 | Index: gperf-3.0.3/configure.ac | ||
2 | =================================================================== | ||
3 | --- gperf-3.0.3.orig/configure.ac 2007-05-10 18:34:15.000000000 +0200 | ||
4 | +++ gperf-3.0.3/configure.ac 2007-05-10 18:34:26.000000000 +0200 | ||
5 | @@ -21,7 +21,7 @@ | ||
6 | dnl If not, write to the Free Software Foundation, Inc., | ||
7 | dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
8 | |||
9 | -AC_PREREQ([2.60]) | ||
10 | +AC_PREREQ([2.59]) | ||
11 | AC_INIT(doc/gperf.1) | ||
12 | AC_PROG_MAKE_SET | ||
13 | AC_OBJEXT | ||
14 | Index: gperf-3.0.3/doc/configure.ac | ||
15 | =================================================================== | ||
16 | --- gperf-3.0.3.orig/doc/configure.ac 2007-05-10 18:34:30.000000000 +0200 | ||
17 | +++ gperf-3.0.3/doc/configure.ac 2007-05-10 18:34:37.000000000 +0200 | ||
18 | @@ -21,7 +21,7 @@ | ||
19 | dnl If not, write to the Free Software Foundation, Inc., | ||
20 | dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ | ||
21 | |||
22 | -AC_PREREQ([2.60]) | ||
23 | +AC_PREREQ([2.59]) | ||
24 | AC_INIT(gperf.1) | ||
25 | PACKAGE=gperf | ||
26 | AC_SUBST(PACKAGE) | ||
27 | Index: gperf-3.0.3/lib/configure.ac | ||
28 | =================================================================== | ||
29 | --- gperf-3.0.3.orig/lib/configure.ac 2007-05-10 18:34:41.000000000 +0200 | ||
30 | +++ gperf-3.0.3/lib/configure.ac 2007-05-10 18:34:46.000000000 +0200 | ||
31 | @@ -21,7 +21,7 @@ | ||
32 | dnl If not, write to the Free Software Foundation, Inc., | ||
33 | dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ | ||
34 | |||
35 | -AC_PREREQ([2.60]) | ||
36 | +AC_PREREQ([2.59]) | ||
37 | AC_INIT(hash.cc) | ||
38 | AC_PROG_MAKE_SET | ||
39 | dnl | ||
40 | Index: gperf-3.0.3/src/configure.ac | ||
41 | =================================================================== | ||
42 | --- gperf-3.0.3.orig/src/configure.ac 2007-05-10 18:34:53.000000000 +0200 | ||
43 | +++ gperf-3.0.3/src/configure.ac 2007-05-10 18:34:58.000000000 +0200 | ||
44 | @@ -21,7 +21,7 @@ | ||
45 | dnl If not, write to the Free Software Foundation, Inc., | ||
46 | dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
47 | |||
48 | -AC_PREREQ([2.60]) | ||
49 | +AC_PREREQ([2.59]) | ||
50 | AC_INIT(main.cc) | ||
51 | AC_CONFIG_HEADER(config.h) | ||
52 | AC_PROG_MAKE_SET | ||
53 | Index: gperf-3.0.3/tests/configure.ac | ||
54 | =================================================================== | ||
55 | --- gperf-3.0.3.orig/tests/configure.ac 2007-05-10 18:35:03.000000000 +0200 | ||
56 | +++ gperf-3.0.3/tests/configure.ac 2007-05-10 18:35:08.000000000 +0200 | ||
57 | @@ -21,7 +21,7 @@ | ||
58 | dnl If not, write to the Free Software Foundation, Inc., | ||
59 | dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
60 | |||
61 | -AC_PREREQ([2.60]) | ||
62 | +AC_PREREQ([2.59]) | ||
63 | AC_INIT(c-parse.gperf) | ||
64 | AC_PROG_MAKE_SET | ||
65 | dnl | ||
66 | Index: gperf-3.0.3/acinclude.m4 | ||
67 | =================================================================== | ||
68 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
69 | +++ gperf-3.0.3/acinclude.m4 2007-05-10 18:36:09.000000000 +0200 | ||
70 | @@ -0,0 +1,69 @@ | ||
71 | +AC_PREREQ(2.12) | ||
72 | + | ||
73 | +AC_DEFUN(CL_PROG_INSTALL, | ||
74 | +[dnl This is mostly copied from AC_PROG_INSTALL. | ||
75 | +# Find a good install program. We prefer a C program (faster), | ||
76 | +# so one script is as good as another. But avoid the broken or | ||
77 | +# incompatible versions: | ||
78 | +# SysV /etc/install, /usr/sbin/install | ||
79 | +# SunOS /usr/etc/install | ||
80 | +# IRIX /sbin/install | ||
81 | +# AIX /bin/install | ||
82 | +# AFS /usr/afsws/bin/install, which mishandles nonexistent args | ||
83 | +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
84 | +# ./install, which can be erroneously created by make from ./install.sh. | ||
85 | +AC_MSG_CHECKING(for a BSD compatible install) | ||
86 | +if test -z "$INSTALL"; then | ||
87 | +AC_CACHE_VAL(cl_cv_path_install, | ||
88 | +[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | ||
89 | + for ac_dir in $PATH; do | ||
90 | + # Account for people who put trailing slashes in PATH elements. | ||
91 | + case "$ac_dir/" in | ||
92 | + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; | ||
93 | + *) | ||
94 | + # OSF1 and SCO ODT 3.0 have their own names for install. | ||
95 | + for ac_prog in ginstall installbsd scoinst install; do | ||
96 | + if test -f $ac_dir/$ac_prog; then | ||
97 | + if test $ac_prog = install && | ||
98 | + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then | ||
99 | + # AIX install. It has an incompatible calling convention. | ||
100 | + # OSF/1 installbsd also uses dspmsg, but is usable. | ||
101 | + : | ||
102 | + else | ||
103 | + if test $ac_prog = installbsd && | ||
104 | + grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then | ||
105 | + # AIX installbsd doesn't work without option "-g". | ||
106 | + : | ||
107 | + else | ||
108 | + cl_cv_path_install="$ac_dir/$ac_prog -c" | ||
109 | + break 2 | ||
110 | + fi | ||
111 | + fi | ||
112 | + fi | ||
113 | + done | ||
114 | + ;; | ||
115 | + esac | ||
116 | + done | ||
117 | + IFS="$ac_save_ifs" | ||
118 | + # As a last resort, use cp. | ||
119 | + test -z "$cl_cv_path_install" && cl_cv_path_install="cp" | ||
120 | +])dnl | ||
121 | + INSTALL="$cl_cv_path_install" | ||
122 | +fi | ||
123 | +dnl We do special magic for INSTALL instead of AC_SUBST, to get | ||
124 | +dnl relative paths right. | ||
125 | +AC_MSG_RESULT($INSTALL) | ||
126 | +AC_SUBST(INSTALL)dnl | ||
127 | +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. | ||
128 | +# It thinks the first close brace ends the variable substitution. | ||
129 | +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)' | ||
130 | +AC_SUBST(INSTALL_PROGRAM)dnl | ||
131 | +if test -z "$INSTALL_DATA"; then | ||
132 | + case "$INSTALL" in | ||
133 | + cp | */cp ) INSTALL_DATA='$(INSTALL)' ;; | ||
134 | + * ) INSTALL_DATA='$(INSTALL) -m 644' ;; | ||
135 | + esac | ||
136 | +fi | ||
137 | +AC_SUBST(INSTALL_DATA)dnl | ||
138 | +]) | ||
139 | + | ||
140 | Index: gperf-3.0.3/doc/acinclude.m4 | ||
141 | =================================================================== | ||
142 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
143 | +++ gperf-3.0.3/doc/acinclude.m4 2007-05-10 18:36:11.000000000 +0200 | ||
144 | @@ -0,0 +1,69 @@ | ||
145 | +AC_PREREQ(2.12) | ||
146 | + | ||
147 | +AC_DEFUN(CL_PROG_INSTALL, | ||
148 | +[dnl This is mostly copied from AC_PROG_INSTALL. | ||
149 | +# Find a good install program. We prefer a C program (faster), | ||
150 | +# so one script is as good as another. But avoid the broken or | ||
151 | +# incompatible versions: | ||
152 | +# SysV /etc/install, /usr/sbin/install | ||
153 | +# SunOS /usr/etc/install | ||
154 | +# IRIX /sbin/install | ||
155 | +# AIX /bin/install | ||
156 | +# AFS /usr/afsws/bin/install, which mishandles nonexistent args | ||
157 | +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
158 | +# ./install, which can be erroneously created by make from ./install.sh. | ||
159 | +AC_MSG_CHECKING(for a BSD compatible install) | ||
160 | +if test -z "$INSTALL"; then | ||
161 | +AC_CACHE_VAL(cl_cv_path_install, | ||
162 | +[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | ||
163 | + for ac_dir in $PATH; do | ||
164 | + # Account for people who put trailing slashes in PATH elements. | ||
165 | + case "$ac_dir/" in | ||
166 | + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; | ||
167 | + *) | ||
168 | + # OSF1 and SCO ODT 3.0 have their own names for install. | ||
169 | + for ac_prog in ginstall installbsd scoinst install; do | ||
170 | + if test -f $ac_dir/$ac_prog; then | ||
171 | + if test $ac_prog = install && | ||
172 | + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then | ||
173 | + # AIX install. It has an incompatible calling convention. | ||
174 | + # OSF/1 installbsd also uses dspmsg, but is usable. | ||
175 | + : | ||
176 | + else | ||
177 | + if test $ac_prog = installbsd && | ||
178 | + grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then | ||
179 | + # AIX installbsd doesn't work without option "-g". | ||
180 | + : | ||
181 | + else | ||
182 | + cl_cv_path_install="$ac_dir/$ac_prog -c" | ||
183 | + break 2 | ||
184 | + fi | ||
185 | + fi | ||
186 | + fi | ||
187 | + done | ||
188 | + ;; | ||
189 | + esac | ||
190 | + done | ||
191 | + IFS="$ac_save_ifs" | ||
192 | + # As a last resort, use cp. | ||
193 | + test -z "$cl_cv_path_install" && cl_cv_path_install="cp" | ||
194 | +])dnl | ||
195 | + INSTALL="$cl_cv_path_install" | ||
196 | +fi | ||
197 | +dnl We do special magic for INSTALL instead of AC_SUBST, to get | ||
198 | +dnl relative paths right. | ||
199 | +AC_MSG_RESULT($INSTALL) | ||
200 | +AC_SUBST(INSTALL)dnl | ||
201 | +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. | ||
202 | +# It thinks the first close brace ends the variable substitution. | ||
203 | +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)' | ||
204 | +AC_SUBST(INSTALL_PROGRAM)dnl | ||
205 | +if test -z "$INSTALL_DATA"; then | ||
206 | + case "$INSTALL" in | ||
207 | + cp | */cp ) INSTALL_DATA='$(INSTALL)' ;; | ||
208 | + * ) INSTALL_DATA='$(INSTALL) -m 644' ;; | ||
209 | + esac | ||
210 | +fi | ||
211 | +AC_SUBST(INSTALL_DATA)dnl | ||
212 | +]) | ||
213 | + | ||
214 | Index: gperf-3.0.3/lib/acinclude.m4 | ||
215 | =================================================================== | ||
216 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
217 | +++ gperf-3.0.3/lib/acinclude.m4 2007-05-10 18:36:14.000000000 +0200 | ||
218 | @@ -0,0 +1,69 @@ | ||
219 | +AC_PREREQ(2.12) | ||
220 | + | ||
221 | +AC_DEFUN(CL_PROG_INSTALL, | ||
222 | +[dnl This is mostly copied from AC_PROG_INSTALL. | ||
223 | +# Find a good install program. We prefer a C program (faster), | ||
224 | +# so one script is as good as another. But avoid the broken or | ||
225 | +# incompatible versions: | ||
226 | +# SysV /etc/install, /usr/sbin/install | ||
227 | +# SunOS /usr/etc/install | ||
228 | +# IRIX /sbin/install | ||
229 | +# AIX /bin/install | ||
230 | +# AFS /usr/afsws/bin/install, which mishandles nonexistent args | ||
231 | +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
232 | +# ./install, which can be erroneously created by make from ./install.sh. | ||
233 | +AC_MSG_CHECKING(for a BSD compatible install) | ||
234 | +if test -z "$INSTALL"; then | ||
235 | +AC_CACHE_VAL(cl_cv_path_install, | ||
236 | +[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | ||
237 | + for ac_dir in $PATH; do | ||
238 | + # Account for people who put trailing slashes in PATH elements. | ||
239 | + case "$ac_dir/" in | ||
240 | + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; | ||
241 | + *) | ||
242 | + # OSF1 and SCO ODT 3.0 have their own names for install. | ||
243 | + for ac_prog in ginstall installbsd scoinst install; do | ||
244 | + if test -f $ac_dir/$ac_prog; then | ||
245 | + if test $ac_prog = install && | ||
246 | + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then | ||
247 | + # AIX install. It has an incompatible calling convention. | ||
248 | + # OSF/1 installbsd also uses dspmsg, but is usable. | ||
249 | + : | ||
250 | + else | ||
251 | + if test $ac_prog = installbsd && | ||
252 | + grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then | ||
253 | + # AIX installbsd doesn't work without option "-g". | ||
254 | + : | ||
255 | + else | ||
256 | + cl_cv_path_install="$ac_dir/$ac_prog -c" | ||
257 | + break 2 | ||
258 | + fi | ||
259 | + fi | ||
260 | + fi | ||
261 | + done | ||
262 | + ;; | ||
263 | + esac | ||
264 | + done | ||
265 | + IFS="$ac_save_ifs" | ||
266 | + # As a last resort, use cp. | ||
267 | + test -z "$cl_cv_path_install" && cl_cv_path_install="cp" | ||
268 | +])dnl | ||
269 | + INSTALL="$cl_cv_path_install" | ||
270 | +fi | ||
271 | +dnl We do special magic for INSTALL instead of AC_SUBST, to get | ||
272 | +dnl relative paths right. | ||
273 | +AC_MSG_RESULT($INSTALL) | ||
274 | +AC_SUBST(INSTALL)dnl | ||
275 | +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. | ||
276 | +# It thinks the first close brace ends the variable substitution. | ||
277 | +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)' | ||
278 | +AC_SUBST(INSTALL_PROGRAM)dnl | ||
279 | +if test -z "$INSTALL_DATA"; then | ||
280 | + case "$INSTALL" in | ||
281 | + cp | */cp ) INSTALL_DATA='$(INSTALL)' ;; | ||
282 | + * ) INSTALL_DATA='$(INSTALL) -m 644' ;; | ||
283 | + esac | ||
284 | +fi | ||
285 | +AC_SUBST(INSTALL_DATA)dnl | ||
286 | +]) | ||
287 | + | ||
288 | Index: gperf-3.0.3/src/acinclude.m4 | ||
289 | =================================================================== | ||
290 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
291 | +++ gperf-3.0.3/src/acinclude.m4 2007-05-10 18:36:12.000000000 +0200 | ||
292 | @@ -0,0 +1,69 @@ | ||
293 | +AC_PREREQ(2.12) | ||
294 | + | ||
295 | +AC_DEFUN(CL_PROG_INSTALL, | ||
296 | +[dnl This is mostly copied from AC_PROG_INSTALL. | ||
297 | +# Find a good install program. We prefer a C program (faster), | ||
298 | +# so one script is as good as another. But avoid the broken or | ||
299 | +# incompatible versions: | ||
300 | +# SysV /etc/install, /usr/sbin/install | ||
301 | +# SunOS /usr/etc/install | ||
302 | +# IRIX /sbin/install | ||
303 | +# AIX /bin/install | ||
304 | +# AFS /usr/afsws/bin/install, which mishandles nonexistent args | ||
305 | +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
306 | +# ./install, which can be erroneously created by make from ./install.sh. | ||
307 | +AC_MSG_CHECKING(for a BSD compatible install) | ||
308 | +if test -z "$INSTALL"; then | ||
309 | +AC_CACHE_VAL(cl_cv_path_install, | ||
310 | +[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | ||
311 | + for ac_dir in $PATH; do | ||
312 | + # Account for people who put trailing slashes in PATH elements. | ||
313 | + case "$ac_dir/" in | ||
314 | + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; | ||
315 | + *) | ||
316 | + # OSF1 and SCO ODT 3.0 have their own names for install. | ||
317 | + for ac_prog in ginstall installbsd scoinst install; do | ||
318 | + if test -f $ac_dir/$ac_prog; then | ||
319 | + if test $ac_prog = install && | ||
320 | + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then | ||
321 | + # AIX install. It has an incompatible calling convention. | ||
322 | + # OSF/1 installbsd also uses dspmsg, but is usable. | ||
323 | + : | ||
324 | + else | ||
325 | + if test $ac_prog = installbsd && | ||
326 | + grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then | ||
327 | + # AIX installbsd doesn't work without option "-g". | ||
328 | + : | ||
329 | + else | ||
330 | + cl_cv_path_install="$ac_dir/$ac_prog -c" | ||
331 | + break 2 | ||
332 | + fi | ||
333 | + fi | ||
334 | + fi | ||
335 | + done | ||
336 | + ;; | ||
337 | + esac | ||
338 | + done | ||
339 | + IFS="$ac_save_ifs" | ||
340 | + # As a last resort, use cp. | ||
341 | + test -z "$cl_cv_path_install" && cl_cv_path_install="cp" | ||
342 | +])dnl | ||
343 | + INSTALL="$cl_cv_path_install" | ||
344 | +fi | ||
345 | +dnl We do special magic for INSTALL instead of AC_SUBST, to get | ||
346 | +dnl relative paths right. | ||
347 | +AC_MSG_RESULT($INSTALL) | ||
348 | +AC_SUBST(INSTALL)dnl | ||
349 | +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. | ||
350 | +# It thinks the first close brace ends the variable substitution. | ||
351 | +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)' | ||
352 | +AC_SUBST(INSTALL_PROGRAM)dnl | ||
353 | +if test -z "$INSTALL_DATA"; then | ||
354 | + case "$INSTALL" in | ||
355 | + cp | */cp ) INSTALL_DATA='$(INSTALL)' ;; | ||
356 | + * ) INSTALL_DATA='$(INSTALL) -m 644' ;; | ||
357 | + esac | ||
358 | +fi | ||
359 | +AC_SUBST(INSTALL_DATA)dnl | ||
360 | +]) | ||
361 | + | ||
362 | Index: gperf-3.0.3/tests/acinclude.m4 | ||
363 | =================================================================== | ||
364 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
365 | +++ gperf-3.0.3/tests/acinclude.m4 2007-05-10 18:36:16.000000000 +0200 | ||
366 | @@ -0,0 +1,69 @@ | ||
367 | +AC_PREREQ(2.12) | ||
368 | + | ||
369 | +AC_DEFUN(CL_PROG_INSTALL, | ||
370 | +[dnl This is mostly copied from AC_PROG_INSTALL. | ||
371 | +# Find a good install program. We prefer a C program (faster), | ||
372 | +# so one script is as good as another. But avoid the broken or | ||
373 | +# incompatible versions: | ||
374 | +# SysV /etc/install, /usr/sbin/install | ||
375 | +# SunOS /usr/etc/install | ||
376 | +# IRIX /sbin/install | ||
377 | +# AIX /bin/install | ||
378 | +# AFS /usr/afsws/bin/install, which mishandles nonexistent args | ||
379 | +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
380 | +# ./install, which can be erroneously created by make from ./install.sh. | ||
381 | +AC_MSG_CHECKING(for a BSD compatible install) | ||
382 | +if test -z "$INSTALL"; then | ||
383 | +AC_CACHE_VAL(cl_cv_path_install, | ||
384 | +[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | ||
385 | + for ac_dir in $PATH; do | ||
386 | + # Account for people who put trailing slashes in PATH elements. | ||
387 | + case "$ac_dir/" in | ||
388 | + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; | ||
389 | + *) | ||
390 | + # OSF1 and SCO ODT 3.0 have their own names for install. | ||
391 | + for ac_prog in ginstall installbsd scoinst install; do | ||
392 | + if test -f $ac_dir/$ac_prog; then | ||
393 | + if test $ac_prog = install && | ||
394 | + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then | ||
395 | + # AIX install. It has an incompatible calling convention. | ||
396 | + # OSF/1 installbsd also uses dspmsg, but is usable. | ||
397 | + : | ||
398 | + else | ||
399 | + if test $ac_prog = installbsd && | ||
400 | + grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then | ||
401 | + # AIX installbsd doesn't work without option "-g". | ||
402 | + : | ||
403 | + else | ||
404 | + cl_cv_path_install="$ac_dir/$ac_prog -c" | ||
405 | + break 2 | ||
406 | + fi | ||
407 | + fi | ||
408 | + fi | ||
409 | + done | ||
410 | + ;; | ||
411 | + esac | ||
412 | + done | ||
413 | + IFS="$ac_save_ifs" | ||
414 | + # As a last resort, use cp. | ||
415 | + test -z "$cl_cv_path_install" && cl_cv_path_install="cp" | ||
416 | +])dnl | ||
417 | + INSTALL="$cl_cv_path_install" | ||
418 | +fi | ||
419 | +dnl We do special magic for INSTALL instead of AC_SUBST, to get | ||
420 | +dnl relative paths right. | ||
421 | +AC_MSG_RESULT($INSTALL) | ||
422 | +AC_SUBST(INSTALL)dnl | ||
423 | +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. | ||
424 | +# It thinks the first close brace ends the variable substitution. | ||
425 | +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)' | ||
426 | +AC_SUBST(INSTALL_PROGRAM)dnl | ||
427 | +if test -z "$INSTALL_DATA"; then | ||
428 | + case "$INSTALL" in | ||
429 | + cp | */cp ) INSTALL_DATA='$(INSTALL)' ;; | ||
430 | + * ) INSTALL_DATA='$(INSTALL) -m 644' ;; | ||
431 | + esac | ||
432 | +fi | ||
433 | +AC_SUBST(INSTALL_DATA)dnl | ||
434 | +]) | ||
435 | + | ||
diff --git a/meta/packages/gperf/gperf-native_3.0.3.bb b/meta/packages/gperf/gperf-native_3.0.3.bb new file mode 100644 index 0000000000..103d1aa3c2 --- /dev/null +++ b/meta/packages/gperf/gperf-native_3.0.3.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require gperf_${PV}.bb | ||
2 | |||
3 | S = "${WORKDIR}/gperf-${PV}" | ||
4 | |||
5 | inherit native | ||
6 | |||
7 | do_stage() { | ||
8 | install -d ${STAGING_BINDIR_NATIVE} | ||
9 | install ${S}/src/gperf ${STAGING_BINDIR_NATIVE} | ||
10 | } | ||
diff --git a/meta/packages/gperf/gperf_3.0.3.bb b/meta/packages/gperf/gperf_3.0.3.bb new file mode 100644 index 0000000000..7abfb8fbfb --- /dev/null +++ b/meta/packages/gperf/gperf_3.0.3.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | HOMEPAGE = "http://www.gnu.org/software/gperf" | ||
2 | LICENSE = "GPL" | ||
3 | SUMMARY = "Generate a perfect hash function from a set of keywords" | ||
4 | |||
5 | SRC_URI = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz \ | ||
6 | file://autoreconf.patch;patch=1" | ||
7 | |||
8 | inherit autotools | ||
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc new file mode 100644 index 0000000000..b9031e202a --- /dev/null +++ b/meta/packages/icu/icu-3.6.inc | |||
@@ -0,0 +1,15 @@ | |||
1 | |||
2 | LICENSE = "ICU" | ||
3 | |||
4 | SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz" | ||
5 | |||
6 | S = "${WORKDIR}/icu/source" | ||
7 | |||
8 | inherit autotools pkgconfig binconfig | ||
9 | |||
10 | do_configure() { | ||
11 | libtoolize --force | ||
12 | oe_runconf | ||
13 | } | ||
14 | |||
15 | |||
diff --git a/meta/packages/icu/icu-native_3.6.bb b/meta/packages/icu/icu-native_3.6.bb new file mode 100644 index 0000000000..887bfcac2f --- /dev/null +++ b/meta/packages/icu/icu-native_3.6.bb | |||
@@ -0,0 +1,3 @@ | |||
1 | require icu-3.6.inc | ||
2 | |||
3 | inherit native | ||
diff --git a/meta/packages/icu/icu_3.6.bb b/meta/packages/icu/icu_3.6.bb new file mode 100644 index 0000000000..6d312a4496 --- /dev/null +++ b/meta/packages/icu/icu_3.6.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | require icu-3.6.inc | ||
2 | |||
3 | DEPENDS += "icu-native" | ||
4 | |||
5 | PR = "r2" | ||
6 | |||
7 | do_configure_append() { | ||
8 | for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do | ||
9 | sed -i -e 's:$(INVOKE) $(BINDIR)/:$(INVOKE) :g' $i | ||
10 | sed -i -e 's:$(BINDIR)/::g' $i | ||
11 | done | ||
12 | sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc || true | ||
13 | sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true | ||
14 | } | ||
15 | |||
16 | do_compile() { | ||
17 | oe_runmake 'CXX=${CXX}' | ||
18 | } | ||
19 | |||
20 | do_install_append() { | ||
21 | chmod +x ${D}${libdir}/lib* | ||
22 | } | ||
23 | |||
24 | PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio" | ||
25 | |||
26 | FILES_libicudata = "${libdir}/libicudata.so.*" | ||
27 | FILES_libicuuc = "${libdir}/libicuuc.so.*" | ||
28 | FILES_libicui18n = "${libdir}/libicui18n.so.*" | ||
29 | FILES_libicule = "${libdir}/libicule.so.*" | ||
30 | FILES_libiculx = "${libdir}/libiculx.so.*" | ||
31 | FILES_libicutu = "${libdir}/libicutu.so.*" | ||
32 | FILES_libicuio = "${libdir}/libicuio.so.*" | ||
33 | |||
34 | do_stage() { | ||
35 | autotools_stage_all | ||
36 | } | ||
37 | |||
38 | |||
diff --git a/meta/packages/libidn/libidn_0.5.19.bb b/meta/packages/libidn/libidn_0.5.19.bb new file mode 100644 index 0000000000..322790b8ab --- /dev/null +++ b/meta/packages/libidn/libidn_0.5.19.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | LICENSE = "LGPL" | ||
2 | DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group." | ||
3 | SECTION = "libs" | ||
4 | PRIORITY = "optional" | ||
5 | PR = "r0" | ||
6 | |||
7 | inherit pkgconfig autotools | ||
8 | |||
9 | SRC_URI = "http://josefsson.org/libidn/releases/${P}.tar.gz" | ||
10 | |||
11 | EXTRA_OECONF = " --disable-tld" | ||
12 | |||
13 | do_configure_prepend () { | ||
14 | autoreconf -f -i -s | ||
15 | } | ||
16 | |||
17 | do_stage () { | ||
18 | autotools_stage_all | ||
19 | } | ||
diff --git a/meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch b/meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch new file mode 100644 index 0000000000..abebfdfa27 --- /dev/null +++ b/meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch | |||
@@ -0,0 +1,123 @@ | |||
1 | From 594157753a24d0575aaf948dc0e9500f6bdb2178 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Krelin <hacker@klever.net> | ||
3 | Date: Sat, 2 Jun 2007 16:39:58 +0200 | ||
4 | Subject: [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 | |||
11 | diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf | ||
12 | index 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 | |||
64 | diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf | ||
65 | index 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 | -- | ||
122 | 1.5.1.6 | ||
123 | |||
diff --git a/meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf b/meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf new file mode 100644 index 0000000000..f58481a693 --- /dev/null +++ b/meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf | |||
@@ -0,0 +1 @@ | |||
include(../linux-g++/qmake.conf) | |||
diff --git a/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch b/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch new file mode 100644 index 0000000000..4197dbbf64 --- /dev/null +++ b/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Index: 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/packages/qmake/qmake2-native_2.10a.bb b/meta/packages/qmake/qmake2-native_2.10a.bb new file mode 100644 index 0000000000..84df0ef732 --- /dev/null +++ b/meta/packages/qmake/qmake2-native_2.10a.bb | |||
@@ -0,0 +1,67 @@ | |||
1 | DESCRIPTION = "TrollTech Makefile Generator" | ||
2 | PRIORITY = "optional" | ||
3 | HOMEPAGE = "http://www.trolltech.com" | ||
4 | SECTION = "devel" | ||
5 | LICENSE = "GPL" | ||
6 | PR = "r1" | ||
7 | |||
8 | QTVER = "qtopia-core-opensource-src-4.3.2" | ||
9 | |||
10 | SRC_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" | ||
14 | S = "${WORKDIR}/${QTVER}" | ||
15 | |||
16 | # we need the real target system here | ||
17 | CROSS_SYS := "${TARGET_SYS}" | ||
18 | inherit autotools native | ||
19 | |||
20 | export QTDIR = "${S}" | ||
21 | EXTRA_OEMAKE = "-e" | ||
22 | |||
23 | do_configure() { | ||
24 | # Install the OE build templates | ||
25 | for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ | ||
26 | do | ||
27 | install -d ${S}/mkspecs/$template | ||
28 | install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf | ||
29 | ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h | ||
30 | done | ||
31 | |||
32 | QMAKESPEC= | ||
33 | PLATFORM=${HOST_OS}-oe-g++ | ||
34 | export PLATFORM | ||
35 | # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: | ||
36 | export OE_QMAKE_CC="${CC}" | ||
37 | export OE_QMAKE_CFLAGS="${CFLAGS}" | ||
38 | export OE_QMAKE_CXX="${CXX}" | ||
39 | export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" | ||
40 | export OE_QMAKE_LDFLAGS="${LDFLAGS}" | ||
41 | export OE_QMAKE_LINK="${CCLD}" | ||
42 | export OE_QMAKE_AR="${AR}" | ||
43 | export OE_QMAKE_STRIP="${STRIP}" | ||
44 | export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" | ||
45 | export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" | ||
46 | export OE_QMAKE_RCC="non-existant" | ||
47 | export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" | ||
48 | export OE_QMAKE_RPATH="-Wl,-rpath-link," | ||
49 | echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" | ||
50 | } | ||
51 | |||
52 | do_compile() { | ||
53 | : | ||
54 | } | ||
55 | |||
56 | do_stage() { | ||
57 | install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 | ||
58 | install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 | ||
59 | install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ | ||
60 | cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ | ||
61 | install -d ${STAGING_DIR}/${HOST_SYS}/qt4/ | ||
62 | cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/ | ||
63 | } | ||
64 | |||
65 | do_install() { | ||
66 | : | ||
67 | } | ||
diff --git a/meta/packages/uicmoc/uicmoc4-native.inc b/meta/packages/uicmoc/uicmoc4-native.inc new file mode 100644 index 0000000000..8f0c715a89 --- /dev/null +++ b/meta/packages/uicmoc/uicmoc4-native.inc | |||
@@ -0,0 +1,61 @@ | |||
1 | DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" | ||
2 | DEPENDS = "zlib-native" | ||
3 | SECTION = "libs" | ||
4 | HOMEPAGE = "http://www.trolltech.com" | ||
5 | PRIORITY = "optional" | ||
6 | LICENSE = "GPL" | ||
7 | PR = "r0" | ||
8 | |||
9 | SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz" | ||
10 | S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" | ||
11 | |||
12 | inherit native | ||
13 | |||
14 | EXTRA_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 | -qt3support " | ||
26 | # yank default -e | ||
27 | EXTRA_OEMAKE = " " | ||
28 | |||
29 | do_configure() { | ||
30 | sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro | ||
31 | echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" | ||
32 | } | ||
33 | |||
34 | TOBUILD = "\ | ||
35 | src/tools/moc \ | ||
36 | src/corelib \ | ||
37 | src/sql \ | ||
38 | src/qt3support \ | ||
39 | src/xml \ | ||
40 | src/tools/uic \ | ||
41 | src/tools/rcc \ | ||
42 | src/network \ | ||
43 | src/gui \ | ||
44 | src/tools/uic3 \ | ||
45 | " | ||
46 | |||
47 | do_compile() { | ||
48 | unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS | ||
49 | for i in ${TOBUILD}; do | ||
50 | cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" | ||
51 | done | ||
52 | } | ||
53 | |||
54 | do_stage() { | ||
55 | install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 | ||
56 | install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 | ||
57 | install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 | ||
58 | install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 | ||
59 | install -d ${STAGING_DIR_NATIVE}/qt4/ | ||
60 | install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ | ||
61 | } | ||
diff --git a/meta/packages/uicmoc/uicmoc4-native_4.3.2.bb b/meta/packages/uicmoc/uicmoc4-native_4.3.2.bb new file mode 100644 index 0000000000..1950f63068 --- /dev/null +++ b/meta/packages/uicmoc/uicmoc4-native_4.3.2.bb | |||
@@ -0,0 +1 @@ | |||
require uicmoc4-native.inc | |||
diff --git a/meta/packages/webkit/files/Makefile b/meta/packages/webkit/files/Makefile new file mode 100644 index 0000000000..89344f7a58 --- /dev/null +++ b/meta/packages/webkit/files/Makefile | |||
@@ -0,0 +1,22 @@ | |||
1 | MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools | ||
2 | |||
3 | all: | ||
4 | @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ | ||
5 | if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done | ||
6 | |||
7 | debug d development dev develop: | ||
8 | @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ | ||
9 | if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done | ||
10 | |||
11 | release r deployment dep deploy: | ||
12 | @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ | ||
13 | if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done | ||
14 | |||
15 | universal u: | ||
16 | @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ | ||
17 | if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done | ||
18 | |||
19 | clean: | ||
20 | @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ | ||
21 | if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done | ||
22 | |||
diff --git a/meta/packages/webkit/files/Makefile.shared b/meta/packages/webkit/files/Makefile.shared new file mode 100644 index 0000000000..a036aacc50 --- /dev/null +++ b/meta/packages/webkit/files/Makefile.shared | |||
@@ -0,0 +1,21 @@ | |||
1 | SCRIPTS_PATH ?= ../WebKitTools/Scripts | ||
2 | XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) | ||
3 | |||
4 | all: | ||
5 | ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) | ||
6 | |||
7 | debug d development dev develop: force | ||
8 | $(SCRIPTS_PATH)/set-webkit-configuration --debug | ||
9 | ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) | ||
10 | |||
11 | release r deployment dep deploy: force | ||
12 | $(SCRIPTS_PATH)/set-webkit-configuration --release | ||
13 | ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) | ||
14 | |||
15 | universal u: force | ||
16 | ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} ) | ||
17 | |||
18 | clean: | ||
19 | ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) | ||
20 | |||
21 | force: ; | ||
diff --git a/meta/packages/webkit/files/WebKit.pri b/meta/packages/webkit/files/WebKit.pri new file mode 100644 index 0000000000..0c47afe7fd --- /dev/null +++ b/meta/packages/webkit/files/WebKit.pri | |||
@@ -0,0 +1,64 @@ | |||
1 | # Include file to make it easy to include WebKit into Qt projects | ||
2 | |||
3 | |||
4 | isEmpty(OUTPUT_DIR) { | ||
5 | CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release | ||
6 | CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug | ||
7 | } | ||
8 | |||
9 | !gtk-port:CONFIG += qt-port | ||
10 | qt-port:DEFINES += BUILDING_QT__=1 | ||
11 | qt-port:!building-libs { | ||
12 | QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR | ||
13 | LIBS += -lQtWebKit | ||
14 | } | ||
15 | gtk-port:CONFIG += link_pkgconfig | ||
16 | gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl | ||
17 | gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__ | ||
18 | gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng | ||
19 | gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) | ||
20 | |||
21 | DEFINES += USE_SYSTEM_MALLOC | ||
22 | CONFIG(release) { | ||
23 | DEFINES += NDEBUG | ||
24 | } | ||
25 | |||
26 | BASE_DIR = $$PWD | ||
27 | qt-port:INCLUDEPATH += \ | ||
28 | $$PWD/WebKit/qt/Api | ||
29 | gtk-port:INCLUDEPATH += \ | ||
30 | $$BASE_DIR/WebCore/platform/gtk \ | ||
31 | $$BASE_DIR/WebCore/platform/network/curl \ | ||
32 | $$BASE_DIR/WebCore/platform/graphics/cairo \ | ||
33 | $$BASE_DIR/WebCore/loader/gtk \ | ||
34 | $$BASE_DIR/WebCore/page/gtk \ | ||
35 | $$BASE_DIR/WebKit/gtk/Api \ | ||
36 | $$BASE_DIR/WebKit/gtk/WebCoreSupport | ||
37 | INCLUDEPATH += \ | ||
38 | $$BASE_DIR/JavaScriptCore/ \ | ||
39 | $$BASE_DIR/JavaScriptCore/kjs \ | ||
40 | $$BASE_DIR/JavaScriptCore/bindings \ | ||
41 | $$BASE_DIR/JavaScriptCore/bindings/c \ | ||
42 | $$BASE_DIR/JavaScriptCore/wtf \ | ||
43 | $$BASE_DIR/JavaScriptCore/ForwardingHeaders \ | ||
44 | $$BASE_DIR/WebCore \ | ||
45 | $$BASE_DIR/WebCore/ForwardingHeaders \ | ||
46 | $$BASE_DIR/WebCore/platform \ | ||
47 | $$BASE_DIR/WebCore/platform/network \ | ||
48 | $$BASE_DIR/WebCore/platform/graphics \ | ||
49 | $$BASE_DIR/WebCore/loader \ | ||
50 | $$BASE_DIR/WebCore/page \ | ||
51 | $$BASE_DIR/WebCore/css \ | ||
52 | $$BASE_DIR/WebCore/dom \ | ||
53 | $$BASE_DIR/WebCore/bridge \ | ||
54 | $$BASE_DIR/WebCore/editing \ | ||
55 | $$BASE_DIR/WebCore/rendering \ | ||
56 | $$BASE_DIR/WebCore/history \ | ||
57 | $$BASE_DIR/WebCore/xml \ | ||
58 | $$BASE_DIR/WebCore/html | ||
59 | |||
60 | |||
61 | macx { | ||
62 | INCLUDEPATH += /usr/include/libxml2 | ||
63 | LIBS += -lxml2 -lxslt | ||
64 | } | ||
diff --git a/meta/packages/webkit/files/WebKit.pro b/meta/packages/webkit/files/WebKit.pro new file mode 100644 index 0000000000..aab0209a93 --- /dev/null +++ b/meta/packages/webkit/files/WebKit.pro | |||
@@ -0,0 +1,11 @@ | |||
1 | TEMPLATE = subdirs | ||
2 | CONFIG += ordered | ||
3 | !gtk-port:CONFIG += qt-port | ||
4 | qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins | ||
5 | SUBDIRS += \ | ||
6 | WebCore | ||
7 | |||
8 | qt-port:SUBDIRS += \ | ||
9 | WebKit/qt/QtLauncher | ||
10 | gtk-port:SUBDIRS += \ | ||
11 | WebKitTools/GtkLauncher | ||
diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/packages/webkit/webkit-gtk_svn.bb new file mode 100644 index 0000000000..262c6820db --- /dev/null +++ b/meta/packages/webkit/webkit-gtk_svn.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+" | ||
2 | |||
3 | |||
4 | WEBKIT_PORT = "gtk-port" | ||
5 | WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt" | ||
6 | |||
7 | FILES_webkit-gtklauncher = "${bindir}/GtkLauncher" | ||
8 | FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher" | ||
9 | |||
10 | require webkit.inc | ||
11 | |||
12 | PR = "r3" | ||
13 | |||
14 | do_install() { | ||
15 | install -d ${D}${bindir} | ||
16 | install -d ${D}${libdir} | ||
17 | install -d ${D}${libdir}/pkgconfig | ||
18 | |||
19 | install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir} | ||
20 | cd ${S}/WebKitBuilds/Debug | ||
21 | PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro | ||
22 | oe_runmake install | ||
23 | } | ||
24 | |||
diff --git a/meta/packages/webkit/webkit.inc b/meta/packages/webkit/webkit.inc new file mode 100644 index 0000000000..2ff61091c3 --- /dev/null +++ b/meta/packages/webkit/webkit.inc | |||
@@ -0,0 +1,49 @@ | |||
1 | DEPENDS += "flex-native gperf-native perl-native sqlite3" | ||
2 | SRCREV_FORMAT = "webcore-rwebkit" | ||
3 | |||
4 | PACKAGES =+ "${PN}launcher-dbg ${PN}launcher" | ||
5 | |||
6 | # Yes, this is wrong... | ||
7 | PV = "0.1+svnr${SRCREV}" | ||
8 | |||
9 | inherit qmake2 pkgconfig | ||
10 | |||
11 | SRC_URI = "\ | ||
12 | svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ | ||
13 | svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \ | ||
14 | svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \ | ||
15 | svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \ | ||
16 | svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \ | ||
17 | svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \ | ||
18 | file://Makefile \ | ||
19 | file://Makefile.shared \ | ||
20 | file://WebKit.pri \ | ||
21 | file://WebKit.pro \ | ||
22 | " | ||
23 | S = "${WORKDIR}/" | ||
24 | |||
25 | WEBKIT_QMAKE = "qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ ${WEBKIT_EXTRA_OPTIONS} CONFIG+=${WEBKIT_PORT}" | ||
26 | |||
27 | do_configure() { | ||
28 | qmake2 -spec ${QMAKESPEC} CONFIG+=${WEBKIT_PORT} ${WEBKIT_EXTRA_OPTIONS} CONFIG-=release CONFIG+=debug | ||
29 | mkdir -p WebKitBuilds/Debug | ||
30 | cd WebKitBuilds/Debug | ||
31 | PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir} $PWD/../../WebKit.pro | ||
32 | } | ||
33 | |||
34 | do_compile_prepend() { | ||
35 | mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ | ||
36 | cd ${S}/JavaScriptCore/pcre | ||
37 | ${BUILD_CC} dftables.c -o dftables -I. -I../wtf | ||
38 | cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ | ||
39 | cd ${S}/WebKitBuilds/Debug | ||
40 | } | ||
41 | |||
42 | do_stage() { | ||
43 | install -d ${STAGING_LIBDIR} | ||
44 | install -d ${STAGING_INCDIR} | ||
45 | cd ${S}/WebKitBuilds/Debug | ||
46 | PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} $PWD/../../WebKit.pro | ||
47 | oe_runmake install | ||
48 | } | ||
49 | |||