1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00

packages: Separate out most of the remaining packages into recipes

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2010-09-01 19:09:11 +01:00
parent caab7fc509
commit d62ee7eaf2
569 changed files with 0 additions and 76 deletions
@@ -0,0 +1,49 @@
Index: apr-util-1.3.4/apu-config.in
===================================================================
--- apr-util-1.3.4.orig/apu-config.in 2009-01-12 17:08:06.000000000 +0000
+++ apr-util-1.3.4/apu-config.in 2009-01-12 17:09:00.000000000 +0000
@@ -134,14 +134,7 @@
exit 0
;;
--includes)
- if test "$location" = "installed"; then
flags="$flags -I$includedir $INCLUDES"
- elif test "$location" = "source"; then
- flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
- else
- # this is for VPATH builds
- flags="$flags -I$APU_BUILD_DIR/include -I$APU_SOURCE_DIR/include $INCLUDES"
- fi
;;
--ldflags)
flags="$flags $LDFLAGS"
@@ -155,28 +148,10 @@
exit 0
;;
--link-ld)
- if test "$location" = "installed"; then
- ### avoid using -L if libdir is a "standard" location like /usr/lib
flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
- else
- flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME"
- fi
;;
--link-libtool)
- # If the LA_FILE exists where we think it should be, use it. If we're
- # installed and the LA_FILE does not exist, assume to use -L/-l
- # (the LA_FILE may not have been installed). If we're building ourselves,
- # we'll assume that at some point the .la file be created.
- if test -f "$LA_FILE"; then
- flags="$flags $LA_FILE"
- elif test "$location" = "installed"; then
- ### avoid using -L if libdir is a "standard" location like /usr/lib
- # Since the user is specifying they are linking with libtool, we
- # *know* that -R will be recognized by libtool.
- flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME"
- else
- flags="$flags $LA_FILE"
- fi
+ flags="$flags -l$APRUTIL_LIBNAME"
;;
--apu-la-file)
if test -f "$LA_FILE"; then
@@ -0,0 +1,27 @@
Index: apr-util-1.3.4/configure.in
===================================================================
--- apr-util-1.3.4.orig/configure.in
+++ apr-util-1.3.4/configure.in
@@ -8,14 +8,14 @@ AC_INIT(export_vars.sh.in)
AC_CONFIG_HEADER(include/private/apu_config.h)
AC_CONFIG_AUX_DIR(build)
-sinclude(build/apu-conf.m4)
-sinclude(build/apu-iconv.m4)
-sinclude(build/apu-hints.m4)
-sinclude(build/apr_common.m4)
-sinclude(build/find_apr.m4)
-sinclude(build/dbm.m4)
-sinclude(build/dbd.m4)
-sinclude(build/dso.m4)
+#sinclude(build/apu-conf.m4)
+#sinclude(build/apu-iconv.m4)
+#sinclude(build/apu-hints.m4)
+#sinclude(build/apr_common.m4)
+#sinclude(build/find_apr.m4)
+#sinclude(build/dbm.m4)
+#sinclude(build/dbd.m4)
+#sinclude(build/dso.m4)
dnl Generate ./config.nice for reproducing runs of configure
dnl
@@ -0,0 +1,25 @@
Index: apr-util-1.2.12/configure.in
===================================================================
--- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000
+++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000
@@ -8,13 +8,13 @@
AC_CONFIG_HEADER(include/private/apu_config.h)
AC_CONFIG_AUX_DIR(build)
-sinclude(build/apu-conf.m4)
-sinclude(build/apu-iconv.m4)
-sinclude(build/apu-hints.m4)
-sinclude(build/apr_common.m4)
-sinclude(build/find_apr.m4)
-sinclude(build/dbm.m4)
-sinclude(build/dbd.m4)
+#sinclude(build/apu-conf.m4)
+#sinclude(build/apu-iconv.m4)
+#sinclude(build/apu-hints.m4)
+#sinclude(build/apr_common.m4)
+#sinclude(build/find_apr.m4)
+#sinclude(build/dbm.m4)
+#sinclude(build/dbd.m4)
dnl Generate ./config.nice for reproducing runs of configure
dnl
@@ -0,0 +1,27 @@
DESCRIPTION = "Apache Portable Runtime (APR) companion library"
SECTION = "libs"
DEPENDS = "apr expat gdbm"
LICENSE = "Apache License, Version 2.0"
PR = "r5"
SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
file://configfix.patch;patch=1 \
file://configure_fixes.patch;patch=1"
EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
--with-dbm=gdbm \
--with-gdbm=${STAGING_DIR_HOST}${prefix} \
--without-sqlite2 \
--without-sqlite3 \
--with-expat=${STAGING_DIR_HOST}${prefix}"
inherit autotools lib_package binconfig
OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
do_configure_prepend() {
cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
}
@@ -0,0 +1,42 @@
Index: apr-1.3.3/build/buildcheck.sh
===================================================================
--- apr-1.3.3.orig/build/buildcheck.sh 2009-01-15 13:32:33.000000000 +0000
+++ apr-1.3.3/build/buildcheck.sh 2009-01-15 13:33:06.000000000 +0000
@@ -32,35 +32,4 @@
echo "buildconf: autoconf version $ac_version (ok)"
fi
-# Sample libtool --version outputs:
-# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
-# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
-# output is multiline from 1.5 onwards
-
-# Require libtool 1.4 or newer
-libtool=`build/PrintPath glibtool libtool libtool15 libtool14`
-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
-if test -z "$lt_pversion"; then
-echo "buildconf: libtool not found."
-echo " You need libtool version 1.4 or newer installed"
-echo " to build APR from SVN."
-exit 1
-fi
-lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
-IFS=.; set $lt_version; IFS=' '
-lt_status="good"
-if test "$1" = "1"; then
- if test "$2" -lt "4"; then
- lt_status="bad"
- fi
-fi
-if test $lt_status = "good"; then
- echo "buildconf: libtool version $lt_pversion (ok)"
- exit 0
-fi
-
-echo "buildconf: libtool version $lt_pversion found."
-echo " You need libtool version 1.4 or newer installed"
-echo " to build APR from SVN."
-
-exit 1
+exit 0
\ No newline at end of file
@@ -0,0 +1,51 @@
Index: apr-1.3.3/apr-config.in
===================================================================
--- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000
+++ apr-1.3.3/apr-config.in 2009-01-12 15:19:25.000000000 +0000
@@ -152,14 +152,7 @@
flags="$flags $LDFLAGS"
;;
--includes)
- if test "$location" = "installed"; then
flags="$flags -I$includedir $EXTRA_INCLUDES"
- elif test "$location" = "source"; then
- flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
- else
- # this is for VPATH builds
- flags="$flags -I$APR_BUILD_DIR/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
- fi
;;
--srcdir)
echo $APR_SOURCE_DIR
@@ -181,29 +167,14 @@
exit 0
;;
--link-ld)
- if test "$location" = "installed"; then
- ### avoid using -L if libdir is a "standard" location like /usr/lib
- flags="$flags -L$libdir -l${APR_LIBNAME}"
- else
- ### this surely can't work since the library is in .libs?
- flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
- fi
+ flags="$flags -l${APR_LIBNAME}"
;;
--link-libtool)
# If the LA_FILE exists where we think it should be, use it. If we're
# installed and the LA_FILE does not exist, assume to use -L/-l
# (the LA_FILE may not have been installed). If we're building ourselves,
# we'll assume that at some point the .la file be created.
- if test -f "$LA_FILE"; then
- flags="$flags $LA_FILE"
- elif test "$location" = "installed"; then
- ### avoid using -L if libdir is a "standard" location like /usr/lib
- # Since the user is specifying they are linking with libtool, we
- # *know* that -R will be recognized by libtool.
- flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
- else
- flags="$flags $LA_FILE"
- fi
+ flags="$flags -l${APR_LIBNAME}"
;;
--shlib-path-var)
echo "$SHLIBPATH_VAR"
@@ -0,0 +1,66 @@
Index: apr-1.3.3/configure.in
===================================================================
--- apr-1.3.3.orig/configure.in
+++ apr-1.3.3/configure.in
@@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm
create_area])
APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
-AC_CHECK_FILE(/dev/zero)
-
-# Not all systems can mmap /dev/zero (such as HP-UX). Check for that.
-if test "$ac_cv_func_mmap" = "yes" &&
- test "$ac_cv_file__dev_zero" = "yes"; then
- AC_MSG_CHECKING(for mmap that can map /dev/zero)
- AC_TRY_RUN([
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
- int main()
- {
- int fd;
- void *m;
- fd = open("/dev/zero", O_RDWR);
- if (fd < 0) {
- return 1;
- }
- m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
- if (m == (void *)-1) { /* aka MAP_FAILED */
- return 2;
- }
- if (munmap(m, sizeof(void*)) < 0) {
- return 3;
- }
- return 0;
- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
-
- AC_MSG_RESULT($ac_cv_file__dev_zero)
-fi
# Now we determine which one is our anonymous shmem preference.
haveshmgetanon="0"
@@ -1518,13 +1485,14 @@ else
bigendian=0
fi
-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
-#include <sys/uio.h>],struct iovec,0)
-if test "$ac_cv_sizeof_struct_iovec" = "0"; then
- have_iovec=0
-else
- have_iovec=1
-fi
+#APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
+##include <sys/uio.h>],struct iovec,0)
+#if test "$ac_cv_sizeof_struct_iovec" = "0"; then
+# have_iovec=0
+#else
+# have_iovec=1
+#fi
+have_iovec=1
AC_SUBST(voidp_size)
AC_SUBST(short_value)
+34
View File
@@ -0,0 +1,34 @@
DESCRIPTION = "Apache Portable Runtime (APR) library"
SECTION = "libs"
LICENSE = "Apache License, Version 2.0"
PR = "r5"
SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
file://configure_fixes.patch;patch=1 \
file://cleanup.patch;patch=1 \
file://configfix.patch;patch=1"
inherit autotools lib_package binconfig
OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
do_configure_prepend() {
cd ${S}
./buildconf
}
SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"
apr_sysroot_preprocess () {
d=${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/apr
install -d $d/
cp ${S}/build/apr_rules.mk $d/
sed -i s,apr_builddir=.*,apr_builddir=,g $d/apr_rules.mk
sed -i s,apr_builders=.*,apr_builders=,g $d/apr_rules.mk
sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${TARGET_PREFIX}libtool,g $d/apr_rules.mk
sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g $d/apr_rules.mk
cp ${S}/build/mkdir.sh $d/
cp ${S}/build/make_exports.awk $d/
cp ${S}/build/make_var_export.awk $d/
}
@@ -0,0 +1,15 @@
SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/aspell-${PV}.tar.gz"
DESCRIPTION = "GNU Aspell spell-checker"
SECTION = "console/utils"
LICENSE="LGPL"
PACKAGES += "libaspell libpspell libpspell-dev aspell-utils"
FILES_${PN}-dbg += "${libdir}/aspell-0.60/.debu*"
FILES_libaspell = "${libdir}/libaspell.so.* ${libdir}/aspell*"
FILES_aspell-utils = "${bindir}/word-list-compress ${bindir}/aspell-import ${bindir}/run-with-aspell ${bindir}/pre*"
FILES_${PN} = "${bindir}/aspell"
FILES_libpspell = "${libdir}/libpspell.so.*"
FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell"
inherit autotools gettext
+14
View File
@@ -0,0 +1,14 @@
DESCRIPTION = "An accessibility toolkit for GNOME."
HOMEPAGE = "http://live.gnome.org/GAP/"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "LGPLv2 & LGPLv2+"
SECTION = "x11/libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 gtk-doc-native"
inherit autotools pkgconfig
EXTRA_OECONF = "--disable-glibtest"
+10
View File
@@ -0,0 +1,10 @@
require atk.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
SRC_URI = "http://download.gnome.org/sources/atk/1.30/${PN}-${PV}.tar.bz2"
+26
View File
@@ -0,0 +1,26 @@
DESCRIPTION = "utilities for access control list"
HOMEPAGE = "http://savannah.nongnu.org/projects/acl/"
SECTION = "libs"
LICENSE = "LGPLv2.1+ & GPLv2+"
LICENSE_${PN} = "GPLv2+"
LICENSE_lib${PN} = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
DEPENDS = "attr"
SRC_URI = "http://mirror.cinquix.com/pub/savannah/acl/${BP}.src.tar.gz"
require ea-acl.inc
# avoid RPATH hardcode to staging dir
do_configure_append() {
sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\',
${S}/config.status
}
# libdir should point to .la
do_install_append() {
sed -i ${D}${libdir}/libacl.la -e \
s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
}
+3
View File
@@ -0,0 +1,3 @@
require acl.inc
PR = "r0"
@@ -0,0 +1,18 @@
commit 5b28eb3b0e0430ce6af28edc9100ca23299d1218
Author: Kamil Dudka <kdudka@redhat.com>
Date: Thu Jun 3 15:29:54 2010 +0200
attr_parse_attr_conf: eliminate a double free
diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c
index 030bbf5..2697328 100644
--- a/libattr/attr_copy_action.c
+++ b/libattr/attr_copy_action.c
@@ -81,6 +81,7 @@ repeat:
fclose(file);
file = NULL;
free(text);
+ text = NULL;
size_guess *= 2;
goto repeat;
}
@@ -0,0 +1,50 @@
commit 972b42a67393f762936e74d3ce929914181f5f28
Author: Brandon Philips <brandon@ifup.org>
Date: Thu Dec 17 17:15:57 2009 -0800
libattr: fix memory leak in attr_copy_action()
stanse found that attr_copy_action returns before freeing the memory
allocated for text.
Move fopen() above the malloc so this is not a problem.
Fixes this bug:
https://bugzilla.novell.com/show_bug.cgi?id=564735
Signed-off-by: Brandon Philips <bphilips@suse.de>
diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c
index 0d7aca5..dc94224 100644
--- a/libattr/attr_copy_action.c
+++ b/libattr/attr_copy_action.c
@@ -53,7 +53,7 @@ free_attr_actions(void)
static int
attr_parse_attr_conf(struct error_context *ctx)
{
- char *text, *t;
+ char *text = NULL, *t;
size_t size_guess = 4096, len;
FILE *file;
char *pattern = NULL;
@@ -64,15 +64,16 @@ attr_parse_attr_conf(struct error_context *ctx)
return 0;
repeat:
- text = malloc(size_guess + 1);
- if (!text)
- goto fail;
-
if ((file = fopen(ATTR_CONF, "r")) == NULL) {
if (errno == ENOENT)
return 0;
goto fail;
}
+
+ text = malloc(size_guess + 1);
+ if (!text)
+ goto fail;
+
len = fread(text, 1, size_guess, file);
if (ferror(file))
goto fail;
@@ -0,0 +1,18 @@
commit 42f50a130d144ffbc01738f15da9d4f1b57505bd
Author: Kamil Dudka <kdudka@redhat.com>
Date: Thu Jun 3 15:23:04 2010 +0200
attr_parse_attr_conf: eliminate a memory leak
diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c
index dc94224..030bbf5 100644
--- a/libattr/attr_copy_action.c
+++ b/libattr/attr_copy_action.c
@@ -129,6 +129,7 @@ repeat:
t += strcspn(t, "\n");
}
+ free(text);
return 0;
parse_error:
@@ -0,0 +1,21 @@
commit 235cdd2af498d288f1af1142e7a23fbd16dff907
Author: Mike Frysinger <vapier@gentoo.org>
Date: Fri Jan 8 21:53:19 2010 -0500
quote: pull in string.h for strchr prototype
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Brandon Philips <brandon@ifup.org>
diff --git a/libmisc/quote.c b/libmisc/quote.c
index f98c887..bf8f9eb 100644
--- a/libmisc/quote.c
+++ b/libmisc/quote.c
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
+#include <string.h>
#include "misc.h"
const char *quote(const char *str, const char *quote_chars)
@@ -0,0 +1,19 @@
commit e8d568c696692eed5c92d5a35498e1c26e13d6b3
Author: Kamil Dudka <kdudka@redhat.com>
Date: Thu Jun 3 15:30:19 2010 +0200
setfattr.c: fix thinko in restore()
diff --git a/setfattr/setfattr.c b/setfattr/setfattr.c
index 491c25a..0a14cfa 100644
--- a/setfattr/setfattr.c
+++ b/setfattr/setfattr.c
@@ -120,7 +120,7 @@ int restore(const char *filename)
break;
line++;
if (strncmp(l, "# file: ", 8) != 0) {
- if (filename) {
+ if (file != stdin) {
fprintf(stderr, _("%s: %s: No filename found "
"in line %d, aborting\n"),
progname, filename, backup_line);
+20
View File
@@ -0,0 +1,20 @@
DESCRIPTION = "utilities for manipulating filesystem extended attributes"
HOMEPAGE = "http://savannah.nongnu.org/projects/attr/"
SECTION = "libs"
LICENSE = "LGPLv2.1+ & GPLv2+"
LICENSE_${PN} = "GPLv2+"
LICENSE_lib${PN} = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \
file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb"
SRC_URI = "http://nongnu.askapache.com/attr/${BP}.src.tar.gz"
require ea-acl.inc
# libdir should point to .la
do_install_append() {
sed -i ${D}${libdir}/libattr.la -e \
s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
}
+9
View File
@@ -0,0 +1,9 @@
require attr.inc
PR = "r1"
SRC_URI += "file://memory-leak-in-copy.patch \
file://memory-leak2.patch \
file://double-free.patch \
file://pull-in-string.h.patch \
file://thinko-in-restore.patch"
+35
View File
@@ -0,0 +1,35 @@
# this build system is mostly shared by attr and acl
DEPENDS =+ "gettext"
SRC_URI += "file://relative-libdir.patch;striplevel=0"
inherit autotools
# the package comes with a custom config.h.in, it cannot be
# overwritten by autoheader
export AUTOHEADER = "true"
EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root"
EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}"
do_install () {
oe_runmake install install-lib install-dev DIST_ROOT="${D}"
}
PACKAGES =+ "lib${PN} lib${PN}-dev lib${PN}-doc"
FILES_lib${PN} = "${base_libdir}/lib*.so.*"
FILES_lib${PN}-dev = "${includedir} \
${libdir}/lib*.so \
${libdir}/lib*.a \
${libdir}/lib*.la \
${base_libdir}/lib*.so \
${base_libdir}/lib*.a \
${base_libdir}/lib*.la"
FILES_lib${PN}-doc = "${mandir}/man2 \
${mandir}/man3"
BBCLASSEXTEND = "native"
@@ -0,0 +1,23 @@
use relative path in symbolic links, or it fails in staging
sed expression from udev
7/29/2010 - created by Qing He <qing.he@intel.com>
diff -u include.orig/buildmacros include/buildmacros
--- include.orig/buildmacros 2010-07-29 17:39:48.000000000 +0800
+++ include/buildmacros 2010-07-29 18:20:34.000000000 +0800
@@ -88,9 +88,11 @@
../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
+ rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
+ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
+ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
+ rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
+ ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
fi
else
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
@@ -0,0 +1,41 @@
We are unable to run code at configure time in a cross environemnt, but as we
control the build we can be fairly certain this dependency is met.
JL 05/07/10
Index: beecrypt-4.1.2/configure.ac
===================================================================
--- beecrypt-4.1.2.orig/configure.ac 2004-12-21 11:37:56.000000000 +0000
+++ beecrypt-4.1.2/configure.ac 2010-07-05 16:09:50.390083494 +0100
@@ -243,32 +243,6 @@
# Predefines and checks for C++ API support
AH_TEMPLATE([CPPGLUE],[Define to 1 if you want to include the C++ code])
-if test "$ac_with_cplusplus" = yes; then
- AC_MSG_CHECKING([for IBM's ICU library version >= 2.8])
- AC_LANG_PUSH(C)
- AC_RUN_IFELSE([
- AC_LANG_PROGRAM([[#include <unicode/uversion.h>]],[[
- #if U_ICU_VERSION_MAJOR_NUM < 2
- exit(1);
- #elif U_ICU_VERSION_MAJOR_NUM == 2
- # if U_ICU_VERSION_MINOR_NUM < 8
- exit(1);
- # else
- exit(0);
- # endif
- #else
- exit(0);
- #endif
- ]])],[
- AC_MSG_RESULT([yes])
- ],[
- AC_MSG_RESULT([no])
- AC_MSG_WARN([disabling cplusplus])
- ac_with_cplusplus=no
- ])
- AC_LANG_POP(C)
-fi
-
if test "$ac_with_cplusplus" = yes ; then
AC_DEFINE([CPPGLUE],1)
fi
@@ -0,0 +1,43 @@
Fix visibility of various C++ functions, inspired by a similar patch in the Fink
project:
http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html
JL 05/07/10
Index: beecrypt-4.1.2/c++/security/Security.h
===================================================================
--- beecrypt-4.1.2.orig/c++/security/Security.h 2010-07-05 17:15:34.811273306 +0100
+++ beecrypt-4.1.2/c++/security/Security.h 2010-07-05 17:15:38.696388531 +0100
@@ -75,8 +75,6 @@
public:
typedef vector<const Provider*> provider_vector;
typedef provider_vector::iterator provider_vector_iterator;
-
- private:
struct spi
{
Object* cspi;
@@ -91,6 +89,7 @@
static spi* getSpi(const String& algo, const String& type, const Provider&) throw (NoSuchAlgorithmException);
static spi* getFirstSpi(const String& type);
+ private:
static const String& getKeyStoreDefault();
static bool _init;
Index: beecrypt-4.1.2/c++/beeyond/BeeCertificate.h
===================================================================
--- beecrypt-4.1.2.orig/c++/beeyond/BeeCertificate.h 2004-11-03 09:37:27.000000000 +0000
+++ beecrypt-4.1.2/c++/beeyond/BeeCertificate.h 2010-07-05 17:16:25.216332324 +0100
@@ -150,11 +150,11 @@
mutable String* str;
BeeCertificate();
- BeeCertificate(InputStream& in) throw (IOException);
bytearray* encodeTBS() const;
public:
+ BeeCertificate(InputStream& in) throw (IOException);
BeeCertificate(const BeeCertificate&);
virtual ~BeeCertificate();
@@ -0,0 +1,23 @@
Don't have 64 appended to the libdir for 64bit platforms.
JL 05/07/10
Index: beecrypt-4.1.2/configure.ac
===================================================================
--- beecrypt-4.1.2.orig/configure.ac 2010-07-05 16:39:43.000000000 +0100
+++ beecrypt-4.1.2/configure.ac 2010-07-05 16:40:27.521082866 +0100
@@ -585,15 +585,6 @@
# Check where to install the libraries
bc_libalt=
-case $target_os in
-linux*)
- case $bc_target_arch in
- powerpc64 | s390x | x86_64)
- bc_libalt="64"
- ;;
- esac
- ;;
-esac
AC_SUBST(LIBALT,$bc_libalt)
# Generate output files.
@@ -0,0 +1,21 @@
# Beecrypt OE build file
# Copyright (C) 2004-2005, Advanced Micro Devices, Inc. All Rights Reserved
# Released under the MIT license (see packages/COPYING)
DESCRIPTION="Beecrypt is a general-purpose cryptography library."
HOMEPAGE="http://sourceforge.net/projects/beecrypt"
SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
file://x64fix.patch \
file://disable-icu-check.patch \
file://fix-security.patch"
DEPENDS = "icu"
PR = "r0"
inherit autotools
acpaths=""
EXTRA_OECONF="--with-arch=${TARGET_ARCH} --without-python --enable-shared --enable-static"
BBCLASSEXTEND = "native"
+149
View File
@@ -0,0 +1,149 @@
# The Boost web site provides free peer-reviewed portable
# C++ source libraries. The emphasis is on libraries which
# work well with the C++ Standard Library. The libraries are
# intended to be widely useful, and are in regular use by
# thousands of programmers across a broad spectrum of applications.
DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
HOMEPAGE = "http://www.boost.org/"
SECTION = "libs"
DEPENDS = "boost-jam-native zlib"
PRIORITY = "optional"
LICENSE = "Boost Software License"
PR = "r3"
ARM_INSTRUCTION_SET = "arm"
BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
BOOST_P = "boost_${BOOST_VER}"
BOOST_LIBS = "\
date_time \
filesystem \
graph \
iostreams \
program_options \
regex \
signals \
system \
test \
thread \
"
# FIXME: for some reason this fails on powerpc
#BOOST_LIBS += "serialization"
# To enable python, uncomment the following:
#BOOST_LIBS += "python"
#DEPENDS += "python"
#PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}"
#PYTHON_VERSION = "2.5"
S = "${WORKDIR}/${BOOST_P}"
# Make a package for each library, plus -dev
PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}"
python __anonymous () {
import bb
packages = []
extras = []
for lib in bb.data.getVar('BOOST_LIBS', d, 1).split( ):
pkg = "boost-%s" % lib.replace("_", "-")
extras.append("--with-%s" % lib)
packages.append(pkg)
if not bb.data.getVar("FILES_%s" % pkg, d, 1):
bb.data.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib, d)
bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d)
bb.data.setVar("BJAM_EXTRA", " ".join(extras), d)
}
# Override the contents of specific packages
FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \
${libdir}/libboost_wserialization*.so.*"
FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \
${libdir}/libboost_unit_test_framework*.so.*"
# -dev last to pick up the remaining stuff
PACKAGES += "${PN}-dev"
FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
# "boost" is a metapackage which pulls in all boost librabries
PACKAGES += "${PN}"
RRECOMMENDS_${PN} += "${BOOST_PACKAGES}"
ALLOW_EMPTY_${PN} = "1"
# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works
TARGET_CC_ARCH += " ${LDFLAGS}"
# Oh yippee, a new build system, it's sooo cooool I could eat my own
# foot. inlining=on lets the compiler choose, I think. At least this
# stuff is documented...
# NOTE: if you leave <debug-symbols>on then in a debug build the build sys
# objcopy will be invoked, and that won't work. Building debug apparently
# requires hacking gcc-tools.jam
#
# Sometimes I wake up screaming. Famous figures are gathered in the nightmare,
# Steve Bourne, Larry Wall, the whole of the ANSI C committee. They're just
# standing there, waiting, but the truely terrifying thing is what they carry
# in their hands. At first sight each seems to bear the same thing, but it is
# not so for the forms in their grasp are ever so slightly different one from
# the other. Each is twisted in some grotesque way from the other to make each
# an unspeakable perversion impossible to perceive without the onset of madness.
# True insanity awaits anyone who perceives all of these horrors together.
#
# Quotation marks, there might be an easier way to do this, but I can't find
# it. The problem is that the user.hpp configuration file must receive a
# pre-processor macro defined as the appropriate string - complete with "'s
# around it. (<> is a possibility here but the danger to that is that the
# failure case interprets the < and > as shell redirections, creating
# random files in the source tree.)
#
#bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"'
#do_compile: '-sGCC=... '"'-DBOOST_PLATFORM_CONFIG=\"config\"'"
SQD = '"'
EQD = '\"'
#boost.bb: "... '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..."
BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}"
# bzip2 and zip are disabled because... they're broken - the compilation simply
# isn't working with bjam. I guess they will fix it, but who needs it? This
# only affects the (new in 33) iostream library.
BJAM_TOOLS = "-sTOOLS=gcc \
'-sGCC=${CC} '${BJAM_CONF} \
'-sGXX=${CXX} '${BJAM_CONF} \
'-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \
'-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \
'-sNO_BZIP2=1' \
'-sNO_ZLIB=1' \
'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
'-sPYTHON_VERSION=${PYTHON_VERSION}' \
'--layout=system' \
"
BJAM_OPTS = '${BJAM_TOOLS} \
--builddir=${S}/${TARGET_SYS} \
--with-python-root=${PYTHON_ROOT} \
${BJAM_EXTRA}'
do_configure_prepend() {
cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp
echo 'using gcc : 4.3.1 : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;' >> ${S}/tools/build/v2/user-config.jam
}
do_compile() {
set -ex
bjam ${BJAM_OPTS} --prefix=${prefix} \
--exec-prefix=${exec_prefix} \
--libdir=${libdir} \
--includedir=${includedir}
}
do_install() {
set -ex
bjam ${BJAM_OPTS} \
--libdir=${D}${libdir} \
--includedir=${D}${includedir} \
install
}
@@ -0,0 +1,31 @@
# The Boost web site provides free peer-reviewed portable
# C++ source libraries. The emphasis is on libraries which
# work well with the C++ Standard Library. The libraries are
# intended to be widely useful, and are in regular use by
# thousands of programmers across a broad spectrum of applications.
DESCRIPTION = "Make system for boost (native)"
HOMEPAGE = "http://www.boost.org/"
SECTION = "devel"
PRIORITY = "optional"
LICENSE = "Boost Software License"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz"
S = "${WORKDIR}/boost-jam-${PV}"
inherit native
do_compile() {
set -ex
rm -rf bin.*
./build.sh gcc
}
# This is too terrible - the build script doesn't give any good
# way I can see to find out where the binaries are placed, so
# rely on only one bin.foo directory being created.
do_install () {
set -ex
install -d ${D}${bindir}/
install -c -m 755 bin.*/bjam ${D}${bindir}/
}
@@ -0,0 +1,4 @@
include boost-jam-native.inc
SRC_URI = "${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz"
@@ -0,0 +1,27 @@
include boost-36.inc
LICENSE = "boost"
LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
file://arm-intrinsics.patch \
"
BJAM_OPTS = '${BJAM_TOOLS} \
--builddir=${S}/${TARGET_SYS} \
${BJAM_EXTRA}'
# build only mt libraries and install symlinks for compatibility
BJAM_EXTRA += "threading=multi"
do_install_append() {
for lib in ${BOOST_LIBS}; do
if [ -e ${D}${libdir}/libboost_${lib}.a ]; then
ln -s libboost_${lib}.a ${D}${libdir}/libboost_${lib}-mt.a
fi
if [ -e ${D}${libdir}/libboost_${lib}.so ]; then
ln -s libboost_${lib}.so ${D}${libdir}/libboost_${lib}-mt.so
fi
done
}
@@ -0,0 +1,224 @@
Index: boost_1_34_1/boost/archive/polymorphic_iarchive.hpp
===================================================================
--- boost_1_34_1.orig/boost/archive/polymorphic_iarchive.hpp 2005-12-11 07:12:51.000000000 +0100
+++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -17,6 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <cstddef> // std::size_t
+#include <climits>
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
Index: boost_1_34_1/boost/archive/polymorphic_oarchive.hpp
===================================================================
--- boost_1_34_1.orig/boost/archive/polymorphic_oarchive.hpp 2006-02-12 06:43:06.000000000 +0100
+++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -17,6 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <cstddef> // size_t
+#include <climits>
#include <string>
#include <boost/config.hpp>
Index: boost_1_34_1/boost/date_time/date_facet.hpp
===================================================================
--- boost_1_34_1.orig/boost/date_time/date_facet.hpp 2005-09-05 23:10:50.000000000 +0200
+++ boost_1_34_1/boost/date_time/date_facet.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -429,7 +429,7 @@
typedef std::basic_string<CharT> string_type;
typedef CharT char_type;
typedef boost::date_time::period_parser<date_type, CharT> period_parser_type;
- typedef special_values_parser<date_type,CharT> special_values_parser_type;
+ typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type;
typedef std::vector<std::basic_string<CharT> > input_collection_type;
typedef format_date_parser<date_type, CharT> format_date_parser_type;
// date_generators stuff goes here
Index: boost_1_34_1/boost/mpl/zip_view.hpp
===================================================================
--- boost_1_34_1.orig/boost/mpl/zip_view.hpp 2004-09-02 17:40:42.000000000 +0200
+++ boost_1_34_1/boost/mpl/zip_view.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -37,7 +37,7 @@
typedef zip_iterator<
typename transform1<
IteratorSeq
- , next<_1>
+ , boost::mpl::next<_1>
>::type
> next;
};
@@ -48,8 +48,8 @@
struct zip_view
{
private:
- typedef typename transform1< Sequences, begin<_1> >::type first_ones_;
- typedef typename transform1< Sequences, end<_1> >::type last_ones_;
+ typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type first_ones_;
+ typedef typename transform1< Sequences, boost::mpl::end<_1> >::type last_ones_;
public:
typedef nested_begin_end_tag tag;
Index: boost_1_34_1/boost/python/detail/def_helper.hpp
===================================================================
--- boost_1_34_1.orig/boost/python/detail/def_helper.hpp 2004-09-16 03:00:28.000000000 +0200
+++ boost_1_34_1/boost/python/detail/def_helper.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -155,7 +155,7 @@
, T3 const&
, T4 const&
, default_call_policies
- , keywords<0>
+ , boost::python::detail::keywords<0>
, char const*
, void(not_specified::*)() // A function pointer type which is never an
// appropriate default implementation
Index: boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp
===================================================================
--- boost_1_34_1.orig/boost/regex/v4/basic_regex_creator.hpp 2006-07-16 18:06:38.000000000 +0200
+++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -24,6 +24,8 @@
# include BOOST_ABI_PREFIX
#endif
+#include <climits>
+
namespace boost{
namespace re_detail{
Index: boost_1_34_1/boost/regex/v4/basic_regex.hpp
===================================================================
--- boost_1_34_1.orig/boost/regex/v4/basic_regex.hpp 2007-06-05 19:28:18.000000000 +0200
+++ boost_1_34_1/boost/regex/v4/basic_regex.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -23,6 +23,8 @@
# include BOOST_ABI_PREFIX
#endif
+#include <climits>
+
namespace boost{
#ifdef BOOST_MSVC
#pragma warning(push)
Index: boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp
===================================================================
--- boost_1_34_1.orig/boost/regex/v4/basic_regex_parser.hpp 2006-12-20 18:19:05.000000000 +0100
+++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -23,6 +23,8 @@
# include BOOST_ABI_PREFIX
#endif
+#include <climits>
+
namespace boost{
namespace re_detail{
Index: boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp
===================================================================
--- boost_1_34_1.orig/boost/regex/v4/cpp_regex_traits.hpp 2007-01-15 12:09:44.000000000 +0100
+++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -41,6 +41,7 @@
#include <istream>
#include <ios>
+#include <climits>
#ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_PREFIX
Index: boost_1_34_1/boost/regex/v4/perl_matcher.hpp
===================================================================
--- boost_1_34_1.orig/boost/regex/v4/perl_matcher.hpp 2006-10-18 14:55:30.000000000 +0200
+++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -18,6 +18,8 @@
# include BOOST_ABI_PREFIX
#endif
+#include <climits>
+
namespace boost{
namespace re_detail{
Index: boost_1_34_1/boost/regex/v4/regex_split.hpp
===================================================================
--- boost_1_34_1.orig/boost/regex/v4/regex_split.hpp 2005-01-21 18:22:38.000000000 +0100
+++ boost_1_34_1/boost/regex/v4/regex_split.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -21,6 +21,8 @@
#ifndef BOOST_REGEX_SPLIT_HPP
#define BOOST_REGEX_SPLIT_HPP
+#include <climits>
+
namespace boost{
#ifdef BOOST_HAS_ABI_HEADERS
Index: boost_1_34_1/boost/regex/v4/states.hpp
===================================================================
--- boost_1_34_1.orig/boost/regex/v4/states.hpp 2005-09-20 14:01:25.000000000 +0200
+++ boost_1_34_1/boost/regex/v4/states.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -23,6 +23,8 @@
# include BOOST_ABI_PREFIX
#endif
+#include <climits>
+
namespace boost{
namespace re_detail{
Index: boost_1_34_1/boost/serialization/collection_traits.hpp
===================================================================
--- boost_1_34_1.orig/boost/serialization/collection_traits.hpp 2005-06-21 07:19:04.000000000 +0200
+++ boost_1_34_1/boost/serialization/collection_traits.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -22,6 +22,7 @@
// compiles recognize the same set of primitive types, the possibility
// exists for archives to be non-portable if class information for primitive
// types is included. This is addressed by the following macros.
+#include <climits>
#include <boost/config.hpp>
#include <boost/mpl/integral_c.hpp>
#include <boost/mpl/integral_c_tag.hpp>
Index: boost_1_34_1/boost/spirit/phoenix/operators.hpp
===================================================================
--- boost_1_34_1.orig/boost/spirit/phoenix/operators.hpp 2006-08-25 18:27:30.000000000 +0200
+++ boost_1_34_1/boost/spirit/phoenix/operators.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -24,6 +24,7 @@
#include <boost/spirit/phoenix/composite.hpp>
#include <boost/config.hpp>
#include <boost/mpl/if.hpp>
+#include <climits>
///////////////////////////////////////////////////////////////////////////////
namespace phoenix {
Index: boost_1_34_1/boost/test/test_tools.hpp
===================================================================
--- boost_1_34_1.orig/boost/test/test_tools.hpp 2007-02-22 18:57:29.000000000 +0100
+++ boost_1_34_1/boost/test/test_tools.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -42,6 +42,7 @@
#include <boost/mpl/or.hpp>
// STL
+#include <climits>
#include <cstddef> // for std::size_t
#include <iosfwd>
Index: boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
===================================================================
--- boost_1_34_1.orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2006-12-20 17:38:24.000000000 +0100
+++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -16,6 +16,7 @@
#include <string>
#include <cstdio>
#include <cstdarg>
+#include <cstring>
#if defined(BOOST_SPIRIT_DEBUG)
#include <iostream>
#endif // defined(BOOST_SPIRIT_DEBUG)
Index: boost_1_34_1/boost/wave/util/flex_string.hpp
===================================================================
--- boost_1_34_1.orig/boost/wave/util/flex_string.hpp 2006-04-25 19:21:01.000000000 +0200
+++ boost_1_34_1/boost/wave/util/flex_string.hpp 2008-09-20 20:55:21.000000000 +0200
@@ -94,6 +94,7 @@
#include <limits>
#include <stdexcept>
#include <cstddef>
+#include <cstring>
// this must occur after all of the includes and before any code appears
#ifdef BOOST_HAS_ABI_HEADERS
@@ -0,0 +1,53 @@
8/17/2010 - rebased to 1.44 by Qing He <qing.he@intel.com>
diff --git a/boost/smart_ptr/detail/atomic_count_sync.hpp b/boost/smart_ptr/detail/atomic_count_sync.hpp
index b6359b5..78b1cc2 100644
--- a/boost/smart_ptr/detail/atomic_count_sync.hpp
+++ b/boost/smart_ptr/detail/atomic_count_sync.hpp
@@ -33,17 +33,46 @@ public:
long operator++()
{
+#ifdef __ARM_ARCH_7A__
+ int v1, tmp;
+ asm volatile ("1: \n\t"
+ "ldrex %0, %1 \n\t"
+ "add %0 ,%0, #1 \n\t"
+ "strex %2, %0, %1 \n\t"
+ "cmp %2, #0 \n\t"
+ "bne 1b \n\t"
+ : "=&r" (v1), "+Q"(value_), "=&r"(tmp)
+ );
+#else
return __sync_add_and_fetch( &value_, 1 );
+#endif
}
long operator--()
{
+#ifdef __ARM_ARCH_7A__
+ int v1, tmp;
+ asm volatile ("1: \n\t"
+ "ldrex %0, %1 \n\t"
+ "sub %0 ,%0, #1 \n\t"
+ "strex %2, %0, %1 \n\t"
+ "cmp %2, #0 \n\t"
+ "bne 1b \n\t"
+ : "=&r" (v1), "+Q"(value_), "=&r"(tmp)
+ );
+ return value_;
+#else
return __sync_add_and_fetch( &value_, -1 );
+#endif
}
operator long() const
{
+#if __ARM_ARCH_7A__
+ return value_;
+#else
return __sync_fetch_and_add( &value_, 0 );
+#endif
}
private:
@@ -0,0 +1,13 @@
Index: boost_1_33_1/boost/detail/atomic_count_gcc.hpp
===================================================================
--- boost_1_33_1.orig/boost/detail/atomic_count_gcc.hpp 2008-05-01 20:43:45.000000000 +0200
+++ boost_1_33_1/boost/detail/atomic_count_gcc.hpp 2008-05-01 20:43:55.000000000 +0200
@@ -17,7 +17,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
//
-#include <bits/atomicity.h>
+#include <ext/atomicity.h>
namespace boost
{
@@ -0,0 +1,14 @@
diff -ur boost_1_33_1.orig/boost/bind.hpp boost_1_33_1/boost/bind.hpp
--- boost_1_33_1.orig/boost/bind.hpp 2008-10-11 10:30:03.000000000 +0200
+++ boost_1_33_1/boost/bind.hpp 2008-10-11 10:41:25.000000000 +0200
@@ -28,6 +28,10 @@
#include <boost/bind/arg.hpp>
#include <boost/detail/workaround.hpp>
+#if __GNUC__ == 4 && __GNUC_MINOR__ == 1
+# include <boost/visit_each.hpp>
+#endif
+
// Borland-specific bug, visit_each() silently fails to produce code
#if defined(__BORLANDC__)
@@ -0,0 +1,256 @@
diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp boost_1_34_1/boost/archive/polymorphic_iarchive.hpp
--- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp 2005-12-11 00:12:51.000000000 -0600
+++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -17,6 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <cstddef> // std::size_t
+#include <climits>
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp boost_1_34_1/boost/archive/polymorphic_oarchive.hpp
--- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp 2006-02-11 23:43:06.000000000 -0600
+++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -17,6 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <cstddef> // size_t
+#include <climits>
#include <string>
#include <boost/config.hpp>
diff -aNru boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp boost_1_34_1/boost/date_time/date_facet.hpp
--- boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp 2005-09-05 16:10:50.000000000 -0500
+++ boost_1_34_1/boost/date_time/date_facet.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -429,7 +429,7 @@
typedef std::basic_string<CharT> string_type;
typedef CharT char_type;
typedef boost::date_time::period_parser<date_type, CharT> period_parser_type;
- typedef special_values_parser<date_type,CharT> special_values_parser_type;
+ typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type;
typedef std::vector<std::basic_string<CharT> > input_collection_type;
typedef format_date_parser<date_type, CharT> format_date_parser_type;
// date_generators stuff goes here
diff -aNru boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp boost_1_34_1/boost/mpl/zip_view.hpp
--- boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp 2004-09-02 10:40:42.000000000 -0500
+++ boost_1_34_1/boost/mpl/zip_view.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -37,7 +37,7 @@
typedef zip_iterator<
typename transform1<
IteratorSeq
- , next<_1>
+ , boost::mpl::next<_1>
>::type
> next;
};
@@ -48,8 +48,8 @@
struct zip_view
{
private:
- typedef typename transform1< Sequences, begin<_1> >::type first_ones_;
- typedef typename transform1< Sequences, end<_1> >::type last_ones_;
+ typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type first_ones_;
+ typedef typename transform1< Sequences, boost::mpl::end<_1> >::type last_ones_;
public:
typedef nested_begin_end_tag tag;
diff -aNru boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp boost_1_34_1/boost/python/detail/def_helper.hpp
--- boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp 2004-09-15 20:00:28.000000000 -0500
+++ boost_1_34_1/boost/python/detail/def_helper.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -155,7 +155,7 @@
, T3 const&
, T4 const&
, default_call_policies
- , keywords<0>
+ , boost::python::detail::keywords<0>
, char const*
, void(not_specified::*)() // A function pointer type which is never an
// appropriate default implementation
diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp
--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp 2006-07-16 11:06:38.000000000 -0500
+++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -24,6 +24,8 @@
# include BOOST_ABI_PREFIX
#endif
+#include <climits>
+
namespace boost{
namespace re_detail{
diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp boost_1_34_1/boost/regex/v4/basic_regex.hpp
--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp 2007-06-05 12:28:18.000000000 -0500
+++ boost_1_34_1/boost/regex/v4/basic_regex.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -23,6 +23,8 @@
# include BOOST_ABI_PREFIX
#endif
+#include <climits>
+
namespace boost{
#ifdef BOOST_MSVC
#pragma warning(push)
diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp
--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp 2006-12-20 11:19:05.000000000 -0600
+++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -23,6 +23,8 @@
# include BOOST_ABI_PREFIX
#endif
+#include <climits>
+
namespace boost{
namespace re_detail{
diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp
--- boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp 2007-01-15 05:09:44.000000000 -0600
+++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -41,6 +41,7 @@
#include <istream>
#include <ios>
+#include <climits>
#ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_PREFIX
diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp boost_1_34_1/boost/regex/v4/perl_matcher.hpp
--- boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp 2006-10-18 07:55:30.000000000 -0500
+++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -18,6 +18,8 @@
# include BOOST_ABI_PREFIX
#endif
+#include <climits>
+
namespace boost{
namespace re_detail{
diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp boost_1_34_1/boost/regex/v4/regex_split.hpp
--- boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp 2005-01-21 11:22:38.000000000 -0600
+++ boost_1_34_1/boost/regex/v4/regex_split.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -21,6 +21,8 @@
#ifndef BOOST_REGEX_SPLIT_HPP
#define BOOST_REGEX_SPLIT_HPP
+#include <climits>
+
namespace boost{
#ifdef BOOST_HAS_ABI_HEADERS
diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp boost_1_34_1/boost/regex/v4/states.hpp
--- boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp 2005-09-20 07:01:25.000000000 -0500
+++ boost_1_34_1/boost/regex/v4/states.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -23,6 +23,8 @@
# include BOOST_ABI_PREFIX
#endif
+#include <climits>
+
namespace boost{
namespace re_detail{
diff -aNru boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp boost_1_34_1/boost/serialization/collection_traits.hpp
--- boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp 2005-06-21 00:19:04.000000000 -0500
+++ boost_1_34_1/boost/serialization/collection_traits.hpp 2008-03-03 03:09:49.000000000 -0600
@@ -22,6 +22,7 @@
// compiles recognize the same set of primitive types, the possibility
// exists for archives to be non-portable if class information for primitive
// types is included. This is addressed by the following macros.
+#include <climits>
#include <boost/config.hpp>
#include <boost/mpl/integral_c.hpp>
#include <boost/mpl/integral_c_tag.hpp>
diff -aNru boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp boost_1_34_1/boost/spirit/phoenix/operators.hpp
--- boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp 2006-08-25 11:27:30.000000000 -0500
+++ boost_1_34_1/boost/spirit/phoenix/operators.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -24,6 +24,7 @@
#include <boost/spirit/phoenix/composite.hpp>
#include <boost/config.hpp>
#include <boost/mpl/if.hpp>
+#include <climits>
///////////////////////////////////////////////////////////////////////////////
namespace phoenix {
diff -aNru boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp boost_1_34_1/boost/test/test_tools.hpp
--- boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp 2007-02-22 11:57:29.000000000 -0600
+++ boost_1_34_1/boost/test/test_tools.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -42,6 +42,7 @@
#include <boost/mpl/or.hpp>
// STL
+#include <climits>
#include <cstddef> // for std::size_t
#include <iosfwd>
diff -aNru boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
--- boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2006-12-20 10:38:24.000000000 -0600
+++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -16,6 +16,7 @@
#include <string>
#include <cstdio>
#include <cstdarg>
+#include <cstring>
#if defined(BOOST_SPIRIT_DEBUG)
#include <iostream>
#endif // defined(BOOST_SPIRIT_DEBUG)
diff -aNru boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp boost_1_34_1/boost/wave/util/flex_string.hpp
--- boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp 2006-04-25 12:21:01.000000000 -0500
+++ boost_1_34_1/boost/wave/util/flex_string.hpp 2008-03-03 03:08:59.000000000 -0600
@@ -94,6 +94,7 @@
#include <limits>
#include <stdexcept>
#include <cstddef>
+#include <cstring>
// this must occur after all of the includes and before any code appears
#ifdef BOOST_HAS_ABI_HEADERS
--- boost_1_33_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-07-05 01:50:04.000000000 +0200
+++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2006-12-20 17:38:24.000000000 +0100
@@ -295,17 +325,20 @@
lex_functor(IteratorT const &first, IteratorT const &last,
PositionT const &pos, boost::wave::language_support language)
- : lexer(first, last, pos, language)
+ : re2c_lexer(first, last, pos, language)
{}
virtual ~lex_functor() {}
// get the next token from the input stream
- token_type get() { return lexer.get(); }
- void set_position(PositionT const &pos)
- { lexer.set_position(pos); }
+ token_type get() { return re2c_lexer.get(); }
+ void set_position(PositionT const &pos) { re2c_lexer.set_position(pos); }
+#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
+ bool has_include_guards(std::string& guard_name) const
+ { return re2c_lexer.has_include_guards(guard_name); }
+#endif
private:
- lexer<IteratorT, PositionT> lexer;
+ lexer<IteratorT, PositionT> re2c_lexer;
};
///////////////////////////////////////////////////////////////////////////////
@@ -338,7 +371,7 @@
// It is coupled to the iterator type to allow to decouple the lexer/iterator
// configurations at compile time.
//
-// This function is declared inside the cpp_slex_token.hpp file, which is
+// This function is declared inside the cpp_lex_token.hpp file, which is
// referenced by the source file calling the lexer and the source file, which
// instantiates the lex_functor. But is is defined here, so it will be
// instantiated only while compiling the source file, which instantiates the
@@ -356,8 +389,8 @@
IteratorT const &last, PositionT const &pos,
boost::wave::language_support language)
{
- return new re2clex::lex_functor<IteratorT, PositionT>(first, last, pos,
- language);
+ using re2clex::lex_functor;
+ return new lex_functor<IteratorT, PositionT>(first, last, pos, language);
}
#undef BOOST_WAVE_RE2C_NEW_LEXER_INLINE
@@ -0,0 +1,10 @@
--- /dev/null 1969-12-31 16:00:00.000000000 -0800
+++ boost_1_32_0/boost/config/platform/linux-uclibc.hpp 2005-07-05 14:51:56.237294460 -0700
@@ -0,0 +1,7 @@
+// Modifications required to support uClibC libc implementation.
+// Default to Linux...
+#include "linux.hpp"
+
+// Override anything uClibC doesn't support.
+// At present (0.9.27) the nl_types.h header exists but is not implemented
+#undef BOOST_HAS_NL_TYPES_H
@@ -0,0 +1,20 @@
--- boost_1_32_0/libs/test/src/unit_test_result.cpp.orig 2005-07-05 11:00:53.887594850 -0700
+++ boost_1_32_0/libs/test/src/unit_test_result.cpp 2005-07-05 11:01:20.683533034 -0700
@@ -144,7 +144,7 @@
unit_test_counter num_passed, unit_test_counter num_failed )
{
unit_test_counter total_test_cases = num_passed + num_failed;
- std::size_t width = static_cast<std::size_t>( std::log10( (float)(std::max)( num_passed, num_failed ) ) ) + 1;
+ std::size_t width = static_cast<std::size_t>( std::log10( (double)(std::max)( num_passed, num_failed ) ) ) + 1;
where_to << std::setw( indent ) << "" << std::setw( width ) << num_passed
<< " test " << ps_name( num_passed != 1, "case" ) << " out of " << total_test_cases << " passed\n"
@@ -158,7 +158,7 @@
{
unit_test_counter total_assertions = num_passed + num_failed;
std::size_t width = total_assertions > 0
- ? static_cast<std::size_t>( std::log10( (float)(std::max)( num_passed, num_failed ) ) ) + 1
+ ? static_cast<std::size_t>( std::log10( (double)(std::max)( num_passed, num_failed ) ) ) + 1
: 1;
where_to << std::setw( indent ) << "" << std::setw( width ) << num_passed
@@ -0,0 +1,74 @@
Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling.
Since we never run compiled binaries for the target, we should *never* need
to change LD_LIBRARY_PATH.
RP 9/6/2010
Index: curl-7.20.0/configure.ac
===================================================================
--- curl-7.20.0.orig/configure.ac 2010-06-09 11:06:30.000000000 +0100
+++ curl-7.20.0/configure.ac 2010-06-09 11:04:25.000000000 +0100
@@ -1461,9 +1461,10 @@
dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
dnl to prevent further configure tests to fail due to this
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
- export LD_LIBRARY_PATH
- AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
+ #export LD_LIBRARY_PATH
+ #AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
+ :
fi
fi
@@ -1684,9 +1686,10 @@
dnl LD_LIBRARY_PATH to prevent further configure tests to fail
dnl due to this
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"
- export LD_LIBRARY_PATH
- AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"
+ #export LD_LIBRARY_PATH
+ #AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
+ :
fi
fi
@@ -1696,6 +1699,8 @@
fi dnl OPENSSL != 1
+AC_SUBST(GNUTLS_REQUIRED)
+
dnl ----------------------------------------------------
dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
dnl ----------------------------------------------------
@@ -1781,9 +1786,10 @@
dnl LD_LIBRARY_PATH to prevent further configure tests to fail
dnl due to this
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff"
- export LD_LIBRARY_PATH
- AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff"
+ #export LD_LIBRARY_PATH
+ #AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
+ :
fi
fi
@@ -1881,9 +1887,9 @@
dnl libssh2_version is a post 1.0 addition
AC_CHECK_FUNCS( libssh2_version )
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2"
- export LD_LIBRARY_PATH
- AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2"
+ #export LD_LIBRARY_PATH
+ #AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
fi
else
dnl no libssh2, revert back to clean variables
@@ -0,0 +1,35 @@
Index: curl-7.20.0/libcurl.pc.in
===================================================================
--- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000
+++ curl-7.20.0/libcurl.pc.in 2010-03-25 12:13:26.814051066 +0000
@@ -35,6 +35,7 @@
URL: http://curl.haxx.se/
Description: Library to transfer files with ftp, http, etc.
Version: @VERSION@
-Libs: -L${libdir} -lcurl @LIBS@
-Libs.private: @LIBCURL_LIBS@ @LIBS@
+Requires.private: @GNUTLS_REQUIRED@
+Libs: -L${libdir} -lcurl
+Libs.private: -ldl -lz
Cflags: -I${includedir}
Index: curl-7.20.0/configure.ac
===================================================================
--- curl-7.20.0.orig/configure.ac 2010-02-04 21:41:46.000000000 +0000
+++ curl-7.20.0/configure.ac 2010-03-25 12:12:18.673129001 +0000
@@ -1668,6 +1668,7 @@
AC_SUBST(USE_GNUTLS, [1])
GNUTLS_ENABLED=1
USE_GNUTLS="yes"
+ GNUTLS_REQUIRED="gnutls"
curl_ssl_msg="enabled (GnuTLS)"
],
[
@@ -1696,6 +1697,8 @@
fi dnl OPENSSL != 1
+AC_SUBST(GNUTLS_REQUIRED)
+
dnl ----------------------------------------------------
dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
dnl ----------------------------------------------------
+54
View File
@@ -0,0 +1,54 @@
DESCRIPTION = "Command line tool and library for client-side URL transfers."
HOMEPAGE = "http://curl.haxx.se/"
BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker"
SECTION = "console/network"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
DEPENDS = "zlib gnutls"
DEPENDS_virtclass-native = "zlib-native"
DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
PR = "r0"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://noldlibpath.patch \
file://pkgconfig_fix.patch"
inherit autotools pkgconfig binconfig
EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
--with-gnutls=${STAGING_BINDIR_CROSS}/ \
--without-ssl \
--without-libssh2 \
--with-random=/dev/urandom \
--without-libidn \
--enable-crypto-auth \
"
do_configure_prepend() {
sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
}
PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
FILES_${PN} = "${bindir}/curl"
FILES_${PN}-certs = "${datadir}/curl/curl-*"
PACKAGE_ARCH_${PN}-certs = "all"
FILES_${PN}-doc = "${mandir}/man1/curl.1"
FILES_lib${PN} = "${libdir}/lib*.so.*"
RRECOMMENDS_lib${PN} += "${PN}-certs"
FILES_lib${PN}-dev = "${includedir} \
${libdir}/lib*.so \
${libdir}/lib*.a \
${libdir}/lib*.la \
${libdir}/pkgconfig \
${datadir}/aclocal \
${bindir}/*-config"
FILES_lib${PN}-doc = "${mandir}/man3 \
${mandir}/man1/curl-config.1"
BBCLASSEXTEND = "native nativesdk"
@@ -0,0 +1,36 @@
--- db-4.3.29-dist/../dbinc/mutex.h 2005-11-15 07:33:27.761042518 -0800
+++ db-4.3.29-dist/../dbinc/mutex.h 2005-11-15 07:55:24.823920060 -0800
@@ -470,6 +470,25 @@
#ifdef LOAD_ACTUAL_MUTEX_CODE
#define MUTEX_SET_TEST 1 /* gcc/arm: 0 is clear, 1 is set. */
+#if defined __thumb__
+#define MUTEX_SET(tsl) ({ \
+ int __r, __p; \
+ asm volatile( \
+ ".align 2\n\t" \
+ "bx pc\n\t" \
+ "nop\n\t" \
+ ".arm\n\t" \
+ "swpb %0, %2, [%3]\n\t" \
+ "eor %0, %0, #1\n\t" \
+ "orr %1, pc, #1\n\t" \
+ "bx %1\n\t" \
+ ".force_thumb" \
+ : "=&r" (__r), "=r" (__p) \
+ : "r" (1), "r" (tsl) \
+ ); \
+ __r & 1; \
+})
+#else
#define MUTEX_SET(tsl) ({ \
int __r; \
asm volatile( \
@@ -480,6 +499,7 @@
); \
__r & 1; \
})
+#endif
#define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0)
#define MUTEX_INIT(tsl) MUTEX_UNSET(tsl)
@@ -0,0 +1,18 @@
If LD is a binary name + parameters db will fail to work out its GNU ld
and disable shared libraries. We don't want this.
RP - 22/11/2007
Index: dist/configure
===================================================================
--- dist.orig/configure 2007-11-23 00:47:27.000000000 +0000
+++ dist/configure 2007-11-23 00:53:22.000000000 +0000
@@ -5658,7 +5661,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `"$LD" -v 2>&1 </dev/null` in
+case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
+97
View File
@@ -0,0 +1,97 @@
# Version 4 of the Berkeley DB from Sleepycat
#
# At present this package only installs the DB code
# itself (shared libraries, .a in the dev package),
# documentation and headers.
#
# The headers have the same names as those as v3
# of the DB, only one version can be used *for dev*
# at once - DB3 and DB4 can both be installed on the
# same system at the same time if really necessary.
SECTION = "libs"
DESCRIPTION = "Berkeley DB v4."
HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
LICENSE = "BSD Sleepycat"
VIRTUAL_NAME = "virtual/db"
VIRTUAL_NAME_virtclass-native = "virtual/db-native"
CONFLICTS = "db3"
CONFLICTS_virtclass-native = "db3-native"
PR = "r8"
SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz \
file://configure_fixes.patch;patch=1 "
#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
#TODO SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
inherit autotools
# Put virtual/db in any appropriate provider of a
# relational database, use it as a dependency in
# place of a specific db and use:
#
# PREFERRED_PROVIDER_virtual/db
#
# to select the correct db in the build (distro) .conf
PROVIDES += "${VIRTUAL_NAME}"
# bitbake isn't quite clever enough to deal with sleepycat,
# the distribution sits in the expected directory, but all
# the builds must occur from a sub-directory. The following
# persuades bitbake to go to the right place
S = "${WORKDIR}/db-${PV}/dist"
B = "${WORKDIR}/db-${PV}/build_unix"
# The executables go in a separate package - typically there
# is no need to install these unless doing real database
# management on the system.
PACKAGES += " ${PN}-bin"
# Package contents
FILES_${PN} = "${libdir}/libdb-4*so*"
FILES_${PN}-bin = "${bindir}/*"
# The dev package has the .so link (as in db3) and the .a's -
# it is therefore incompatible (cannot be installed at the
# same time) as the db3 package
FILES_${PN}-dev = "${includedir} ${libdir}/*"
#configuration - set in local.conf to override
DB4_CONFIG ?= " --disable-cryptography --disable-queue --disable-replication --disable-verify --enable-hash"
EXTRA_OECONF = "${DB4_CONFIG}"
# Override the MUTEX setting here, the POSIX library is
# the default - "POSIX/pthreads/library".
# Don't ignore the nice SWP instruction on the ARM:
# These enable the ARM assembler mutex code, this won't
# work with thumb compilation...
ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
MUTEX = ""
MUTEX_arm = "${ARM_MUTEX}"
MUTEX_armeb = "${ARM_MUTEX}"
EXTRA_OECONF += "${MUTEX}"
ARM_INSTRUCTION_SET = "arm"
# Cancel the site stuff - it's set for db3 and destroys the
# configure.
CONFIG_SITE = ""
do_configure() {
rm -f ${S}/config.sub
cp ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/config.sub
oe_runconf
}
do_install_append() {
# The docs end up in /usr/docs - not right.
if test -d "${D}/${prefix}/docs"
then
mkdir -p "${D}/${datadir}"
test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
mv "${D}/${prefix}/docs" "${D}/${docdir}"
fi
}
# The db package contains symlinks that trip up insane
INSANE_SKIP_db = "1"
BBCLASSEXTEND = "native"
+89
View File
@@ -0,0 +1,89 @@
# Has issues with eds
DEFAULT_PREFERENCE = "-1"
# Version 4 of the Berkeley DB from Sleepycat
#
# At present this package only installs the DB code
# itself (shared libraries, .a in the dev package),
# documentation and headers.
#
# The headers have the same names as those as v3
# of the DB, only one version can be used *for dev*
# at once - DB3 and DB4 can both be installed on the
# same system at the same time if really necessary.
SECTION = "libs"
DESCRIPTION = "Berkeley DB v4."
HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
LICENSE = "BSD Sleepycat"
VIRTUAL_NAME ?= "virtual/db"
CONFLICTS = "db3"
PR = "r8"
SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
inherit autotools
# Put virtual/db in any appropriate provider of a
# relational database, use it as a dependency in
# place of a specific db and use:
#
# PREFERRED_PROVIDER_virtual/db
#
# to select the correct db in the build (distro) .conf
PROVIDES += "${VIRTUAL_NAME}"
# bitbake isn't quite clever enough to deal with sleepycat,
# the distribution sits in the expected directory, but all
# the builds must occur from a sub-directory. The following
# persuades bitbake to go to the right place
S = "${WORKDIR}/db-${PV}/dist"
B = "${WORKDIR}/db-${PV}/build_unix"
# The executables go in a separate package - typically there
# is no need to install these unless doing real database
# management on the system.
PACKAGES += " ${PN}-bin"
# Package contents
FILES_${PN} = "${libdir}/libdb-4*so*"
FILES_${PN}-bin = "${bindir}/*"
# The dev package has the .so link (as in db3) and the .a's -
# it is therefore incompatible (cannot be installed at the
# same time) as the db3 package
FILES_${PN}-dev = "${includedir} ${libdir}/*"
#configuration - set in local.conf to override
# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
DB4_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-statistics --disable-verify --enable-compat185"
EXTRA_OECONF = "${DB4_CONFIG}"
# Override the MUTEX setting here, the POSIX library is
# the default - "POSIX/pthreads/library".
# Don't ignore the nice SWP instruction on the ARM:
# These enable the ARM assembler mutex code, this won't
# work with thumb compilation...
ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
MUTEX = ""
MUTEX_arm = "${ARM_MUTEX}"
MUTEX_armeb = "${ARM_MUTEX}"
EXTRA_OECONF += "${MUTEX}"
# Cancel the site stuff - it's set for db3 and destroys the
# configure.
CONFIG_SITE = ""
do_configure() {
oe_runconf
}
do_install_append() {
# The docs end up in /usr/docs - not right.
if test -d "${D}/${prefix}/docs"
then
mkdir -p "${D}/${datadir}"
test ! -d "${D}/${docdir}" || rmdir "${D}/${docdir}"
mv "${D}/${prefix}/docs" "${D}/${docdir}"
fi
}
@@ -0,0 +1,22 @@
DESCRIPTION = "Enchant Spell checker API Library"
SECTION = "libs"
HOMEPAGE = "http://www.abisource.com/projects/enchant/"
BUGTRACKER = "http://bugzilla.abisource.com/enter_bug.cgi?product=Enchant"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=dfcbabf9131dc9a95febef6753a2958b \
file://src/enchant.h;beginline=1;endline=29;md5=8d881caa1d37523567e1d8f726675a18"
DEPENDS = "aspell glib-2.0"
RDEPENDS = "aspell"
inherit autotools pkgconfig
PR = "r0"
SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz"
EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-aspell --disable-binreloc"
FILES_${PN} = "${bindir} ${libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}/*.so"
FILES_${PN}-dev += "${libdir}/${PN}/*{SOLIBSDEV} ${libdir}/${PN}/*.la ${libdir}/${PN}/*.a"
export CXXFLAGS += " -L${STAGING_LIBDIR} -lstdc++ "
@@ -0,0 +1,20 @@
--- gdbm-1.8.3/Makefile.in.orig 2006-02-16 15:17:25.000000000 +0000
+++ gdbm-1.8.3/Makefile.in 2006-02-16 15:18:08.000000000 +0000
@@ -131,7 +131,7 @@
$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir) $(DESTDIR)$(man3dir) \
$(DESTDIR)$(infodir)
- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la
+ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la
$(INSTALL_DATA) gdbm.h \
$(DESTDIR)$(includedir)/gdbm.h
$(INSTALL_DATA) $(srcdir)/gdbm.3 \
@@ -142,7 +142,7 @@
install-compat:
$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)
- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
+ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \
$(DESTDIR)$(libdir)/libgdbm_compat.la
$(INSTALL_DATA) $(srcdir)/dbm.h \
$(DESTDIR)$(includedir)/dbm.h
@@ -0,0 +1,59 @@
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- gdbm-1.8.3/Makefile.in~makefile
+++ gdbm-1.8.3/Makefile.in
@@ -22,6 +22,7 @@
TEXI2DVI = texi2dvi
DEFS =
+DESTDIR =
# Where the system [n]dbm routines are...
LIBS = @LIBS@ -lc
@@ -127,26 +128,26 @@
progs: $(PROGS)
install: libgdbm.la gdbm.h gdbm.info
- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
- $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
- $(INSTALL_ROOT)$(infodir)
- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
- $(INSTALL_ROOT)$(includedir)/gdbm.h
- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
- $(INSTALL_ROOT)$(man3dir)/gdbm.3
- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
- $(INSTALL_ROOT)$(infodir)/gdbm.info
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \
+ $(DESTDIR)$(includedir) $(DESTDIR)$(man3dir) \
+ $(DESTDIR)$(infodir)
+ $(LIBTOOL) $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la
+ $(INSTALL_DATA) gdbm.h \
+ $(DESTDIR)$(includedir)/gdbm.h
+ $(INSTALL_DATA) $(srcdir)/gdbm.3 \
+ $(DESTDIR)$(man3dir)/gdbm.3
+ $(INSTALL_DATA) $(srcdir)/gdbm.info \
+ $(DESTDIR)$(infodir)/gdbm.info
install-compat:
- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
- $(INSTALL_ROOT)$(includedir)
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \
+ $(DESTDIR)$(includedir)
$(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
- $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
- $(INSTALL_ROOT)$(includedir)/dbm.h
- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
- $(INSTALL_ROOT)$(includedir)/ndbm.h
+ $(DESTDIR)$(libdir)/libgdbm_compat.la
+ $(INSTALL_DATA) $(srcdir)/dbm.h \
+ $(DESTDIR)$(includedir)/dbm.h
+ $(INSTALL_DATA) $(srcdir)/ndbm.h \
+ $(DESTDIR)$(includedir)/ndbm.h
#libgdbm.a: $(OBJS) gdbm.h
# rm -f libgdbm.a
+16
View File
@@ -0,0 +1,16 @@
DESCRIPTION = "GNU dbm is a set of database routines that use extensible hashing."
HOMEPAGE = "http://www.gnu.org/software/gdbm/"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d8e20eece214df8ef953ed5857862150"
PR = "r4"
SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
file://makefile.patch;patch=1 \
file://libtool-mode.patch;patch=1"
inherit autotools
BBCLASSEXTEND = "native"
@@ -0,0 +1,31 @@
# "extern inline" in traditional gcc means that the function should be
# inlined wherever it's seen, while in C99, "extern inline" means that i
# the function should only be inlined where the inline definition is
# seen while in other places it's not inlined:
# http://gcc.gnu.org/ml/gcc/2006-11/msg00006.html
#
# gmp checks "--std=gnu99" to use C99 convention however it internally
# defines some "extern inline" functions in gmp.h, which is included
# by mainly .c files and finally lead a flood of redefinition function
# errors when linking objects together.
#
# So disable C99/ANSI detection to stick to tranditional gcc behavior
#
# by Kevin Tian <kevin.tian@intel.com>, 2010-08-13
#
# (this patch is licensed under GPLv2+)
diff --git a/configure.in b/configure.in
index 450cc92..aab0b59 100644
--- a/configure.in
+++ b/configure.in
@@ -1869,9 +1869,7 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
# The C compiler and preprocessor, put into ANSI mode if possible.
AC_PROG_CC
-AC_PROG_CC_STDC
AC_PROG_CPP
-GMP_H_ANSI
# The C compiler on the build system, and associated tests.
+16
View File
@@ -0,0 +1,16 @@
SECTION = "devel"
DESCRIPTION = "GNU multiprecision arithmetic library"
HOMEPAGE = "http://www.swox.com/gmp/"
LICENSE = "GPLv3 LGPLv3"
SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \
file://configure.patch \
file://amd64.patch "
inherit autotools
ARM_INSTRUCTION_SET = "arm"
acpaths = ""
BBCLASSEXTEND = "native nativesdk"
+14
View File
@@ -0,0 +1,14 @@
--- gmp-4.1.4/longlong.h.orig 2004-04-22 00:34:28.000000000 +0200
+++ gmp-4.1.4/longlong.h 2005-07-18 01:13:06.000000000 +0200
@@ -738,8 +738,10 @@
count is only an int. */
#define count_trailing_zeros(count, x) \
do { \
+ UDItype __cbtmp; \
ASSERT ((x) != 0); \
- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \
+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \
+ (count) = __cbtmp; \
} while (0)
#endif /* x86_64 */
@@ -0,0 +1,195 @@
acinclude.m4 | 26 ++++++++++++++------------
configure.in | 24 +++++++++---------------
2 files changed, 23 insertions(+), 27 deletions(-)
Index: gmp-5.0.1/acinclude.m4
===================================================================
--- gmp-5.0.1.orig/acinclude.m4
+++ gmp-5.0.1/acinclude.m4
@@ -30,20 +30,20 @@ dnl a_out.exe - OpenVMS DEC C called
dnl conftest.exe - various DOS compilers
-define(IA64_PATTERN,
+define([IA64_PATTERN],
[[ia64*-*-* | itanium-*-* | itanium2-*-*]])
dnl Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all
dnl of which config.sub accepts. (Though none of which are likely to work
dnl with GMP.)
dnl
-define(M68K_PATTERN,
+define([M68K_PATTERN],
[[m68k-*-* | m68[0-9][0-9][0-9]-*-*]])
-define(POWERPC64_PATTERN,
+define([POWERPC64_PATTERN],
[[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]])
-define(X86_PATTERN,
+define([X86_PATTERN],
[[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]])
define(X86_64_PATTERN,
@@ -64,7 +64,7 @@ dnl x86 -> x86
dnl x86/k6 -> k6
dnl x86/k6/mmx -> k6_mmx
-define(GMP_FAT_SUFFIX,
+define([GMP_FAT_SUFFIX],
[[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]])
@@ -73,7 +73,7 @@ dnl ----------------------------------
dnl Emit code to remove any occurrence of ITEM from $LISTVAR. ITEM can be a
dnl shell expression like $foo if desired.
-define(GMP_REMOVE_FROM_LIST,
+define([GMP_REMOVE_FROM_LIST],
[remove_from_list_tmp=
for remove_from_list_i in $[][$1]; do
if test $remove_from_list_i = [$2]; then :;
@@ -89,12 +89,12 @@ dnl GMP_STRIP_PATH(subdir)
dnl ----------------------
dnl Strip entries */subdir from $path and $fat_path.
-define(GMP_STRIP_PATH,
+define([GMP_STRIP_PATH],
[GMP_STRIP_PATH_VAR(path, [$1])
GMP_STRIP_PATH_VAR(fat_path, [$1])
])
-define(GMP_STRIP_PATH_VAR,
+define([GMP_STRIP_PATH_VAR],
[tmp_path=
for i in $[][$1]; do
case $i in
@@ -115,7 +115,7 @@ dnl
dnl Dummy value for GMP_LIMB_BITS is enough
dnl for all current configure-time uses of gmp.h.
-define(GMP_INCLUDE_GMP_H,
+define([GMP_INCLUDE_GMP_H],
[[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */
#define GMP_NAIL_BITS $GMP_NAIL_BITS
#define GMP_LIMB_BITS 123
@@ -130,7 +130,7 @@ dnl Expand at autoconf time to the valu
dnl FILE. The regexps here aren't very rugged, but are enough for gmp.
dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted.
-define(GMP_HEADER_GETVAL,
+define([GMP_HEADER_GETVAL],
[patsubst(patsubst(
esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]),
[^.*$1[ ]+],[]),
@@ -144,7 +144,7 @@ dnl The gmp version number, extracted f
dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits
dnl like 3.0.1 if patchlevel > 0.
-define(GMP_VERSION,
+define([GMP_VERSION],
[GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl
.GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl
.GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in)])
@@ -1506,7 +1506,9 @@ esac
echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4
# All CPUs use asm-defs.m4
-echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i
+echo -n ["include("] >>$gmp_tmpconfigm4i
+echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i
+echo [")"] >>$gmp_tmpconfigm4i
])
Index: gmp-5.0.1/configure.in
===================================================================
--- gmp-5.0.1.orig/configure.in
+++ gmp-5.0.1/configure.in
@@ -29,12 +29,6 @@ AC_REVISION($Revision$)
AC_PREREQ(2.59)
AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@gmplib.org, gmp)
AC_CONFIG_SRCDIR(gmp-impl.h)
-m4_pattern_forbid([^[ \t]*GMP_])
-m4_pattern_allow(GMP_LDFLAGS)
-m4_pattern_allow(GMP_LIMB_BITS)
-m4_pattern_allow(GMP_MPARAM_H_SUGGEST)
-m4_pattern_allow(GMP_NAIL_BITS)
-m4_pattern_allow(GMP_NUMB_BITS)
# If --target is not used then $target_alias is empty, but if say
# "./configure athlon-pc-freebsd3.5" is used, then all three of
@@ -303,7 +297,7 @@ AH_VERBATIM([HAVE_HOST_CPU_1],
# After GMP specific searches and tests, the standard autoconf AC_PROG_CC is
# called. User selections of CC etc are respected.
#
-# Care is taken not to use macros like AC_TRY_COMPILE during the GMP
+# Care is taken not to use macros like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) during the GMP
# pre-testing, since they of course depend on AC_PROG_CC, and also some of
# them cache their results, which is not wanted.
#
@@ -395,7 +389,7 @@ abilist="standard"
# FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring
# c89 over cc here. But note that on HP-UX c89 provides a castrated
# environment, and would want to be excluded somehow. Maybe
-# AC_PROG_CC_STDC already does enough to stick cc into ANSI mode and
+# already does enough to stick cc into ANSI mode and
# we don't need to worry.
#
cclist="gcc cc"
@@ -1580,7 +1574,7 @@ esac
CFLAGS_or_unset=${CFLAGS-'(unset)'}
CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
-cat >&AC_FD_CC <<EOF
+cat >&AS_MESSAGE_LOG_FD() <<EOF
User:
ABI=$ABI
CC=$CC
@@ -1987,7 +1981,6 @@ AC_SUBST(DEFN_LONG_LONG_LIMB)
# The C compiler and preprocessor, put into ANSI mode if possible.
AC_PROG_CC
-AC_PROG_CC_STDC
AC_PROG_CPP
GMP_H_ANSI
@@ -2010,11 +2003,11 @@ AC_SUBST(CCAS)
# The C++ compiler, if desired.
want_cxx=no
+AC_PROG_CXX
if test $enable_cxx != no; then
test_CXXFLAGS=${CXXFLAGS+set}
- AC_PROG_CXX
- echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC
+ echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD()
cxxflags_ac_prog_cxx=$CXXFLAGS
cxxflags_list=ac_prog_cxx
@@ -2120,7 +2113,7 @@ case $host in
esac
-cat >&AC_FD_CC <<EOF
+cat >&AS_MESSAGE_LOG_FD() <<EOF
Decided:
ABI=$ABI
CC=$CC
@@ -3376,7 +3369,7 @@ GMP_FINISH
# FIXME: Upcoming version of autoconf/automake may not like broken lines.
# Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
-AC_OUTPUT(Makefile \
+AC_CONFIG_FILES([Makefile \
mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile \
mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile \
tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile \
@@ -3385,4 +3378,5 @@ AC_OUTPUT(Makefile \
tests/cxx/Makefile \
doc/Makefile tune/Makefile \
demos/Makefile demos/calc/Makefile demos/expr/Makefile \
- gmp.h:gmp-h.in mp.h:mp-h.in)
+ gmp.h:gmp-h.in mp.h:mp-h.in])
+AC_OUTPUT
@@ -0,0 +1,26 @@
--- gmp-4.1.4/mpn/sh/add_n.s 2005/11/17 08:44:00 1.1
+++ gmp-4.1.4/mpn/sh/add_n.s 2005/11/17 08:18:57
@@ -29,8 +29,8 @@
.text
.align 2
- .global ___gmpn_add_n
-___gmpn_add_n:
+ .global __gmpn_add_n
+__gmpn_add_n:
mov #0,r3 ! clear cy save reg
Loop: mov.l @r5+,r1
--- gmp-4.1.4/mpn/sh/sub_n.s 2005/11/17 08:44:04 1.1
+++ gmp-4.1.4/mpn/sh/sub_n.s 2005/11/17 08:18:59
@@ -29,8 +29,8 @@
.text
.align 2
- .global ___gmpn_sub_n
-___gmpn_sub_n:
+ .global __gmpn_sub_n
+__gmpn_sub_n:
mov #0,r3 ! clear cy save reg
Loop: mov.l @r5+,r1
@@ -0,0 +1,13 @@
Index: gmp-4.2.4/Makefile.am
===================================================================
--- gmp-4.2.4.orig/Makefile.am 2008-09-10 19:31:27.000000000 +0000
+++ gmp-4.2.4/Makefile.am 2009-07-06 20:19:19.000000000 +0000
@@ -106,7 +106,7 @@
# but anyone knowledgable enough to be playing with exec_prefix will be able
# to address that.
#
-includeexecdir = $(exec_prefix)/include
+includeexecdir = $(includedir)
include_HEADERS = $(GMPXX_HEADERS_OPTION)
nodist_includeexec_HEADERS = gmp.h $(MPBSD_HEADERS_OPTION)
lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION)
+14
View File
@@ -0,0 +1,14 @@
DESCRIPTION = "GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers"
HOMEPAGE = "http://gmplib.org/"
BUGTRACKER = "http://gmplib.org/mailman/listinfo/gmp-bugs"
# demo is licensed under GPLv2+, which however we don't package at all
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \
file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
file://gmp-h.in;startline=6;endline=21;md5=5e25ffd16996faba8c1cd27b04b16099"
PR = "r0"
SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/${BP}.tar.bz2 \
file://disable-stdc.patch"
inherit autotools
+7
View File
@@ -0,0 +1,7 @@
require gmp.inc
PR = "r0"
SRC_URI_append += "file://sh4-asmfix.patch \
file://use-includedir.patch "
@@ -0,0 +1,64 @@
rebased from original configure_madness.patch
libtasn1 provides an .pc file in upstream,
and a libgcrypt.pc is added in libgcrypt recipe,
so use Requires.private for these two.
against 2.8.6
07/02/2010 - qhe
---
diff --git a/lib/configure.ac b/lib/configure.ac
index 80d3375..1a486f7 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -81,8 +81,8 @@ fi
lgl_INIT
-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
-LIBGNUTLS_CFLAGS="-I${includedir}"
+LIBGNUTLS_LIBS="-lgnutls $LIBS"
+LIBGNUTLS_CFLAGS=""
AC_SUBST(LIBGNUTLS_LIBS)
AC_SUBST(LIBGNUTLS_CFLAGS)
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index 3b01c17..de31469 100644
--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
@@ -20,6 +20,6 @@ Name: GnuTLS
Description: Transport Security Layer implementation for the GNU system
URL: http://www.gnu.org/software/gnutls/
Version: @VERSION@
+Requires.private: libgcrypt, libtasn1
Libs: -L${libdir} -lgnutls
-Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@
Cflags: -I${includedir}
diff --git a/libextra/configure.ac b/libextra/configure.ac
index c08e73f..3313886 100644
--- a/libextra/configure.ac
+++ b/libextra/configure.ac
@@ -40,8 +40,8 @@ LIBGNUTLS_EXTRA_HOOKS
xgl_INIT
-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
+LIBGNUTLS_EXTRA_CFLAGS=""
AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in
index 9e7b8f6..e228ec9 100644
--- a/libextra/gnutls-extra.pc.in
+++ b/libextra/gnutls-extra.pc.in
@@ -21,5 +21,5 @@ URL: http://www.gnu.org/software/gnutls/
Requires: gnutls
Version: @VERSION@
Libs: -L${libdir} -lgnutls-extra
-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
+Libs.private: -llzo2
Cflags: -I${includedir}
@@ -0,0 +1,124 @@
Index: gnutls-1.6.0/libextra/gnutls_openssl.c
===================================================================
--- gnutls-1.6.0.orig/libextra/gnutls_openssl.c 2006-08-13 22:34:09.000000000 +0200
+++ gnutls-1.6.0/libextra/gnutls_openssl.c 2006-12-12 15:07:59.002227000 +0100
@@ -256,12 +256,17 @@
ssl->rfd = (gnutls_transport_ptr_t) - 1;
ssl->wfd = (gnutls_transport_ptr_t) - 1;
+ ssl->ssl_peek_buffer = NULL;
+ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0;
+
return ssl;
}
void
SSL_free (SSL * ssl)
{
+ if (ssl->ssl_peek_buffer)
+ free(ssl->ssl_peek_buffer);
gnutls_certificate_free_credentials (ssl->gnutls_cred);
gnutls_deinit (ssl->gnutls_state);
free (ssl);
@@ -285,6 +290,7 @@
SSL_set_fd (SSL * ssl, int fd)
{
gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd));
+ ssl->rfd = ssl->wfd = fd;
return 1;
}
@@ -310,6 +316,17 @@
return 1;
}
+int SSL_get_rfd(SSL *ssl)
+{
+ return ssl->rfd;
+}
+
+int SSL_get_wfd(SSL *ssl)
+{
+ return ssl->wfd;
+}
+
+
void
SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio)
{
@@ -325,6 +342,8 @@
int
SSL_pending (SSL * ssl)
{
+ if (ssl->ssl_peek_avail)
+ return ssl->ssl_peek_avail;
return gnutls_record_check_pending (ssl->gnutls_state);
}
@@ -480,11 +499,50 @@
return 1;
}
+int SSL_peek(SSL *ssl, void *buf, int len)
+{
+ if (len > ssl->ssl_peek_buffer_size) {
+ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len);
+ ssl->ssl_peek_buffer_size = len;
+ }
+
+ if (ssl->ssl_peek_avail == 0) {
+
+ int ret;
+
+ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len);
+ ssl->last_error = ret;
+
+ if (ret > 0)
+ ssl->ssl_peek_avail += ret;
+ }
+
+ if (len > ssl->ssl_peek_avail)
+ len = ssl->ssl_peek_avail;
+
+ memcpy (buf, ssl->ssl_peek_buffer, len);
+
+ return len;
+}
+
int
SSL_read (SSL * ssl, void *buf, int len)
{
int ret;
+ if (ssl->ssl_peek_avail) {
+ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail;
+
+ memcpy (buf, ssl->ssl_peek_buffer, n);
+
+ if (ssl->ssl_peek_avail > n)
+ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n);
+
+ ssl->ssl_peek_avail -= n;
+
+ return n;
+ }
+
ret = gnutls_record_recv (ssl->gnutls_state, buf, len);
ssl->last_error = ret;
Index: gnutls-1.6.0/includes/gnutls/openssl.h
===================================================================
--- gnutls-1.6.0.orig/libextra/includes/gnutls/openssl.h 2006-03-08 11:44:58.000000000 +0100
+++ gnutls-1.6.0/libextra/includes/gnutls/openssl.h 2006-12-12 15:07:26.032227000 +0100
@@ -164,6 +164,11 @@
gnutls_transport_ptr_t rfd;
gnutls_transport_ptr_t wfd;
+
+ char *ssl_peek_buffer;
+ size_t ssl_peek_buffer_size;
+ size_t ssl_peek_avail;
+
};
#define rbio gnutls_state
@@ -0,0 +1,16 @@
The version of texinfo in Debian Sarge does not understand the @euro{} command.
This patch replaces the @euro{} command with the word "euro".
--- gnutls-1.3.5/doc/gnutls.texi.orig 2006-04-26 08:06:40.918268000 +0930
+++ gnutls-1.3.5/doc/gnutls.texi 2006-04-26 08:06:52.446515440 +0930
@@ -11,8 +11,8 @@
long as it is difficult enough to generate two different messages with
the same hash algorithm output. In that case the same signature could
be used as a proof for both messages. Nobody wants to sign an innocent
-message of donating 1 @euro{} to Greenpeace and find out that he
-donated 1.000.000 @euro{} to Bad Inc.
+message of donating 1 euro to Greenpeace and find out that he
+donated 1.000.000 euro to Bad Inc.
For a hash algorithm to be called cryptographic the following three
requirements must hold
+44
View File
@@ -0,0 +1,44 @@
DESCRIPTION = "GNU Transport Layer Security Library"
HOMEPAGE = "http://www.gnu.org/software/gnutls/"
BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
DEPENDS = "zlib lzo gettext libtasn1 libgcrypt (>= 1.4.2)"
LICENSE = "GPLv3+ & LGPLv2.1+"
LICENSE_${PN} = "LGPLv2.1+"
LICENSE_${PN}-xx = "GPLv2.1+"
LICENSE_${PN}-bin = "GPLv3+"
LICENSE_${PN}-extra = "GPLv3+"
LICENSE_${PN}-openssl = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://lib/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://libextra/COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2"
inherit autotools binconfig pkgconfig
EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \
--with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \
--with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \
--with-libz-prefix=${STAGING_DIR_HOST}${prefix} --with-lzo --disable-guile"
do_configure_prepend() {
for dir in . lib libextra; do
rm ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4
done
}
PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin ${PN}-xx"
FILES_${PN} = "${libdir}/libgnutls.so.*"
FILES_${PN}-bin = "${bindir}/gnutls-serv \
${bindir}/gnutls-cli \
${bindir}/srptool \
${bindir}/psktool \
${bindir}/certtool \
${bindir}/gnutls-srpcrypt"
FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*"
@@ -0,0 +1,7 @@
require gnutls.inc
PR = "r0"
SRC_URI += "file://gnutls-openssl.patch \
file://gnutls-texinfo-euro.patch \
file://configure-fix.patch"
@@ -0,0 +1,21 @@
DESCRIPTION = "Library for ASN.1 and DER manipulation"
HOMEPAGE = "http://www.gnu.org/software/libtasn1/"
LICENSE = "GPLv3+ & LGPLv2.1+"
LICENSE_${PN}-bin = "GPLv3+"
LICENSE_${PN} = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351"
RREPLACES_${PN}-bin = "libtasn1 (<< 2.7)"
PR = "r0"
SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/libtasn1/libtasn1-${PV}.tar.gz"
inherit autotools binconfig lib_package
AUTOTOOLS_STAGE_PKGCONFIG = "1"
BBCLASSEXTEND = "native"
@@ -0,0 +1,38 @@
From 1.2.0, gpgme will check if gpgconf & g13(from 1.3.0) exist, and cause
configure failure if not founding them in cross-compile environment. We can
add the gnupg-native to get them, but still have some issues:
1. need add new package: libksba, update libassuan(not in sato), and extend
native support in some other packages(libgcrypt, libgpg-error, pth...)
2. Even we have gnupg, the g13 only exist in development branch, so that we
still have the g13 check failure in configure.
I have searched the compile log, and found gpgconf/g13 are not used. So use a
simple method here, throw a warning mesg rather than an error here just like in
non-cross-compile environment.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Index: gpgme-1.3.0/configure.ac
===================================================================
--- gpgme-1.3.0.orig/configure.ac 2010-07-21 09:38:09.000000000 +0800
+++ gpgme-1.3.0/configure.ac 2010-07-21 09:39:19.000000000 +0800
@@ -574,7 +574,7 @@
*** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it
***])
else
- AC_MSG_ERROR([
+ AC_MSG_WARN([
***
*** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH
***])
@@ -670,7 +670,7 @@
*** Could not find g13, install g13 or use --with-g13=PATH to enable it
***])
else
- AC_MSG_ERROR([
+ AC_MSG_WARN([
***
*** Can not determine path to g13 when cross-compiling, use --with-g13=PATH
***])
+25
View File
@@ -0,0 +1,25 @@
DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management"
HOMEPAGE = "http://www.gnupg.org/gpgme.html"
BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
LICENSE = "GPLv2+ & LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
file://src/gpgme.h;endline=23;md5=2775a99d3dd524c4f848ff1c59093038 \
file://src/engine.h;endline=22;md5=e96acfaab1cff82dd8fbefddd2f5c436"
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
file://disable_gpgconf_check.patch;patch=1;pnum=1"
DEPENDS = "libgpg-error libassuan pth"
PR = "r0"
EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \
--with-gpg=${bindir}/gpg --without-gpgsm"
inherit autotools binconfig
PACKAGES =+ "${PN}-pth ${PN}-pthread"
FILES_${PN}-pth = "${libdir}/libgpgme-pth.so.*"
FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
FILES_${PN} = "${libdir}/libgpgme.so.*"
FILES_${PN}-dev += "${bindir}/gpgme-config"
+58
View File
@@ -0,0 +1,58 @@
#! /bin/sh
#
# hal Start the Daemon that stores device informations
# for the Hardware abstraction layer
#
# Written by Martin Waitz based on skeleton code
# written by Miquel van Smoorenburg <miquels@cistron.nl>.
# Modified for Debian
# by Ian Murdock <imurdock@gnu.ai.mit.edu>.
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/hald
PIDDIR=/var/run/hald
PIDFILE=$PIDDIR/hald.pid
NAME=hald
DAEMONUSER=haldaemon
DESC="Hardware abstraction layer"
test -x $DAEMON || exit 0
set -e
do_start() {
if [ ! -d $PIDDIR ]; then
mkdir -p $PIDDIR
chown $DAEMONUSER:$DAEMONUSER $PIDDIR
fi
echo "Starting $DESC" "$NAME"
start-stop-daemon --start --pidfile $PIDFILE \
--exec $DAEMON -- $DAEMON_OPTS
}
do_stop() {
echo "Stopping $DESC" "$NAME"
start-stop-daemon --stop --quiet --pidfile $PIDFILE \
--exec $DAEMON
}
case "$1" in
start)
do_start
;;
stop)
do_stop
;;
restart|force-reload)
do_stop
sleep 5
do_start
;;
*)
echo "Usage: $0 {start|stop|restart|force-reload}" >&2
exit 1
;;
esac
exit 0
@@ -0,0 +1,11 @@
--- hal-0.5.9/configure.in~ 2007-04-03 05:36:44.000000000 +0100
+++ hal-0.5.9/configure.in 2007-04-03 10:29:39.000000000 +0100
@@ -6,7 +6,7 @@
# Patches for that is welcome.
#
-AC_PREREQ(2.59c)
+AC_PREREQ(2.59)
AC_INIT(hal, 0.5.9, david@fubar.dk)
AM_INIT_AUTOMAKE(hal, 0.5.9)
AM_CONFIG_HEADER(config.h)
@@ -0,0 +1,29 @@
diff --git a/configure.in b/configure.in
index e76ff51..5e8cc21 100644
--- a/configure.in
+++ b/configure.in
@@ -983,6 +983,11 @@ AC_ARG_WITH([linux-input-header],
[Use an given Linux input.h rather than that installed on the system (<linux/input.h>)]))
if test "x$with_linux_input_header" != "x"; then
AC_DEFINE_UNQUOTED(HAL_LINUX_INPUT_HEADER_H, "$with_linux_input_header", [If set, the header to use instead of <linux/input.h>])
+ LINUX_INPUT_H=$with_linux_input_header
+ AC_SUBST(LINUX_INPUT_H)
+else
+ LINUX_INPUT_H=/usr/include/linux/input.h
+ AC_SUBST(LINUX_INPUT_H)
fi
dnl
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ae03edd..7d1cbab 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -79,7 +79,7 @@ endif
if BUILD_KEYMAPS
if HAVE_GPERF
-hal-setup-keymap-keys.txt: /usr/include/linux/input.h
+hal-setup-keymap-keys.txt: @LINUX_INPUT_H@
awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@
hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt
@@ -0,0 +1,24 @@
--- hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c.old 2007-08-03 17:24:12.000000000 +0100
+++ hal-0.5.9.1/hald/linux/probing/linux_dvd_rw_utils.c 2007-08-03 17:25:06.000000000 +0100
@@ -58,6 +58,10 @@
#include "linux_dvd_rw_utils.h"
+#if defined(SG_FLAG_UNUSED_LUN_INHIBIT)
+# define SG_FLAG_LUN_INHIBIT SG_FLAG_UNUSED_LUN_INHIBIT
+#endif
+
typedef enum {
NONE = CGC_DATA_NONE, // 3
READ = CGC_DATA_READ, // 2
@@ -153,8 +153,8 @@
errno = EIO;
ret = -1;
if (cmd->sg_io.masked_status & CHECK_CONDITION) {
- CREAM_ON_ERRNO (cmd->sg_io.sbp);
- ret = ERRCODE (cmd->sg_io.sbp);
+ CREAM_ON_ERRNO ((char*)cmd->sg_io.sbp);
+ ret = ERRCODE ((char*)cmd->sg_io.sbp);
if (ret == 0)
ret = -1;
}
+22
View File
@@ -0,0 +1,22 @@
DESCRIPTION = "Hardware Abstraction Layer device information"
HOMEPAGE = "http://hal.freedesktop.org/"
BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal"
SECTION = "unknown"
LICENSE = "GPLv2 | AFL"
LIC_FILES_CHKSUM = "file://COPYING;md5=ae484909bad0cf11c8e2071cee6bd4dc"
SRC_URI = "http://hal.freedesktop.org/releases/${PN}-${PV}.tar.gz"
inherit autotools pkgconfig
EXTRA_OECONF = "--disable-recall --disable-video"
do_configure() {
gnu-configize
libtoolize --force
oe_runconf
}
PACKAGE_ARCH = "all"
FILES_${PN} += "${datadir}/hal/"
@@ -0,0 +1 @@
require hal-info.inc
+9
View File
@@ -0,0 +1,9 @@
require hal-info.inc
PV = "${SRCDATE}+git"
PR = "r0"
SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git;rev=HAL_INFO_20091130"
S = "${WORKDIR}/git"
DEFAULT_PREFERENCE = "-1"
+85
View File
@@ -0,0 +1,85 @@
DESCRIPTION = "Hardware Abstraction Layer"
HOMEPAGE = "http://freedesktop.org/Software/hal"
BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal"
SECTION = "unknown"
LICENSE = "GPLv2+ | AFL"
LIC_FILES_CHKSUM = "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31"
DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native"
RDEPENDS += "udev hal-info"
SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \
file://20hal"
inherit autotools pkgconfig
LEAD_SONAME = "libhal.so"
# machines with pci and acpi get a machine dependant hal
EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
--with-expat=${STAGING_LIBDIR}/.. \
--with-dbus-sys=${sysconfdir}/dbus-1/system.d \
--with-hotplug=${sysconfdir}/hotplug.d \
--disable-docbook-docs \
--disable-policy-kit \
--disable-pmu \
--disable-pnp-ids \
${@base_contains('COMBINED_FEATURES', 'pci', '--enable-pci --enable-pci-ids', '--disable-pci --disable-pci-ids',d)} \
${@base_contains('MACHINE_FEATURES', 'acpi', '--enable-acpi', '--disable-acpi',d)} \
"
MY_ARCH := "${PACKAGE_ARCH}"
PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
PACKAGE_ARCH_emenlow := "${PACKAGE_ARCH}"
do_install_append() {
install -d ${D}/etc/dbus-1/event.d
install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d
}
# At the time the postinst runs, dbus might not be setup so only restart if running
pkg_postinst_hal () {
# can't do this offline
if [ "x$D" != "x" ]; then
exit 1
fi
grep haldaemon /etc/group || addgroup haldaemon
grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
# add volatile after new user/grp are created
echo "d root root 0700 /var/run/hald none" > /etc/default/volatiles/99_hal
echo "d haldaemon haldaemon 0755 /var/cache/hald none" >> /etc/default/volatiles/99_hal
/etc/init.d/populate-volatile.sh update
DBUSPID=`pidof dbus-daemon`
if [ "x$DBUSPID" != "x" ]; then
/etc/init.d/dbus-1 force-reload
fi
}
pkg_postrm_hal () {
deluser haldaemon || true
delgroup haldaemon || true
}
FILES_${PN} = "${sysconfdir} \
${bindir}/lshal \
${bindir}/hal-find-by-capability \
${bindir}/hal-find-by-property \
${bindir}/hal-device \
${bindir}/hal-get-property \
${bindir}/hal-set-property \
${bindir}/hal-lock \
${bindir}/hal-is-caller-locked-out \
${sbindir} \
${libdir}/libhal.so.* \
${libdir}/libhal-storage.so.* \
${libdir}/hal \
${libexecdir} \
${datadir}/hal/fdi \
${datadir}/hal/scripts"
@@ -0,0 +1,60 @@
The AC_LANG sections upset libtool 2.2.2, as do .cpp files without a call
to AC_PROG_CXX. Easiest solution is to patch this out for now.
RP - 14/4/08
Index: hal-0.5.9.1/configure.in
===================================================================
--- hal-0.5.9.1.orig/configure.in 2008-04-14 22:41:49.000000000 +0100
+++ hal-0.5.9.1/configure.in 2008-04-14 22:43:13.000000000 +0100
@@ -345,32 +345,8 @@
fi
dnl Check for libsmbios
-AC_LANG_PUSH([C++])
-AC_CHECK_LIB(smbios, SMBIOSFreeMemory, LIB_SMBIOS=yes , LIB_SMBIOS=no )
-AC_LANG_POP([C++])
-if test "$LIB_SMBIOS" = "yes" ; then
- AC_MSG_CHECKING([for libsmbios >= 0.13.4])
- AC_TRY_RUN(
- #include <smbios/version.h>
- int main ()
- {
- int major ;
- int minor ;
- int micro ;
-
- if ( sscanf( LIBSMBIOS_RELEASE_VERSION , "%d.%d.%d", &major, &minor, &micro ) == 3 ) {
- if ((major == 0 && minor == 13 && micro >= 4) ||
- (major >= 0 && minor > 13)) {
- return 0;
- }
- }
- return 1;
- } , [USE_SMBIOS=yes; AC_MSG_RESULT(yes); AM_CONDITIONAL(HAVE_SMBIOS,true)],
- [USE_SMBIOS=no; AC_MSG_RESULT(failed); AM_CONDITIONAL(HAVE_SMBIOS,false)])
-else
- USE_SMBIOS=no
- AM_CONDITIONAL(HAVE_SMBIOS,false)
-fi
+USE_SMBIOS=no
+AM_CONDITIONAL(HAVE_SMBIOS,false)
AC_ARG_WITH([libpci],
[AS_HELP_STRING([--without-libpci],
Index: hal-0.5.9.1/hald/linux/addons/Makefile.am
===================================================================
--- hal-0.5.9.1.orig/hald/linux/addons/Makefile.am 2008-04-14 22:45:18.000000000 +0100
+++ hal-0.5.9.1/hald/linux/addons/Makefile.am 2008-04-14 22:46:05.000000000 +0100
@@ -60,11 +60,6 @@
hald_addon_usb_csr_LDADD = $(top_builddir)/libhal/libhal.la -lusb @GLIB_LIBS@
endif
-if BUILD_DELL
-libexec_PROGRAMS += hald-addon-dell-backlight
-hald_addon_dell_backlight_SOURCES = addon-dell-backlight.cpp ../../logger.c
-hald_addon_dell_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lsmbios @GLIB_LIBS@
-endif
endif
hald_addon_acpi_SOURCES = addon-acpi.c ../../logger.c ../../util_helper.c
+14
View File
@@ -0,0 +1,14 @@
require hal.inc
PR = "r2"
EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"
PACKAGES =+ "libhal libhal-storage"
FILES_libhal = "${libdir}/libhal.so.*"
FILES_libhal-storage = "${libdir}/libhal-storage.so.*"
FILES_${PN} =+ "${bindir}/hal-disable-polling \
${bindir}/hal-setup-keymap"
+12
View File
@@ -0,0 +1,12 @@
require hal.inc
PV = "0.5.9.1+git${SRCDATE}"
PR = "r7"
SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
file://20hal \
file://99_hal"
S = "${WORKDIR}/git"
DEFAULT_PREFERENCE = "-1"
@@ -0,0 +1,13 @@
Index: source/layoutex/ParagraphLayout.cpp
===================================================================
--- source.orig/layoutex/ParagraphLayout.cpp 2009-06-30 11:48:47.000000000 +0100
+++ source/layoutex/ParagraphLayout.cpp 2009-06-30 11:49:06.000000000 +0100
@@ -798,7 +798,7 @@
return nullLanguageCode;
}
-#elif
+#else
// TODO - dummy implementation for right now...
le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)
@@ -0,0 +1,47 @@
Setting LD_LIBRARY_PATH is a really bad idea when cross compiling. Simplest way
to disable this is to rename the variable as per the patch below, then its
harmless. This is a hack.
RP 10/6/2010
Index: source/config/Makefile.inc.in
===================================================================
--- source.orig/config/Makefile.inc.in 2010-06-10 21:49:19.000000000 +0100
+++ source/config/Makefile.inc.in 2010-06-10 21:49:46.000000000 +0100
@@ -126,7 +126,7 @@
##################################################################
# Environment variable to set a runtime search path
# (Overridden when necessary in -mh files)
-LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
+LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH2
# Versioned target for a shared library
FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
Index: source/icudefs.mk.in
===================================================================
--- source.orig/icudefs.mk.in 2010-06-10 21:51:03.000000000 +0100
+++ source/icudefs.mk.in 2010-06-10 21:51:09.000000000 +0100
@@ -150,7 +150,7 @@
SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
# Environment variable to set a runtime search path
-LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
+LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH2
# Versioned target for a shared library.
FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
Index: source/tools/genrb/gendtjar.pl
===================================================================
--- source.orig/tools/genrb/gendtjar.pl 2010-06-10 21:51:36.000000000 +0100
+++ source/tools/genrb/gendtjar.pl 2010-06-10 21:52:03.000000000 +0100
@@ -68,8 +68,8 @@
$icuLibDir = abs_path($icuBinDir."/../lib");
$path .=":$icuBinDir:$icuLibDir";
- $libpath = $ENV{'LD_LIBRARY_PATH'}.":$icuLibDir";
- $ENV{'LD_LIBRARY_PATH'} = $libpath;
+ $libpath = $ENV{'LD_LIBRARY_PATH2'}.":$icuLibDir";
+ $ENV{'LD_LIBRARY_PATH2'} = $libpath;
#print ("##### LD_LIBRARY_PATH = $ENV{'LD_LIBRARY_PATH'}\n");
@@ -0,0 +1,67 @@
---
tools/genccode/Makefile.in | 2 +-
tools/gencmn/Makefile.in | 2 +-
tools/genrb/Makefile.in | 2 +-
tools/pkgdata/Makefile.in | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- source.orig/tools/genccode/Makefile.in
+++ source/tools/genccode/Makefile.in
@@ -76,11 +76,11 @@ check-local: all-local
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
$(TARGET) : $(OBJECTS)
- $(LINK.c) $(OUTOPT)$@ $^ $(LIBS)
+ $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
%.$(SECTION): $(srcdir)/%.$(SECTION).in
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--- source.orig/tools/gencmn/Makefile.in
+++ source/tools/gencmn/Makefile.in
@@ -76,11 +76,11 @@ check-local: all-local
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
$(TARGET) : $(OBJECTS)
- $(LINK.c) $(OUTOPT)$@ $^ $(LIBS)
+ $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
%.$(SECTION): $(srcdir)/%.$(SECTION).in
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--- source.orig/tools/genrb/Makefile.in
+++ source/tools/genrb/Makefile.in
@@ -84,11 +84,11 @@ Makefile: $(srcdir)/Makefile.in $(top_b
$(TARGET) : $(OBJECTS)
$(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
$(DERB) : $(DERB_OBJ)
- $(LINK.c) $(OUTOPT)$@ $^ $(LIBS)
+ $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
# This line is needed to serialize builds when the gmake -j option is used.
$(TARGET_STUB_NAME).$(SECTION): $(DERB_STUB_NAME).$(SECTION)
--- source.orig/tools/pkgdata/Makefile.in
+++ source/tools/pkgdata/Makefile.in
@@ -81,11 +81,11 @@ check-local: all-local
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
$(TARGET) : $(OBJECTS)
- $(LINK.c) $(OUTOPT)$@ $^ $(LIBS)
+ $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
%.$(SECTION): $(srcdir)/%.$(SECTION).in
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+55
View File
@@ -0,0 +1,55 @@
DESCRIPTION = "The International Component for Unicode (ICU) is a mature, portable set of C/C++ and Java libraries for Unicode support, software internationalization (I18N) and globalization (G11N), giving applications the same results on all platforms."
HOMEPAGE = "http://www-01.ibm.com/software/globalization/icu/index.jsp"
BASE_SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
file://gccfix.patch;apply=yes \
file://use-g++-for-linking.patch;apply=yes"
SRC_URI = "${BASE_SRC_URI} \
file://noldlibpath.patch;apply=yes"
SRC_URI_virtclass-native = "${BASE_SRC_URI}"
LICENSE = "ICU"
LIC_FILES_CHKSUM = "file://../license.html;md5=5c94767cedb5d6987c902ac850ded2c6"
DEPENDS = "icu-native"
DEPENDS_virtclass-native = ""
S = "${WORKDIR}/icu/source"
PARALLEL_MAKE = ""
FULL_OPTIMIZATION_arm = "-Os"
inherit autotools pkgconfig binconfig
do_configure() {
libtoolize --force
gnu-configize --force
oe_runconf
if [ "${PN}" != "icu-native" ]; then
# In the non-native case we need to make substitutions to use
# the native versions of the tools
for i in */Makefile* */*.inc */*/Makefile* */*/*.inc */*/*.inc.in ; do
sed -i -e 's:$(INVOKE) $(BINDIR)/:$(INVOKE) :g' $i
sed -i -e 's:$(BINDIR)/::g' $i
done
fi
}
do_compile() {
oe_runmake 'CXX=${CXX}'
}
do_install_append() {
chmod +x ${D}${libdir}/lib*
}
PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"
FILES_libicudata = "${libdir}/libicudata.so.*"
FILES_libicuuc = "${libdir}/libicuuc.so.*"
FILES_libicui18n = "${libdir}/libicui18n.so.*"
FILES_libicule = "${libdir}/libicule.so.*"
FILES_libiculx = "${libdir}/libiculx.so.*"
FILES_libicutu = "${libdir}/libicutu.so.*"
FILES_libicuio = "${libdir}/libicuio.so.*"
BBCLASSEXTEND = "native"
+3
View File
@@ -0,0 +1,3 @@
require icu-3.6.inc
PR = "r6"
@@ -0,0 +1,14 @@
SECTION = "libs"
DESCRIPTION = "ISO language, territory, currency, script codes and their translations"
PRIORITY = "optional"
LICENSE = "LGPL"
SECTION = "libs"
PACKAGE_ARCH = "all"
SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.gz"
inherit autotools
FILES_${PN}-dev="${datadir}/pkgconfig/iso-codes.pc"
FILES_${PN}="${datadir}/xml/iso-codes/ \
${datadir}/iso-codes/"
@@ -0,0 +1,20 @@
jskwgen should be built by BUILD_CC in cross environment
7/23/2010 - created by Qing He <qing.he@intel.com>
diff -uNr js.orig//src/Makefile.ref js/src/Makefile.ref
--- js.orig//src/Makefile.ref 2009-02-25 21:24:29.000000000 +0800
+++ js/src/Makefile.ref 2010-07-23 13:26:51.000000000 +0800
@@ -303,10 +303,10 @@
$(OBJDIR)/jskwgen.o: jskwgen.c jskeyword.tbl
@$(MAKE_OBJDIR)
- $(CC) -o $@ -c $(CFLAGS) $<
+ $(BUILD_CC) -o $@ -c $(BUILD_CFLAGS) $<
$(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX): $(OBJDIR)/jskwgen.$(OBJ_SUFFIX)
- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^
+ $(BUILD_CC) -o $@ $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^
endif
@@ -0,0 +1,28 @@
AC_INIT
AC_CHECK_SIZEOF([char])
AC_CHECK_SIZEOF([short])
AC_CHECK_SIZEOF([int])
AC_CHECK_SIZEOF([int64_t])
AC_CHECK_SIZEOF([long])
AC_CHECK_SIZEOF([long long])
AC_CHECK_SIZEOF([int *])
AC_CHECK_SIZEOF([float])
AC_CHECK_SIZEOF([double])
AC_CHECK_ALIGNOF([char])
AC_CHECK_ALIGNOF([short])
AC_CHECK_ALIGNOF([int])
AC_CHECK_ALIGNOF([int64_t])
AC_CHECK_ALIGNOF([long])
AC_CHECK_ALIGNOF([long long])
AC_CHECK_ALIGNOF([int *])
AC_CHECK_ALIGNOF([float])
AC_CHECK_ALIGNOF([double])
AC_C_BIGENDIAN
AC_TYPE_LONG_LONG_INT
AC_CONFIG_HEADER([conf.h])
AC_OUTPUT
+74
View File
@@ -0,0 +1,74 @@
#ifndef js_cpucfg___
#define js_cpucfg___
/* AUTOMATICALLY GENERATED - DO NOT EDIT */
#include "../conf.h"
#ifdef WORDS_BIGENDIAN
# undef IS_LITTLE_ENDIAN
# define IS_BIG_ENDIAN 1
#else
# define IS_LITTLE_ENDIAN 1
# undef IS_BIG_ENDIAN
#endif
#define __I_LOG2(n) ( \
((n) == 1)? 0: \
((n) == 2)? 1: \
((n) == 4)? 2: \
((n) == 8)? 3: \
((n) == 16)? 4: \
((n) == 32)? 5: \
((n) == 64)? 6: \
((n) == 128)? 7: \
-1)
#define JS_BYTES_PER_BYTE SIZEOF_CHAR
#define JS_BYTES_PER_SHORT SIZEOF_SHORT
#define JS_BYTES_PER_INT SIZEOF_INT
#define JS_BYTES_PER_INT64 SIZEOF_INT64_T
#define JS_BYTES_PER_LONG SIZEOF_LONG
#define JS_BYTES_PER_FLOAT SIZEOF_FLOAT
#define JS_BYTES_PER_DOUBLE SIZEOF_DOUBLE
#define JS_BYTES_PER_WORD SIZEOF_LONG
#define JS_BYTES_PER_DWORD SIZEOF_LONG_LONG
#define JS_BITS_PER_BYTE 8L
#define JS_BITS_PER_SHORT (JS_BITS_PER_BYTE * JS_BYTES_PER_SHORT)
#define JS_BITS_PER_INT (JS_BITS_PER_BYTE * JS_BYTES_PER_INT)
#define JS_BITS_PER_INT64 (JS_BITS_PER_BYTE * JS_BYTES_PER_INT64)
#define JS_BITS_PER_LONG (JS_BITS_PER_BYTE * JS_BYTES_PER_LONG)
#define JS_BITS_PER_FLOAT (JS_BITS_PER_BYTE * JS_BYTES_PER_GLOAT)
#define JS_BITS_PER_DOUBLE (JS_BITS_PER_BYTE * JS_BYTES_PER_DOUBLE)
#define JS_BITS_PER_WORD (JS_BITS_PER_BYTE * JS_BYTES_PER_WORD)
#define JS_BITS_PER_BYTE_LOG2 __I_LOG2(JS_BITS_PER_BYTE)
#define JS_BITS_PER_SHORT_LOG2 __I_LOG2(JS_BITS_PER_BYTE)
#define JS_BITS_PER_INT_LOG2 __I_LOG2(JS_BITS_PER_BYTE)
#define JS_BITS_PER_INT64_LOG2 __I_LOG2(JS_BITS_PER_BYTE)
#define JS_BITS_PER_LONG_LOG2 __I_LOG2(JS_BITS_PER_BYTE)
#define JS_BITS_PER_FLOAT_LOG2 __I_LOG2(JS_BITS_PER_BYTE)
#define JS_BITS_PER_DOUBLE_LOG2 __I_LOG2(JS_BITS_PER_BYTE)
#define JS_BITS_PER_WORD_LOG2 __I_LOG2(JS_BITS_PER_BYTE)
#define JS_ALIGN_OF_SHORT ALIGNOF_SHORT
#define JS_ALIGN_OF_INT ALIGNOF_INT
#define JS_ALIGN_OF_LONG ALIGNOF_LONG
#define JS_ALIGN_OF_INT64 ALIGNOF_INT64_T
#define JS_ALIGN_OF_FLOAT ALIGNOF_FLOAT
#define JS_ALIGN_OF_DOUBLE ALIGNOF_DOUBLE
#define JS_ALIGN_OF_POINTER ALIGNOF_INT_P
#define JS_ALIGN_OF_WORD ALIGNOF_LONG
#define JS_BYTES_PER_WORD_LOG2 __I_LOG2(JS_BYTES_PER_WORD)
#define JS_BYTES_PER_DWORD_LOG2 __I_LOG2(JS_BYTES_PER_DWORDS)
#define JS_WORDS_PER_DWORD_LOG2 __I_LOG2(JS_BYTES_PER_DWORDS / JS_BYTES_PER_WORD)
#define JS_STACK_GROWTH_DIRECTION (-1)
#ifdef HAVE_LONG_LONG_INT
# define JS_HAVE_LONG_LONG
#endif
#endif /* js_cpucfg___ */
@@ -0,0 +1,13 @@
Index: src/config/Linux_All.mk
===================================================================
--- src.orig/config/Linux_All.mk 2005-05-10 19:53:44.000000000 +0000
+++ src/config/Linux_All.mk 2007-06-18 17:20:05.000000000 +0000
@@ -47,7 +47,7 @@
OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
RANLIB = echo
-MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
+MKSHLIB = $(CC) -shared $(XMKSHLIBOPTS)
#.c.o:
# $(CC) -c -MD $*.d $(CFLAGS) $<
@@ -0,0 +1,24 @@
Mips needs -fPIC to compile properly. These tests are broken anyway as they test
the build system architecture, not the target. This is a hack.
RP 10/6/2010
Index: src/config/Linux_All.mk
===================================================================
--- src.orig/config/Linux_All.mk 2010-06-10 22:09:43.000000000 +0100
+++ src/config/Linux_All.mk 2010-06-10 22:09:55.000000000 +0100
@@ -90,14 +90,10 @@
# Use the editline library to provide line-editing support.
JS_EDITLINE = 1
-ifeq ($(CPU_ARCH),x86_64)
# Use VA_COPY() standard macro on x86-64
# FIXME: better use it everywhere
OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
-endif
-ifeq ($(CPU_ARCH),x86_64)
# We need PIC code for shared libraries
# FIXME: better patch rules.mk & fdlibm/Makefile*
OS_CFLAGS += -DPIC -fPIC
-endif
@@ -0,0 +1,47 @@
DESCRIPTION = "Spidermonkey: a javascript engine written in C"
HOMEPAGE = "http://www.mozilla.org/js/spidermonkey/"
SECTION = "libs"
# the package is licensed under either of the following
LICENSE = "MPL1.1 | GPLv2+ | LGPLv2.1+"
LIC_FILES_CHKSUM = "file://jsapi.c;beginline=4;endline=39;md5=347c6bbf4fb4547de1fa5ad830030063"
PR = "r1"
SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz \
file://link_with_gcc.patch \
file://usepic.patch \
file://buildcc.patch;striplevel=2 \
file://jsautocfg.h \
file://configure.ac"
S = "${WORKDIR}/js/src"
# use local autoconf script to generate a usable jsautocfg.h
# don't bother with automake
inherit autotools
do_configure_prepend() {
cp -f ${WORKDIR}/configure.ac ${S}
cp -f ${WORKDIR}/jsautocfg.h ${S}
}
EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'XCFLAGS=${CFLAGS}' 'XLDFLAGS=${LDFLAGS} -Wl,-soname=libjs' \
'BUILD_CC=${BUILD_CC}' 'BUILD_CFLAGS=${BUILD_CFLAGS}' 'BUILD_LDFLAGS=${BUILD_LDFLAGS}'"
PARALLEL_MAKE = ""
do_compile() {
oe_runmake -f Makefile.ref JS_EDITLINE=1 PREBUILT_CPUCFG=1 BUILD_OPT=1
}
do_install() {
install -d ${D}${libdir}
install -d ${D}${includedir}
install -d ${D}${includedir}/js
oe_libinstall -so -C Linux_All_OPT.OBJ libjs ${D}${libdir}
install -m 0644 ${S}/*.h ${D}${includedir}/js
}
FILES_${PN} = "${libdir}/lib*.so"
FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a"
@@ -0,0 +1,15 @@
DESCRIPTION = "IPC library used by GnuPG and GPGME"
HOMEPAGE = "http://www.gnupg.org/related_software/libassuan/"
BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
LICENSE = "GPLv3 & LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://src/assuan.h;endline=20;md5=8a6f091b9d114f0e06aa91cb3460154c \
file://src/assuan-defs.h;endline=20;md5=c51ca5e56b000d79d500eee7cd8dc2e5"
DEPENDS = "libgpg-error"
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2"
inherit autotools binconfig
+34
View File
@@ -0,0 +1,34 @@
DESCRIPTION = "support for getting/setting POSIX.1e capabilities"
HOMEPAGE = "http://sites.google.com/site/fullycapable/"
# no specific GPL version required
LICENSE = "BSD | GPL"
LIC_FILES_CHKSUM = "file://License;md5=731de803c1ccbcb05a9b3523279c8d7f"
DEPENDS = "libpam attr perl-native"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/${BPN}-${PV}.tar.bz2"
inherit lib_package
do_configure() {
# libcap uses := for compilers, fortunately, it gives us a hint
# on what should be replaced with ?=
sed -e 's,:=,?=,g' -i Make.Rules
sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
}
EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes INDENT= lib=lib"
EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= lib=lib"
do_compile() {
oe_runmake
}
do_install() {
oe_runmake install DESTDIR="${D}"
}
# pam files
FILES_${PN} += "${libdir}/security/*.so"
FILES_${PN}-dbg += "${libdir}/security/.debug/*.so"
@@ -0,0 +1,3 @@
require libcap.inc
PR = "r1"
@@ -0,0 +1,16 @@
DESCRIPTION = "Check Test Framework"
HOMEPAGE = "http://gitorious.org/opensuse/zypper"
PRIORITY = "optional"
SECTION = "devel"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz"
S = "${WORKDIR}/check-${PV}"
inherit autotools pkgconfig
RREPLACES_${PN} = "check (<= 0.9.5)"
@@ -0,0 +1,13 @@
--- opie/configure.in.old 2006-05-19 20:57:30.000000000 +0100
+++ opie/configure.in 2006-05-19 20:57:56.000000000 +0100
@@ -131,8 +131,8 @@
dnl Define the CROCO_LIBS and CROCO_CFLAGS variables. These will be used
dnl by client application to know where to find croco include files and libs.
dnl
-CROCO_LIBS="-L${libdir} -lcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
-CROCO_CFLAGS="-I${includedir}/libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
+CROCO_LIBS='-L${libdir}'" -lcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
+CROCO_CFLAGS='-I${includedir}'"/libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
AC_SUBST(LIBXML2_LIBS)
AC_SUBST(LIBXML2_CFLAGS)
@@ -0,0 +1,16 @@
DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
HOMEPAGE = "http://www.gnome.org/"
BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "LGPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
file://src/cr-rgb.c;endline=25;md5=1df8189094ba7bbed953225785032826 \
file://tests/cr-test-utils.c;endline=21;md5=2382c27934cae1d3792fcb17a6142c4e"
SECTION = "x11/utils"
DEPENDS = "glib-2.0 libxml2 zlib"
PR = "r0"
inherit autotools pkgconfig gnome
SRC_URI_append = " file://croco.patch;apply=yes "
@@ -0,0 +1,14 @@
DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons."
SECTION = "libs"
AUTHOR = "Lennart Poettering <lennart@poettering.net>"
HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://libdaemon/daemon.h;startline=9;endline=21;md5=94c709a83d8251377c322322176d4ffe"
PR = "r0"
SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
inherit autotools pkgconfig
EXTRA_OECONF = "--disable-lynx"
@@ -0,0 +1,15 @@
DESCRIPTION = "an asynchronous event notification library"
HOMEPAGE = "http://www.monkey.org/~provos/libevent/"
SECTION = "libs"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://event.c;endline=26;md5=bc20aa63bf60c36c2d8edb77746f6b7c"
PR = "r0"
SRC_URI = "http://www.monkey.org/~provos/${BPN}-${PV}-stable.tar.gz"
S = "${WORKDIR}/${BPN}-${PV}-stable"
inherit autotools
LEAD_SONAME = "libevent-1.4.so"
@@ -0,0 +1,17 @@
DESCRIPTION = "Library for file management"
HOMEPAGE = "http://pcmanfm.sourceforge.net/"
BUGTRACKER = ""
LICENSE = "GPLv2 & GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://src/fm.h;endline=22;md5=e64555171770a551e3b51cc06fc62f1a \
file://src/base/fm-config.h;endline=23;md5=ad0fc418c3cf041eea35ddb3daf37f17"
SECTION = "x11/libs"
DEPENDS = "gtk+ menu-cache intltool"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz"
inherit autotools pkgconfig
@@ -0,0 +1,11 @@
--- fribidi-0.10.4/configure.in~ 2002-05-19 11:06:48.000000000 +0100
+++ fribidi-0.10.4/configure.in 2004-08-03 17:42:28.000000000 +0100
@@ -50,7 +50,7 @@
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-AC_PROG_RANLIB
+#AC_PROG_RANLIB
AC_PATH_PROG(SED, sed, $PATH)
@@ -0,0 +1,23 @@
DESCRIPTION = "Fribidi library for bidirectional text"
SECTION = "libs"
PRIORITY = "optional"
inherit autotools pkgconfig
PR = "r0"
S = "${WORKDIR}/fribidi-${PV}"
SRC_URI = "${SOURCEFORGE_MIRROR}/fribidi/fribidi-${PV}.tar.bz2 \
file://libtool-update.patch;patch=1"
#PACKAGES += " ${PN}-bin"
FILES_${PN} = "${libdir}/lib*.so.*"
#FILES_${PN}-bin = "${libdir}/uu*"
do_configure_prepend () {
# this version of libtool is old - we have to nobble this file to get it to litoolize
rm ltconfig
rm aclocal.m4
rm acinclude.m4
}
@@ -0,0 +1,49 @@
Index: libgcrypt-1.2.4/configure.ac
===================================================================
--- libgcrypt-1.2.4.orig/configure.ac 2008-03-19 22:14:50.000000000 +0000
+++ libgcrypt-1.2.4/configure.ac 2008-03-19 22:14:58.000000000 +0000
@@ -807,6 +807,7 @@
doc/Makefile
src/Makefile
src/gcrypt.h
+src/libgcrypt.pc
src/libgcrypt-config
tests/Makefile
w32-dll/Makefile
Index: libgcrypt-1.2.4/src/libgcrypt.pc.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ libgcrypt-1.2.4/src/libgcrypt.pc.in 2008-03-19 22:14:58.000000000 +0000
@@ -0,0 +1,32 @@
+# Process this file with autoconf to produce a pkg-config metadata file.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+# Author: Simon Josefsson
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+# API info
+api_version=@LIBGCRYPT_CONFIG_API_VERSION@
+
+# Misc information.
+symmetric_ciphers=@LIBGCRYPT_CIPHERS@
+asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@
+digests=@LIBGCRYPT_DIGESTS@
+
+Name: libgcrypt
+Description: GNU crypto library
+URL: http://www.gnupg.org
+Version: @VERSION@
+Libs: -L${libdir} -lgcrypt
+Libs.private: -L${libdir} -lgpg-error
+Cflags: -I${includedir}
@@ -0,0 +1,31 @@
DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
HOMEPAGE = "http://directory.fsf.org/project/libgcrypt/"
BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
SECTION = "libs"
PRIORITY = "optional"
# helper program gcryptrnd and getrandom are under GPL, rest LGPL
LICENSE = "GPLv2+ & LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
DEPENDS = "libgpg-error"
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
file://add-pkgconfig-support.patch"
inherit autotools binconfig pkgconfig
EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
# libgcrypt.pc is added locally and thus installed here
do_install_append() {
install -d ${D}/${libdir}/pkgconfig
install -m 0644 ${S}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/
}
ARM_INSTRUCTION_SET = "arm"
# move libgcrypt-config into -dev package
FILES_${PN} = "${libdir}/lib*.so.*"
FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig/*.pc"

Some files were not shown because too many files have changed in this diff Show More