diff options
| -rw-r--r-- | classes/icecc.bbclass | 120 | ||||
| -rw-r--r-- | classes/tinderclient.bbclass | 10 | ||||
| -rw-r--r-- | packages/gnome/libsoup_2.2.96.bb | 18 | ||||
| -rw-r--r-- | packages/gstreamer/gst-plugins.inc | 12 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3-3.3.7/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3-3.3.7/cross-compile.patch | 92 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3-3.3.7/ldflags.patch | 67 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3-3.3.7/libtool.patch | 25 | ||||
| -rw-r--r-- | packages/sqlite/sqlite3_3.3.7.bb | 2 | ||||
| -rw-r--r-- | packages/starling/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/starling/starling_0.1.bb | 26 |
11 files changed, 312 insertions, 60 deletions
diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 7dfcfc29a4..66a5bf79e3 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -1,9 +1,17 @@ # IceCream distributed compiling support -# +# # We need to create a tar.bz2 of our toolchain and set # ICECC_VERSION, ICECC_CXX and ICEC_CC # +def icc_determine_gcc_version(gcc): + """ + Hack to determine the version of GCC + + 'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5363)' + """ + return os.popen("%s --version" % gcc ).readline()[2] + def create_env(bb,d): """ Create a tar.bz of the current toolchain @@ -13,7 +21,7 @@ def create_env(bb,d): # host prefix is empty (let us duplicate the query for ease) prefix = bb.data.expand('${HOST_PREFIX}', d) if len(prefix) == 0: - return "" + return "" import tarfile import socket @@ -23,51 +31,66 @@ def create_env(bb,d): prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) target_sys = bb.data.expand('${TARGET_SYS}', d) - #float = bb.data.getVar('${TARGET_FPU}', d) - float = "anyfloat" + float = bb.data.getVar('${TARGET_FPU}', d) or "hard" name = socket.gethostname() + # Stupid check to determine if we have built a libc and a cross + # compiler. try: - os.stat(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2') - os.stat(ice_dir + '/' + target_sys + '/bin/g++') + os.stat(os.path.join(ice_dir, target_sys, 'lib', 'ld-linux.so.2')) + os.stat(os.path.join(ice_dir, target_sys, 'bin', 'g++')) except: - return "" + return "" - VERSION = '3.4.3' + VERSION = icc_determine_gcc_version( os.path.join(ice_dir,target_sys,"bin","g++") ) cross_name = prefix + distro + target_sys + float +VERSION+ name - tar_file = ice_dir + '/ice/' + cross_name + '.tar.bz2' + tar_file = os.path.join(ice_dir, 'ice', cross_name + '.tar.bz2') try: os.stat(tar_file) return tar_file except: - try: - os.makedirs(ice_dir+'/ice') - except: - pass + try: + os.makedirs(os.path.join(ice_dir,'ice')) + except: + pass # FIXME find out the version of the compiler + # Consider using -print-prog-name={cc1,cc1plus} + # and -print-file-name=specs + + # We will use the GCC to tell us which tools to use + # What we need is: + # -gcc + # -g++ + # -as + # -cc1 + # -cc1plus + # and we add them to /usr/bin + tar = tarfile.open(tar_file, 'w:bz2') - tar.add(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2', - target_sys + 'cross/lib/ld-linux.so.2') - tar.add(ice_dir + '/' + target_sys + '/lib/ld-linux.so.2', - target_sys + 'cross/lib/ld-2.3.3.so') - tar.add(ice_dir + '/' + target_sys + '/lib/libc-2.3.3.so', - target_sys + 'cross/lib/libc-2.3.3.so') - tar.add(ice_dir + '/' + target_sys + '/lib/libc.so.6', - target_sys + 'cross/lib/libc.so.6') - tar.add(ice_dir + '/' + target_sys + '/bin/gcc', - target_sys + 'cross/usr/bin/gcc') - tar.add(ice_dir + '/' + target_sys + '/bin/g++', - target_sys + 'cross/usr/bin/g++') - tar.add(ice_dir + '/' + target_sys + '/bin/as', - target_sys + 'cross/usr/bin/as') - tar.add(ice_dir + '/lib/gcc/' + target_sys +'/'+ VERSION + '/specs', - target_sys+'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/specs') - tar.add(ice_dir + '/libexec/gcc/'+target_sys+'/' + VERSION + '/cc1', - target_sys + 'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/cc1') - tar.add(ice_dir + '/libexec/gcc/arm-linux/' + VERSION + '/cc1plus', - target_sys+'cross/usr/lib/gcc/'+target_sys+'/'+VERSION+'/lib/cc1plus') + + # Now add the required files + tar.add(os.path.join(ice_dir,target_sys,'bin','gcc'), + os.path.join("usr","bin","gcc") ) + tar.add(os.path.join(ice_dir,target_sys,'bin','g++'), + os.path.join("usr","bin","g++") ) + tar.add(os.path.join(ice_dir,target_sys,'bin','as'), + os.path.join("usr","bin","as") ) + + # Now let us find cc1 and cc1plus + cc1 = os.popen("%s -print-prog-name=cc1" % data.getVar('CC', d, True)).read()[:-1] + cc1plus = os.popen("%s -print-prog-name=cc1plus" % data.getVar('CC', d, True)).read()[:-1] + spec = os.popen("%s -print-file-name=specs" % data.getVar('CC', d, True)).read()[:-1] + + # CC1 and CC1PLUS should be there... + tar.add(cc1, os.path.join('usr', 'bin', 'cc1')) + tar.add(cc1plus, os.path.join('usr', 'bin', 'cc1plus')) + + # spec - if it exists + if os.path.exists(spec): + tar.add(spec) + tar.close() return tar_file @@ -78,7 +101,7 @@ def create_path(compilers, type, bb, d): """ import os - staging = bb.data.expand('${STAGING_DIR}', d) + "/ice/" + type + staging = os.path.join(bb.data.expand('${STAGING_DIR}', d), "ice", type) icecc = bb.data.getVar('ICECC_PATH', d) # Create the dir if necessary @@ -89,7 +112,7 @@ def create_path(compilers, type, bb, d): for compiler in compilers: - gcc_path = staging + "/" + compiler + gcc_path = os.path.join(staging, compiler) try: os.stat(gcc_path) except: @@ -102,15 +125,14 @@ def use_icc_version(bb,d): # Constin native native prefix = bb.data.expand('${HOST_PREFIX}', d) if len(prefix) == 0: - return "no" - - - native = bb.data.expand('${PN}', d) - blacklist = [ "-cross", "-native" ] + return "no" + + + blacklist = [ "cross", "native" ] for black in blacklist: - if black in native: - return "no" + if bb.data.inherits_class(black, d): + return "no" return "yes" @@ -118,13 +140,13 @@ def icc_path(bb,d,compile): native = bb.data.expand('${PN}', d) blacklist = [ "ulibc", "glibc", "ncurses" ] for black in blacklist: - if black in native: - return "" + if black in native: + return "" - if "-native" in native: - compile = False - if "-cross" in native: - compile = False + blacklist = [ "cross", "native" ] + for black in blacklist: + if bb.data.inherits_class(black, d): + compile = False prefix = bb.data.expand('${HOST_PREFIX}', d) if compile and len(prefix) != 0: @@ -151,6 +173,6 @@ do_compile_prepend() { export ICECC_CXX="${HOST_PREFIX}g++" if [ "${@use_icc_version(bb,d)}" = "yes" ]; then - export ICECC_VERSION="${@icc_version(bb,d)}" + export ICECC_VERSION="${@icc_version(bb,d)}" fi } diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 1c8079ebc9..d36ef0b343 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -240,8 +240,8 @@ def tinder_tinder_start(d, event): output.append( "---> TINDERBOX BUILDING '%(packages)s'" ) output.append( "<--- TINDERBOX STARTING BUILD NOW" ) - output.append( "" ) - + output.append( "" ) + return "\n".join(output) % vars() def tinder_do_tinder_report(event): @@ -311,13 +311,13 @@ def tinder_do_tinder_report(event): elif name == "TaskFailed": log += "<--- TINDERBOX Task %s failed (FAILURE)\n" % event.task elif name == "PkgStarted": - log += "---> TINDERBOX Package %s started\n" % data.getVar('P', event.data, True) + log += "---> TINDERBOX Package %s started\n" % data.getVar('PF', event.data, True) elif name == "PkgSucceeded": - log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('P', event.data, True) + log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('PF', event.data, True) elif name == "PkgFailed": if not data.getVar('TINDER_AUTOBUILD', event.data, True) == "0": build.exec_task('do_clean', event.data) - log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True) + log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('PF', event.data, True) status = 200 # remember the failure for the -k case h = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') diff --git a/packages/gnome/libsoup_2.2.96.bb b/packages/gnome/libsoup_2.2.96.bb new file mode 100644 index 0000000000..33a4f16d06 --- /dev/null +++ b/packages/gnome/libsoup_2.2.96.bb @@ -0,0 +1,18 @@ +LICENSE = "GPL" +DESCRIPTION = "An HTTP library implementation in C" +SECTION = "x11/gnome/libs" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" +DEPENDS = "glib-2.0 gnutls libxml2" +MAINTAINER = "Chris Lord <chris@openedhand.com>" + +inherit autotools pkgconfig + +PACKAGES_DYNAMIC = "libsoup-2.2*" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" + +do_stage() { + autotools_stage_all + ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc +} diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc index 6ebf6560d1..54af128fb4 100644 --- a/packages/gstreamer/gst-plugins.inc +++ b/packages/gstreamer/gst-plugins.inc @@ -2,8 +2,8 @@ DESCRIPTION = "Plugins for GStreamer" SECTION = "multimedia" PRIORITY = "optional" MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>" -DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag" -PR = "r0" +DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound-gpe" +PR = "r1" # until we have decided for a final naming scheme, # keep using version 0.8 @@ -13,7 +13,7 @@ inherit autotools pkgconfig gconf SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" -EXTRA_OECONF = "--disable-x --disable-aalib --disable-esd --disable-shout2 \ +EXTRA_OECONF = "--disable-x --disable-aalib --disable-shout2 \ --disable-sdl" acpaths = "-I ${S}/common/m4 -I ${S}/m4" @@ -28,8 +28,8 @@ python populate_packages_prepend () { do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)') } -do_stage() { - autotools_stage_all -} +#do_stage() { +# autotools_stage_all +#} ALLOW_EMPTY = "1" diff --git a/packages/sqlite/sqlite3-3.3.7/.mtn2git_empty b/packages/sqlite/sqlite3-3.3.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.7/.mtn2git_empty diff --git a/packages/sqlite/sqlite3-3.3.7/cross-compile.patch b/packages/sqlite/sqlite3-3.3.7/cross-compile.patch new file mode 100644 index 0000000000..31d4f0d162 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.7/cross-compile.patch @@ -0,0 +1,92 @@ +--- sqlite-3.3.7/configure.ac.orig 2006-08-21 00:20:50.000000000 +0200 ++++ sqlite-3.3.7/configure.ac 2006-08-21 00:22:35.000000000 +0200 +@@ -187,10 +187,11 @@ + default_build_cflags="-g" + if test "$config_BUILD_CC" = ""; then + AC_PROG_CC +- if test "$cross_compiling" = "yes"; then +- AC_MSG_ERROR([unable to find a compiler for building build tools]) +- fi +- BUILD_CC=$CC ++# if test "$cross_compiling" = "yes"; then ++# AC_MSG_ERROR([unable to find a compiler for building build tools]) ++# fi ++# BUILD_CC=$CC ++BUILD_CC=gcc + default_build_cflags=$CFLAGS + else + BUILD_CC=$config_BUILD_CC +@@ -238,6 +239,12 @@ + TARGET_LINK=$config_TARGET_LINK + fi + AC_MSG_RESULT($TARGET_LINK) ++if test "$config_TARGET_LFLAGS" != ""; then ++ TARGET_LFLAGS=$config_TARGET_LFLAGS ++ else ++ TARGET_LFLAGS=$BUILD_LFLAGS ++ fi ++AC_MSG_RESULT($TARGET_LFLAGS) + AC_MSG_CHECKING([switches on the target compiler]) + if test "$config_TARGET_TFLAGS" != ""; then + TARGET_TFLAGS=$config_TARGET_TFLAGS +@@ -592,15 +599,7 @@ + # Figure out what C libraries are required to compile programs + # that use "readline()" library. + # +-if test "$config_TARGET_READLINE_LIBS" != ""; then +- TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS" +-else +- CC=$TARGET_CC +- LIBS="" +- AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap]) +- AC_CHECK_LIB([readline], [readline]) +- TARGET_READLINE_LIBS="$LIBS" +-fi ++TARGET_READLINE_LIBS="-lreadline" + AC_SUBST(TARGET_READLINE_LIBS) + + ########## +@@ -615,41 +614,8 @@ + ########## + # Figure out where to get the READLINE header files. + # +-AC_MSG_CHECKING([readline header files]) +-found=no +-if test "$config_TARGET_READLINE_INC" != ""; then +- TARGET_READLINE_INC=$config_TARGET_READLINE_INC +- found=yes +-fi +-if test "$found" = "yes"; then +- AC_MSG_RESULT($TARGET_READLINE_INC) +-else +- AC_MSG_RESULT(not specified: still searching...) +- AC_CHECK_HEADER(readline.h, [found=yes]) +-fi +-if test "$found" = "no"; then +- for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do +- AC_CHECK_FILE($dir/include/readline.h, found=yes) +- if test "$found" = "yes"; then +- TARGET_READLINE_INC="-I$dir/include" +- break +- fi +- AC_CHECK_FILE($dir/include/readline/readline.h, found=yes) +- if test "$found" = "yes"; then +- TARGET_READLINE_INC="-I$dir/include/readline" +- break +- fi +- done +-fi +-if test "$found" = "yes"; then +- if test "$TARGET_READLINE_LIBS" = ""; then +- TARGET_HAVE_READLINE=0 +- else +- TARGET_HAVE_READLINE=1 +- fi +-else +- TARGET_HAVE_READLINE=0 +-fi ++TARGET_READLINE_INC="" ++TARGET_HAVE_READLINE=1 + AC_SUBST(TARGET_READLINE_INC) + AC_SUBST(TARGET_HAVE_READLINE) + diff --git a/packages/sqlite/sqlite3-3.3.7/ldflags.patch b/packages/sqlite/sqlite3-3.3.7/ldflags.patch new file mode 100644 index 0000000000..ee5105ffff --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.7/ldflags.patch @@ -0,0 +1,67 @@ +--- sqlite-3.3.7/Makefile.in.orig 2006-08-20 23:05:36.000000000 +0200 ++++ sqlite-3.3.7/Makefile.in 2006-08-20 23:42:49.000000000 +0200 +@@ -31,6 +31,10 @@ + # + TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src + ++# OE overrides ++# ++TARGET_LFLAGS = @TARGET_LFLAGS@ ++ + # Define -DNDEBUG to compile without debugging (i.e., for production usage) + # Omitting the define will cause extra debugging code to be inserted and + # includes extra comments when "EXPLAIN stmt" is used. +@@ -257,17 +261,17 @@ + | $(NAWK) '{print $$5,$$6}' >last_change + + libsqlite3.la: $(LIBOBJ) +- $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ ++ $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \ + ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8" + + libtclsqlite3.la: tclsqlite.lo libsqlite3.la + $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ +- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \ ++ $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \ + -rpath $(libdir)/sqlite \ + -version-info "8:6:8" + + sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h +- $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \ ++ $(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \ + -o $@ $(TOP)/src/shell.c libsqlite3.la \ + $(LIBREADLINE) $(TLIBS) + +@@ -456,12 +460,12 @@ + + tclsqlite3: tclsqlite-shell.lo libsqlite3.la + $(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + testfixture$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC) + $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \ + $(TEMP_STORE) -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + + fulltest: testfixture$(TEXE) sqlite3$(TEXE) +@@ -471,7 +475,7 @@ + ./testfixture $(TOP)/test/quick.test + + sqlite3_analyzer$(TEXE): $(TOP)/src/tclsqlite.c libtclsqlite3.la \ +- $(TESTSRC) $(TOP)/tool/spaceanal.tcl ++ $(TARGET_LFLAGS) $(TESTSRC) $(TOP)/tool/spaceanal.tcl + sed \ + -e '/^#/d' \ + -e 's,\\,\\\\,g' \ +@@ -481,7 +485,7 @@ + $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h + $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\ + -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \ +- libtclsqlite3.la $(LIBTCL) ++ libtclsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + # Rules used to build documentation + # diff --git a/packages/sqlite/sqlite3-3.3.7/libtool.patch b/packages/sqlite/sqlite3-3.3.7/libtool.patch new file mode 100644 index 0000000000..ccf9993ed2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.7/libtool.patch @@ -0,0 +1,25 @@ +Index: sqlite-3.2.1/Makefile.in +=================================================================== +--- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 ++++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 +@@ -15,7 +15,10 @@ + # The toplevel directory of the source tree. This is the directory + # that contains this "Makefile.in" and the "configure.in" script. + # +-TOP = @srcdir@ ++TOP = $(srcdir) ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = . + + # C Compiler and options for use in building executables that + # will run on the platform that is doing the build. +@@ -96,7 +99,7 @@ + exec_prefix = @exec_prefix@ + libdir = @libdir@ + INSTALL = @INSTALL@ +-LIBTOOL = ./libtool ++LIBTOOL = @LIBTOOL@ + ALLOWRELEASE = @ALLOWRELEASE@ + + # libtool compile/link/install diff --git a/packages/sqlite/sqlite3_3.3.7.bb b/packages/sqlite/sqlite3_3.3.7.bb new file mode 100644 index 0000000000..d21fb6ad3e --- /dev/null +++ b/packages/sqlite/sqlite3_3.3.7.bb @@ -0,0 +1,2 @@ +require sqlite3.inc +PR = "r2" diff --git a/packages/starling/.mtn2git_empty b/packages/starling/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/starling/.mtn2git_empty diff --git a/packages/starling/starling_0.1.bb b/packages/starling/starling_0.1.bb new file mode 100644 index 0000000000..5f4311dfe5 --- /dev/null +++ b/packages/starling/starling_0.1.bb @@ -0,0 +1,26 @@ +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" +MAINTAINER = "Florian Boor <fb@kernelconcepts.de> + +inherit gpe autotools + +DESCRIPTION = "Starling audio player for GPE" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound-gpe" +RDEPENDS = "esd \ + gst-plugins \ + gst-plugin-audio \ + gst-plugin-audioconvert \ + gst-plugin-audiofile \ + gst-plugin-esd \ + gst-plugin-typefindfunctions \ + gst-plugin-decodebin \ + gst-plugin-volume" + +RRECOMMENDS = "gst-plugin-mad \ + gst-plugin-tagedit \ + gst-plugin-ivorbis \ + gst-plugin-tcp" + +SRC_URI = "http://handhelds.org/~skyhusker/${P}.tar.bz2" |