diff options
43 files changed, 462 insertions, 1519 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 73602b1f2b..d763a771dd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -81,6 +81,11 @@ Person: Leon Woestenberg Mail: leonw@mailcan.com Interests: SquashFS, LZMA +Person: Liam Girdwoord +Mail: liam.girdwood@wolfsonmicro.com +Machines: mx31ads +Recipes: mx31ads-kernel* + Person: Marcin Juszkiewicz Mail: hrw@openembedded.org Website: http://www.hrw.one.pl/ diff --git a/classes/base.bbclass b/classes/base.bbclass index f4a0076f19..f3564bf285 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -694,6 +694,7 @@ python __anonymous () { pn = bb.data.getVar('PN', d, 1) + # OBSOLETE in bitbake 1.7.4 srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1) if srcdate != None: bb.data.setVar('SRCDATE', srcdate, d) @@ -727,6 +728,10 @@ python () { # Patch handling inherit patch +# Configuration data from site files +# Move to autotools.bbclass? +inherit siteinfo + EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild do_fetchall MIRRORS[func] = "0" diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass new file mode 100644 index 0000000000..5a37768b52 --- /dev/null +++ b/classes/siteinfo.bbclass @@ -0,0 +1,126 @@ +# This class exists to provide information about the targets that +# may be needed by other classes and/or recipes. If you add a new +# target this will probably need to be updated. + +# +# Returns information about 'what' for the named target 'target' +# where 'target' == "<arch>-<os>" +# +# 'what' can be one of +# * target: Returns the target name ("<arch>-<os>") +# * endianess: Return "be" for big endian targets, "le" for little endian +# * bits: Returns the bit size of the target, either "32" or "64" +# * libc: Returns the name of the c library used by the target +# +# It is an error for the target not to exist. +# If 'what' doesn't exist then an empty value is returned +# +def get_siteinfo_list(d): + import bb + + target = bb.data.getVar('HOST_ARCH', d, 1) + "-" + bb.data.getVar('HOST_OS', d, 1) + + targetinfo = {\ + "armeb-linux": "endian-big bit-32 common-glibc arm-common",\ + "armeb-linux-uclibc": "endian-big bit-32 common-uclibc arm-common",\ + "arm-linux": "endian-little bit-32 common-glibc arm-common",\ + "arm-linux-gnueabi": "endian-little bit-32 common-glibc arm-common arm-linux",\ + "arm-linux-uclibc": "endian-little bit-32 common-uclibc arm-common",\ + "arm-linux-uclibcgnueabi": "endian-little bit-32 common-uclibc arm-common arm-linux-uclibc",\ + "i386-linux": "endian-little bit-32 common-glibc ix86-common",\ + "i486-linux": "endian-little bit-32 common-glibc ix86-common",\ + "i586-linux": "endian-little bit-32 common-glibc ix86-common",\ + "i686-linux": "endian-little bit-32 common-glibc ix86-common",\ + "i386-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ + "i486-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ + "i586-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ + "i686-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ + "mipsel-linux": "endian-little bit-32 common-glibc",\ + "mipsel-linux-uclibc": "endian-little bit-32 common-uclibc",\ + "powerpc-darwin": "endian-big bit-32 common-darwin",\ + "powerpc-linux": "endian-big bit-32 common-glibc",\ + "powerpc-linux-uclibc": "endian-big bit-32 common-uclibc",\ + "sh3-linux": "endian-little bit-32 common-glibc sh-common",\ + "sh4-linux": "endian-little bit-32 common-glibc sh-common",\ + "sh4-linux-uclibc": "endian-little bit-32 common-uclibc sh-common",\ + "sparc-linux": "endian-big bit-32 common-glibc",\ + "x86_64-linux": "endian-little bit-64 common-glibc",\ + "x86_64-linux-uclibc": "endian-little bit-64 common-uclibc"} + if target in targetinfo: + info = targetinfo[target].split() + info.append(target) + return info + else: + bb.error("Information not available for target '%s'" % target) + + +# +# Define which site files to use. We check for several site files and +# use each one that is found, based on the list returned by get_siteinfo_list() +# +# Search for the files in the following directories: +# 1) ${BBPATH}/site (in reverse) - app specific, then site wide +# 2) ${FILE_DIRNAME}/site-${PV} - app version specific +# +def siteinfo_get_files(d): + import bb, os + + sitefiles = "" + + # Determine which site files to look for + sites = get_siteinfo_list(d) + sites.append("common"); + + # Check along bbpath for site files and append in reverse order so + # the application specific sites files are last and system site + # files first. + path_bb = bb.data.getVar('BBPATH', d, 1) + for p in (path_bb or "").split(':'): + tmp = "" + for i in sites: + fname = os.path.join(p, 'site', i) + if os.path.exists(fname): + tmp += fname + " " + sitefiles = tmp + sitefiles; + + # Now check for the applications version specific site files + path_pkgv = os.path.join(bb.data.getVar('FILE_DIRNAME', d, 1), "site-" + bb.data.getVar('PV', d, 1)) + for i in sites: + fname = os.path.join(path_pkgv, i) + if os.path.exists(fname): + sitefiles += fname + " " + + bb.note("SITE files " + sitefiles); + return sitefiles + +# +# Export CONFIG_SITE to the enviroment. The autotools will make use +# of this to determine where to load in variables from. This is a +# space seperate list of shell scripts processed in the order listed. +# +export CONFIG_SITE = "${@siteinfo_get_files(d)}" + + +def siteinfo_get_endianess(d): + info = get_siteinfo_list(d) + if 'endian-little' in info: + return "le" + elif 'endian-big' in info: + return "be" + bb.error("Site info could not determine endianess for target") + +def siteinfo_get_bits(d): + info = get_siteinfo_list(d) + if 'bit-32' in info: + return "32" + elif 'bit-64' in info: + return "64" + bb.error("Site info could not determine bit size for target") + +# +# Make some information available via variables +# +SITEINFO_ENDIANESS = "${@siteinfo_get_endianess(d)}" +SITEINFO_BITS = "${@siteinfo_get_bits(d)}" + + diff --git a/conf/bitbake.conf b/conf/bitbake.conf index fe5b326a05..7da0a9a28d 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -381,10 +381,6 @@ export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" export STAGING_SIPDIR = "${STAGING_DIR}/${BUILD_SYS}/share/sip" export STAGING_IDLDIR = "${STAGING_DATADIR}/idl" -# default test results for autoconf -# possible candidate for moving into autotools.oeclass -CL -export CONFIG_SITE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'site/%s-%s' % (bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('HOST_OS', d, 1)))}" - # library package naming AUTO_LIBNAME_PKGS = "${PACKAGES}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 2a6676db58..ffde56224c 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -21,8 +21,10 @@ SRCDATE_xxf86vmext ?= "20060814" # Matchbox / O-hand SRCDATE_contacts ?= "20060707" SRCDATE_dates ?= "20060707" -SRCDATE_web ?= "20060613" +SRCDATE_fstests ?= "20061111" SRCDATE_eds-dbus ?= "20060707" +SRCDATE_libmatchbox ?= "20060612" +SRCDATE_libfakekey ?= "20051101" SRCDATE_matchbox-common ?= "20060612" SRCDATE_matchbox-config-gtk ?= "20060612" SRCDATE_matchbox-desktop ?= "20060612" @@ -32,14 +34,14 @@ SRCDATE_matchbox-panel-manager ?= "20060612" SRCDATE_matchbox-stroke ?= "20060612" SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" -SRCDATE_libmatchbox ?= "20060612" -SRCDATE_libfakekey ?= "20051101" SRCDATE_psplash ?= "20061011" +SRCDATE_web ?= "20060613" SRCDATE_zaurusd ?= "20060628" # GPE SRCDATE_dasher-gpe ?= "20060814" SRCDATE_rosetta ?= "20060804" +SRCDATE_libmimedir ?= "20060804" # GNOME SRCDATE_gconf-dbus ?= "20060719" diff --git a/packages/curl/curl-native_7.14.0.bb b/packages/curl/curl-native_7.14.0.bb index c70dd3b9dc..e056ec10c3 100644 --- a/packages/curl/curl-native_7.14.0.bb +++ b/packages/curl/curl-native_7.14.0.bb @@ -1,5 +1,6 @@ require curl_${PV}.bb inherit native +DEPENDS = "zlib-native" do_stage () { install -d ${STAGING_INCDIR}/curl diff --git a/packages/curl/curl-native_7.15.1.bb b/packages/curl/curl-native_7.15.1.bb index c70dd3b9dc..e056ec10c3 100644 --- a/packages/curl/curl-native_7.15.1.bb +++ b/packages/curl/curl-native_7.15.1.bb @@ -1,5 +1,6 @@ require curl_${PV}.bb inherit native +DEPENDS = "zlib-native" do_stage () { install -d ${STAGING_INCDIR}/curl diff --git a/packages/fstests/.mtn2git_empty b/packages/fstests/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fstests/.mtn2git_empty diff --git a/packages/fstests/files/.mtn2git_empty b/packages/fstests/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fstests/files/.mtn2git_empty diff --git a/packages/fstests/files/compile-fix.patch b/packages/fstests/files/compile-fix.patch new file mode 100644 index 0000000000..83b3a1cfaf --- /dev/null +++ b/packages/fstests/files/compile-fix.patch @@ -0,0 +1,73 @@ +Index: tests/Makefile.am +=================================================================== +--- tests.orig/Makefile.am ++++ tests/Makefile.am +@@ -18,13 +18,13 @@ test_fb_SOURCES = test-fb.c + + # fullscreen blit to gtk drawing area via gtk pixbufs + test_gdk_SOURCES = test-gdk.c +-test_gdk_LDADD = @GTK_LIBS@ +-test_gdk_CFLAGS = @GTK_CFLAGS@ ++test_gdk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ ++test_gdk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ + + # fullscreen blit to gtk drawing area via gtk pixbufs in an idle handler + test_gdk_idle_SOURCES = test-gdk-idle.c +-test_gdk_idle_LDADD = @GTK_LIBS@ +-test_gdk_idle_CFLAGS = @GTK_CFLAGS@ ++test_gdk_idle_LDADD = @GTK_LIBS@ @PANGO_LIBS@ ++test_gdk_idle_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ + + # fullscreen blit to x window via shm + test_x_SOURCES = test-x.c +@@ -43,8 +43,8 @@ test_freetype_cached_CFLAGS = @FREETYPE_ + + # draw strings via xft + test_xft_SOURCES = test-xft.c +-test_xft_LDADD = @XLIBS_LIBS@ +-test_xft_CFLAGS = @XLIBS_CFLAGS@ ++test_xft_LDADD = @XLIBS_LIBS@ @PANGO_LIBS@ ++test_xft_CFLAGS = @XLIBS_CFLAGS@ @PANGO_CFLAGS@ + + # draws pango strings with just x + test_pango_SOURCES = test-pango.c +@@ -55,29 +55,29 @@ test_pango_CFLAGS = @PANGO_CFLAGS@ + + # Draws a list of Pango glyphs onto a GtkWindow with pango_xft_render + test_pango_gdk_SOURCES = test-pango-gdk.c +-test_pango_gdk_LDADD = @GTK_LIBS@ +-test_pango_gdk_CFLAGS = @GTK_CFLAGS@ ++test_pango_gdk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ ++test_pango_gdk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ + + # Draws a list of Pango glyphs onto a GtkDrawingArea with pango_xft_render + test_pango_gtk_SOURCES = test-pango-gtk.c +-test_pango_gtk_LDADD = @GTK_LIBS@ +-test_pango_gtk_CFLAGS = @GTK_CFLAGS@ ++test_pango_gtk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ ++test_pango_gtk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ + + # Draws a list of Pango glyphs onto a GtkWindow with gdk_draw_glyphs + # can probably go + # test_gtk_SOURCES = test-gtk.c +-# test_gtk_LDADD = @GTK_LIBS@ +-# test_gtk_CFLAGS = @GTK_CFLAGS@ ++# test_gtk_LDADD = @GTK_LIBS@ @PANGO_LIBS@ ++# test_gtk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ + + + test_pango_layout_SOURCES = test-pango-layout.c +-test_pango_layout_LDADD = @GTK_LIBS@ +-test_pango_layout_CFLAGS = @GTK_CFLAGS@ ++test_pango_layout_LDADD = @GTK_LIBS@ @PANGO_LIBS@ ++test_pango_layout_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ + + # As above PangoLayout onto a GtkWindow with gdk_draw_layout XXX TOGO ? + test_gtk_layout_SOURCES = test-gtk-layout.c +-test_gtk_layout_LDADD = @GTK_LIBS@ +-test_gtk_layout_CFLAGS = @GTK_CFLAGS@ ++test_gtk_layout_LDADD = @GTK_LIBS@ @PANGO_LIBS@ ++test_gtk_layout_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@ + + + diff --git a/packages/fstests/fstests.bb b/packages/fstests/fstests.bb new file mode 100644 index 0000000000..5af7c94028 --- /dev/null +++ b/packages/fstests/fstests.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Various benchmarking tests for X" +HOMEPAGE = "http://www.o-hand.com" +SECTION = "devel" +LICENSE = "GPL" +PV = "0.0+svn${SRCDATE}" +PR = "r1" + +inherit autotools + +SRC_URI = \ + "svn://svn.o-hand.com/repos/misc/trunk;module=fstests;proto=http \ + file://compile-fix.patch;patch=0" + +S = "${WORKDIR}/fstests/tests" + +do_install() { + install -d ${D}${bindir} + find . -name "test-*" -type f -perm -755 -exec install -m 0755 {} ${D}${bindir} \; +} diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc index e2ec9565a7..86aa566e5c 100644 --- a/packages/gcc/gcc4-build-sdk.inc +++ b/packages/gcc/gcc4-build-sdk.inc @@ -1,7 +1,5 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1' - STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include" STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib" diff --git a/packages/git/git-native.bb b/packages/git/git-native_snapshot.bb index 67ea960819..84e6f96686 100644 --- a/packages/git/git-native.bb +++ b/packages/git/git-native_snapshot.bb @@ -1,4 +1,4 @@ -require git.bb +require git_snapshot.bb inherit native DEPENDS = "expat-native openssl-native curl-native" diff --git a/packages/git/git.bb b/packages/git/git_snapshot.bb index 7d5c2cbc35..443fd299f6 100644 --- a/packages/git/git.bb +++ b/packages/git/git_snapshot.bb @@ -3,11 +3,17 @@ LICENSE = "GPL" DESCRIPTION = "The git revision control system used by the Linux kernel developers" DEPENDS = "openssl curl" -PKGDATE = "${@time.strftime('%Y-%m-%d',time.gmtime())}" +def get_git_pkgdate(d): + import bb + srcdate = bb.data.getVar('SRCDATE', d, 1) + return "-".join([srcdate[0:4], srcdate[4:6], srcdate[6:8]]) + +PKGDATE = "${@get_git_pkgdate(d)}" SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz" +PV = "1.4.3.5+snapshot${PKGDATE}" -S = "${WORKDIR}/git-snapshot-${DATE}" +S = "${WORKDIR}/git-${PKGDATE}" FILES_${PN} += "${datadir}/git-core" diff --git a/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff b/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff index 142a9a8e88..63828cec63 100644 --- a/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff +++ b/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff @@ -2441,3 +2441,16 @@ Index: gtk+-2.10.6/gdk/x11/gdkpixmap-x11.c _gdk_x11_drawable_finish (GDK_DRAWABLE (draw_impl)); } +--- gtk+-2.10.6.orig/gtk/gtkcalendar.c.orig 2006-11-14 14:39:34.000000000 -0800 ++++ gtk+-2.10.6/gtk/gtkcalendar.c 2006-11-14 14:37:34.000000000 -0800 +@@ -1495,6 +1495,10 @@ gtk_calendar_realize (GtkWidget *widget) + BACKGROUND_COLOR ( GTK_WIDGET ( calendar))); + gdk_window_show (priv->main_win); + gdk_window_set_user_data (priv->main_win, widget); ++ ++ /* Set widgets gc */ ++ calendar->gc = gdk_gc_new (widget->window); ++ + gdk_window_set_background (widget->window, BACKGROUND_COLOR (widget)); + gdk_window_show (widget->window); + gdk_window_set_user_data (widget->window, widget); diff --git a/packages/gtk+/gtk+_2.10.6.bb b/packages/gtk+/gtk+_2.10.6.bb index 2ea55b33c5..82549b028b 100644 --- a/packages/gtk+/gtk+_2.10.6.bb +++ b/packages/gtk+/gtk+_2.10.6.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r6" +PR = "r7" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb index e28bd6a4e8..298b90ea70 100644 --- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb +++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb @@ -11,7 +11,7 @@ PV = "0.4.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ file://mimedir-update.patch;patch=1 \ file://mimedir-write-sequence.patch;patch=1;pnum=0 \ - file://gslist-fix.patch;patch=1" + file://gslist-fix.patch;patch=1;maxdate=20060814" S = "${WORKDIR}/libmimedir" diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 8b303f307c..45ce8520df 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -72,22 +72,22 @@ EOF echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + mv ${SDK_OUTPUT}${libdir}/../${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status rm -rf ${SDK_OUTPUT}${libdir}/ipkg # remove unwanted executables rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc # remove broken .la files - rm ${SDK_OUTPUT}/${prefix}/arm-linux/lib/*.la + rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la # fix pkgconfig data files - cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig + cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig for f in *.pc ; do - sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f" + sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f" done for f in *.pc ; do - sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f" + sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f" done mkdir -p ${SDK_DEPLOY} diff --git a/packages/python/python-sword_1.5.9.bb b/packages/python/python-sword_1.5.9.bb new file mode 100644 index 0000000000..6c777bb54d --- /dev/null +++ b/packages/python/python-sword_1.5.9.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Python bindings for the sword library" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python-core sword" +DEPENDS = "sword-${PV} swig-native" +SRCNAME = "sword" +PR = "r0" + +SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz" + +S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package" + +EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}" + +inherit distutils autotools + +PARALLEL_MAKE = "" + +#do_configure_prepend() { +# ./autogen.sh +#} + +do_compile() { + oe_runmake BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} pythonswig python_make +} + +do_install() { + cd ${S}/python + distutils_do_install +} diff --git a/packages/sword/sword_1.5.9.bb b/packages/sword/sword_1.5.9.bb new file mode 100644 index 0000000000..362b75e57c --- /dev/null +++ b/packages/sword/sword_1.5.9.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "The SWORD Project is an open source, cross-platform \ +(Linux, Windows, Solaris, MacOSX etc.) API and library for \ +Bible software with a constantly growing list of front-ends \ +(GUI, textmode, web-based, etc.) and a library of over 200 text modules" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--without-clucene --without-curl" + +do_stage() { + oe_libinstall -so -C lib libsword ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/sword/ + for f in include/*.h + do + install -m 0644 $f ${STAGING_INCDIR}/sword/ + done + +} + +FILES_${PN} = "${libdir}/libsword*so ${sysconfdir} ${bindir} ${datadir}" diff --git a/site/arm-linux b/site/arm-linux index 5aa8a4cf5c..3c1a082bd7 100644 --- a/site/arm-linux +++ b/site/arm-linux @@ -40,8 +40,6 @@ ac_cv_ushort=${ac_cv_ushort=yes} mr_cv_target_elf=${mr_cv_target_elf=yes} -ac_cv_c_littleendian=${ac_cv_c_littleendian=yes} -ac_cv_c_bigendian=${ac_cv_c_bigendian=no} ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} # apache @@ -306,3 +304,11 @@ dpkg_cv___va_copy=${ac_cv___va_copy=yes} # enca yeti_cv_func_scanf_modif_size_t=yes +# clamav +clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes} +clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes} +clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes} +ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes} + +#dbus +ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=no} diff --git a/site/arm-linux-gnueabi b/site/arm-linux-gnueabi deleted file mode 100644 index 77ce33f338..0000000000 --- a/site/arm-linux-gnueabi +++ /dev/null @@ -1,321 +0,0 @@ -ac_cv_func_getpgrp_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setgrent_void=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_malloc_works=yes -ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} -ac_cv_func_setvbuf_reversed=no -ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} -ac_cv_sizeof_char=${ac_cv_sizeof_char=1} -ac_cv_sizeof_wchar_t=${ac_cv_sizeof_wchar_t=1} -ac_cv_sizeof_unsigned_char=${ac_cv_sizeof_unsigned_char=1} -ac_cv_sizeof_bool=${ac_cv_sizeof_bool=1} -ac_cv_sizeof_char_p=${ac_cv_sizeof_int_p=4} -ac_cv_sizeof_int=${ac_cv_sizeof_int=4} -ac_cv_sizeof_int_p=${ac_cv_sizeof_int_p=4} -ac_cv_sizeof_long=${ac_cv_sizeof_long=4} -ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4} -ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8} -ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=4} -ac_cv_sizeof_short=${ac_cv_sizeof_short=2} -ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2} -ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4} -ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4} -ac_cv_sizeof_float=${ac_cv_sizeof_float=4} -ac_cv_sizeof_double=${ac_cv_sizeof_double=8} -ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8} -ac_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} -ac_cv_sizeof_unsigned_short=${ac_cv_sizeof_unsigned_short=2} -ac_cv_sizeof_unsigned=${ac_cv_sizeof_unsigned=4} -ac_cv_sizeof_unsigned_int=${ac_cv_sizeof_unsigned_int=4} -ac_cv_sizeof_unsigned_long=${ac_cv_sizeof_unsigned_long=4} -ac_cv_sizeof_unsigned_long_long=${ac_cv_sizeof_unsigned_long_long=8} -ac_cv_sizeof_signed_char=${ac_cv_sizeof_signed_char=1} - -ac_cv_sys_restartable_syscalls=yes -ac_cv_uchar=${ac_cv_uchar=no} -ac_cv_uint=${ac_cv_uint=yes} -ac_cv_ulong=${ac_cv_ulong=yes} -ac_cv_ushort=${ac_cv_ushort=yes} - -mr_cv_target_elf=${mr_cv_target_elf=yes} - -ac_cv_c_littleendian=${ac_cv_c_littleendian=yes} -ac_cv_c_bigendian=${ac_cv_c_bigendian=no} -ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} - -# apache -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} -ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} - -ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} -ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} -ac_cv_sctp=${ac_cv_sctp=no} - -# ssh -ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes} -ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} -ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} -ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} -ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} - -# coreutils -utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} - -# libpcap -ac_cv_linux_vers=${ac_cv_linux_vers=2} - -# nano -ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} -nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} - -# libnet -ac_cv_libnet_endianess=${ac_cv_libnet_endianess=lil} -ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} - -# screen -screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no} -screen_cv_sys_memcpy_overlap=${screen_cv_sys_memcpy_overlap=no} -screen_cv_sys_memmove_overlap=${screen_cv_sys_memmove_overlap=no} -screen_cv_sys_fifo_broken_impl=${screen_cv_sys_fifo_broken_impl=yes} -screen_cv_sys_fifo_usable=${screen_cv_sys_fifo_usable=yes} -screen_cv_sys_select_broken_retval=${screen_cv_sys_select_broken_retval=no} -screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no} -screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes} -screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes} - -ac_cv_func_lstat_dereferences_s |