From cd0ed778d5163abc5052c24f3eec60b79ae21945 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Tue, 16 Sep 2008 09:37:27 +0000 Subject: libdmtx: new recipe. close oebug#4446 --- packages/libdmtx/.mtn2git_empty | 0 packages/libdmtx/libdmtx_0.5.2.bb | 14 ++++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 packages/libdmtx/.mtn2git_empty create mode 100644 packages/libdmtx/libdmtx_0.5.2.bb diff --git a/packages/libdmtx/.mtn2git_empty b/packages/libdmtx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libdmtx/libdmtx_0.5.2.bb b/packages/libdmtx/libdmtx_0.5.2.bb new file mode 100644 index 0000000000..0ddcff2d23 --- /dev/null +++ b/packages/libdmtx/libdmtx_0.5.2.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "libdmtx is for reading and writing Data Matrix barcodes" +HOMEPAGE = "http://www.libdmtx.org/" +LICENSE = "GPLv2" +AUTHOR = "Mike Laughton" +SECTION = "libs" +PRIORITY = "optional" + +PR = "r0" + +DEPENDS = "libpng tiff" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libdmtx/libdmtx-${PV}.tar.gz" + +inherit autotools -- cgit v1.2.3 From 785f03cc21bf58582fe916261ce6b998a3534951 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 17 Sep 2008 21:49:38 +0000 Subject: opie-restartapplet2: add 1.2.3 package --- packages/opie-restartapplet2/opie-restartapplet2_1.2.3.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 packages/opie-restartapplet2/opie-restartapplet2_1.2.3.bb diff --git a/packages/opie-restartapplet2/opie-restartapplet2_1.2.3.bb b/packages/opie-restartapplet2/opie-restartapplet2_1.2.3.bb new file mode 100644 index 0000000000..797eb0eaf4 --- /dev/null +++ b/packages/opie-restartapplet2/opie-restartapplet2_1.2.3.bb @@ -0,0 +1,6 @@ +require ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From 7d544328e6bdaa94e0a967197152c2944e9c961f Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 17 Sep 2008 22:52:38 +0000 Subject: mpfr: added version 2.3.2 * can not activate this version yet, because it needs automake-1.10.1 --- packages/mpfr/mpfr-native_2.3.2.bb | 3 +++ packages/mpfr/mpfr_2.3.2.bb | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 packages/mpfr/mpfr-native_2.3.2.bb create mode 100644 packages/mpfr/mpfr_2.3.2.bb diff --git a/packages/mpfr/mpfr-native_2.3.2.bb b/packages/mpfr/mpfr-native_2.3.2.bb new file mode 100644 index 0000000000..dec26d33a8 --- /dev/null +++ b/packages/mpfr/mpfr-native_2.3.2.bb @@ -0,0 +1,3 @@ +require mpfr_${PV}.bb +inherit native +DEPENDS = "gmp-native" diff --git a/packages/mpfr/mpfr_2.3.2.bb b/packages/mpfr/mpfr_2.3.2.bb new file mode 100644 index 0000000000..2d8cc960f7 --- /dev/null +++ b/packages/mpfr/mpfr_2.3.2.bb @@ -0,0 +1,12 @@ +require mpfr.inc + +DEPENDS = "gmp" +PR = "r0" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2" +S = "${WORKDIR}/mpfr-${PV}" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 4b47520ca2997278cec2fcf6cd008e31faf339b9 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 17 Sep 2008 23:09:55 +0000 Subject: uclibc-svn: correct linuxthreads and add log2 * add linuxthread support for am with arm-linuxthreads.patch, otherwise qt-emebedded 4.4.1 is not buildable * to enable linuxthreads you have to comment LINUXTHREADS_OLD=y in uClibc.conf * include linuxthreads-changes.patch from the uclibc-mailinglist * add log2 function with uclibc_mathc99.patch, one program in qt-emebdded 4.4.1 requires this * bump PR --- packages/uclibc/uclibc-svn/arm-linuxthreads.patch | 218 +++++++++++++++ packages/uclibc/uclibc-svn/arm/uClibc.config | 2 +- .../uclibc/uclibc-svn/linuxthreads-changes.patch | 291 +++++++++++++++++++++ packages/uclibc/uclibc-svn/uclibc_mathc99.patch | 270 +++++++++++++++++++ packages/uclibc/uclibc_svn.bb | 7 +- 5 files changed, 785 insertions(+), 3 deletions(-) create mode 100644 packages/uclibc/uclibc-svn/arm-linuxthreads.patch create mode 100644 packages/uclibc/uclibc-svn/linuxthreads-changes.patch create mode 100644 packages/uclibc/uclibc-svn/uclibc_mathc99.patch diff --git a/packages/uclibc/uclibc-svn/arm-linuxthreads.patch b/packages/uclibc/uclibc-svn/arm-linuxthreads.patch new file mode 100644 index 0000000000..e222668a66 --- /dev/null +++ b/packages/uclibc/uclibc-svn/arm-linuxthreads.patch @@ -0,0 +1,218 @@ +Index: uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S 2008-08-28 00:22:06.278340855 +0200 +@@ -0,0 +1,78 @@ ++/* Copyright (C) 1999, 2002, 2003, 2005 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ Contributed by Philip Blundell . ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include ++#define _ERRNO_H 1 ++#include ++#include ++ ++/* Clone the calling process, but without copying the whole address space. ++ The calling process is suspended until the new process exits or is ++ replaced by a call to `execve'. Return -1 for errors, 0 to the new process, ++ and the process ID of the new process to the old process. */ ++ ++ENTRY (__vfork) ++ ++#ifdef __NR_vfork ++ ++#ifdef SHARED ++ ldr ip, 1f ++ ldr r0, 2f ++3: add ip, pc, ip ++ ldr r0, [ip, r0] ++#else ++ ldr r0, 1f ++#endif ++ movs r0, r0 ++ bne HIDDEN_JUMPTARGET (__fork) ++ ++ DO_CALL (vfork, 0) ++ cmn a1, #4096 ++ RETINSTR(cc, lr) ++ ++#ifndef __ASSUME_VFORK_SYSCALL ++ /* Check if vfork syscall is known at all. */ ++ cmn a1, #ENOSYS ++ bne PLTJMP(C_SYMBOL_NAME(__syscall_error)) ++#endif ++ ++#endif ++ ++#ifndef __ASSUME_VFORK_SYSCALL ++ /* If we don't have vfork, fork is close enough. */ ++ DO_CALL (fork, 0) ++ cmn a1, #4096 ++ RETINSTR(cc, lr) ++#elif !defined __NR_vfork ++# error "__NR_vfork not available and __ASSUME_VFORK_SYSCALL defined" ++#endif ++ b PLTJMP(C_SYMBOL_NAME(__syscall_error)) ++ ++#ifdef SHARED ++1: .word _GLOBAL_OFFSET_TABLE_ - 3b - 8 ++2: .word __libc_pthread_functions(GOTOFF) ++#else ++ .weak pthread_create ++1: .word pthread_create ++#endif ++ ++PSEUDO_END (__vfork) ++libc_hidden_def (__vfork) ++ ++weak_alias (__vfork, vfork) +Index: uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h 2008-08-28 00:28:04.301636993 +0200 +@@ -0,0 +1,130 @@ ++/* Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ Contributed by Phil Blundell , 2003. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include ++#include ++#ifndef __ASSEMBLER__ ++# include ++#endif ++ ++#if !defined NOT_IN_libc || defined IS_IN_libpthread ++ ++/* We push lr onto the stack, so we have to use ldmib instead of ldmia ++ to find the saved arguments. */ ++# ifdef PIC ++# undef DOARGS_5 ++# undef DOARGS_6 ++# undef DOARGS_7 ++# define DOARGS_5 str r4, [sp, $-4]!; ldr r4, [sp, $8]; ++# define DOARGS_6 mov ip, sp; stmfd sp!, {r4, r5}; ldmib ip, {r4, r5}; ++# define DOARGS_7 mov ip, sp; stmfd sp!, {r4, r5, r6}; ldmib ip, {r4, r5, r6}; ++# endif ++ ++# undef PSEUDO_RET ++# define PSEUDO_RET \ ++ ldrcc pc, [sp], $4; \ ++ ldr lr, [sp], $4; \ ++ b PLTJMP(SYSCALL_ERROR) ++ ++# undef PSEUDO ++# define PSEUDO(name, syscall_name, args) \ ++ .section ".text"; \ ++ PSEUDO_PROLOGUE; \ ++ ENTRY (name); \ ++ SINGLE_THREAD_P; \ ++ bne .Lpseudo_cancel; \ ++ DO_CALL (syscall_name, args); \ ++ cmn r0, $4096; \ ++ RETINSTR(cc, lr); \ ++ b PLTJMP(SYSCALL_ERROR); \ ++ .Lpseudo_cancel: \ ++ str lr, [sp, $-4]!; \ ++ DOCARGS_##args; /* save syscall args around CENABLE. */ \ ++ CENABLE; \ ++ mov ip, r0; /* put mask in safe place. */ \ ++ UNDOCARGS_##args; /* restore syscall args. */ \ ++ swi SYS_ify (syscall_name); /* do the call. */ \ ++ str r0, [sp, $-4]!; /* save syscall return value. */ \ ++ mov r0, ip; /* get mask back. */ \ ++ CDISABLE; \ ++ ldr r0, [sp], $4; /* retrieve return value. */ \ ++ UNDOC2ARGS_##args; /* fix register damage. */ \ ++ cmn r0, $4096; ++ ++# define DOCARGS_0 ++# define UNDOCARGS_0 ++# define UNDOC2ARGS_0 ++ ++# define DOCARGS_1 str r0, [sp, #-4]!; ++# define UNDOCARGS_1 ldr r0, [sp], #4; ++# define UNDOC2ARGS_1 ++ ++# define DOCARGS_2 str r1, [sp, #-4]!; str r0, [sp, #-4]!; ++# define UNDOCARGS_2 ldr r0, [sp], #4; ldr r1, [sp], #4; ++# define UNDOC2ARGS_2 ++ ++# define DOCARGS_3 str r2, [sp, #-4]!; str r1, [sp, #-4]!; str r0, [sp, #-4]!; ++# define UNDOCARGS_3 ldr r0, [sp], #4; ldr r1, [sp], #4; ldr r2, [sp], #4 ++# define UNDOC2ARGS_3 ++ ++# define DOCARGS_4 stmfd sp!, {r0-r3} ++# define UNDOCARGS_4 ldmfd sp!, {r0-r3} ++# define UNDOC2ARGS_4 ++ ++# define DOCARGS_5 stmfd sp!, {r0-r3} ++# define UNDOCARGS_5 ldmfd sp, {r0-r3}; str r4, [sp, #-4]!; ldr r4, [sp, #24] ++# define UNDOC2ARGS_5 ldr r4, [sp], #20 ++ ++# ifdef IS_IN_libpthread ++# define CENABLE bl PLTJMP(__pthread_enable_asynccancel) ++# define CDISABLE bl PLTJMP(__pthread_disable_asynccancel) ++# define __local_multiple_threads __pthread_multiple_threads ++# else ++# define CENABLE bl PLTJMP(__libc_enable_asynccancel) ++# define CDISABLE bl PLTJMP(__libc_disable_asynccancel) ++# define __local_multiple_threads __libc_multiple_threads ++# endif ++ ++# ifndef __ASSEMBLER__ ++extern int __local_multiple_threads attribute_hidden; ++# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1) ++# else ++# if !defined PIC ++# define SINGLE_THREAD_P \ ++ ldr ip, =__local_multiple_threads; \ ++ ldr ip, [ip]; \ ++ teq ip, #0; ++# define PSEUDO_PROLOGUE ++# else ++# define SINGLE_THREAD_P \ ++ ldr ip, 1b; \ ++2: \ ++ ldr ip, [pc, ip]; \ ++ teq ip, #0; ++# define PSEUDO_PROLOGUE \ ++ 1: .word __local_multiple_threads - 2f - 8; ++# endif ++# endif ++ ++#elif !defined __ASSEMBLER__ ++ ++/* This code should never be used but we define it anyhow. */ ++# define SINGLE_THREAD_P (1) ++ ++#endif diff --git a/packages/uclibc/uclibc-svn/arm/uClibc.config b/packages/uclibc/uclibc-svn/arm/uClibc.config index 9460573cdd..546889aa8b 100644 --- a/packages/uclibc/uclibc-svn/arm/uClibc.config +++ b/packages/uclibc/uclibc-svn/arm/uClibc.config @@ -76,7 +76,7 @@ UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y -LINUXTHREADS_OLD=y +# LINUXTHREADS_OLD is not set UCLIBC_HAS_LFS=y # MALLOC is not set # MALLOC_SIMPLE is not set diff --git a/packages/uclibc/uclibc-svn/linuxthreads-changes.patch b/packages/uclibc/uclibc-svn/linuxthreads-changes.patch new file mode 100644 index 0000000000..f6f32cdd29 --- /dev/null +++ b/packages/uclibc/uclibc-svn/linuxthreads-changes.patch @@ -0,0 +1,291 @@ +Index: uClibc/libpthread/linuxthreads/descr.h +=================================================================== +--- uClibc.orig/libpthread/linuxthreads/descr.h 2008-08-27 23:59:46.171809044 +0200 ++++ uClibc/libpthread/linuxthreads/descr.h 2008-08-28 00:00:35.435134759 +0200 +@@ -123,9 +123,9 @@ + union dtv *dtvp; + pthread_descr self; /* Pointer to this structure */ + int multiple_threads; +-# ifdef NEED_DL_SYSINFO + uintptr_t sysinfo; +-# endif ++ uintptr_t stack_guard; ++ uintptr_t pointer_guard; + } data; + void *__padding[16]; + } p_header; +@@ -193,6 +193,13 @@ + size_t p_alloca_cutoff; /* Maximum size which should be allocated + using alloca() instead of malloc(). */ + /* New elements must be added at the end. */ ++ ++ /* This member must be last. */ ++ char end_padding[]; ++ ++#define PTHREAD_STRUCT_END_PADDING \ ++ (sizeof (struct _pthread_descr_struct) \ ++ - offsetof (struct _pthread_descr_struct, end_padding)) + } __attribute__ ((aligned(32))); /* We need to align the structure so that + doubles are aligned properly. This is 8 + bytes on MIPS and 16 bytes on MIPS64. +Index: uClibc/libpthread/linuxthreads/manager.c +=================================================================== +--- uClibc.orig/libpthread/linuxthreads/manager.c 2008-08-27 23:59:54.185140485 +0200 ++++ uClibc/libpthread/linuxthreads/manager.c 2008-08-28 00:00:35.435134759 +0200 +@@ -679,6 +679,17 @@ + new_thread->p_inheritsched = attr ? attr->__inheritsched : 0; + new_thread->p_alloca_cutoff = stksize / 4 > __MAX_ALLOCA_CUTOFF + ? __MAX_ALLOCA_CUTOFF : stksize / 4; ++ ++ /* Copy the stack guard canary. */ ++#ifdef THREAD_COPY_STACK_GUARD ++ THREAD_COPY_STACK_GUARD (new_thread); ++#endif ++ ++ /* Copy the pointer guard value. */ ++#ifdef THREAD_COPY_POINTER_GUARD ++ THREAD_COPY_POINTER_GUARD (new_thread); ++#endif ++ + /* Initialize the thread handle */ + __pthread_init_lock(&__pthread_handles[sseg].h_lock); + __pthread_handles[sseg].h_descr = new_thread; +@@ -742,15 +753,15 @@ + pid = __clone2(pthread_start_thread_event, + (void **)new_thread_bottom, + (char *)stack_addr - new_thread_bottom, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM | + __pthread_sig_cancel, new_thread); + #elif _STACK_GROWS_UP + pid = __clone(pthread_start_thread_event, (void *) new_thread_bottom, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM | + __pthread_sig_cancel, new_thread); + #else + pid = __clone(pthread_start_thread_event, stack_addr, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM | + __pthread_sig_cancel, new_thread); + #endif + saved_errno = errno; +@@ -783,15 +794,15 @@ + pid = __clone2(pthread_start_thread, + (void **)new_thread_bottom, + (char *)stack_addr - new_thread_bottom, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM | + __pthread_sig_cancel, new_thread); + #elif _STACK_GROWS_UP + pid = __clone(pthread_start_thread, (void *) new_thread_bottom, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM | + __pthread_sig_cancel, new_thread); + #else + pid = __clone(pthread_start_thread, stack_addr, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM | + __pthread_sig_cancel, new_thread); + #endif /* !NEED_SEPARATE_REGISTER_STACK */ + saved_errno = errno; +@@ -892,10 +903,11 @@ + #ifdef _STACK_GROWS_UP + # ifdef USE_TLS + size_t stacksize = guardaddr - th->p_stackaddr; ++ guardaddr = th->p_stackaddr; + # else + size_t stacksize = guardaddr - (char *)th; +-# endif + guardaddr = (char *)th; ++# endif + #else + /* Guardaddr is always set, even if guardsize is 0. This allows + us to compute everything else. */ +Index: uClibc/libpthread/linuxthreads/pthread.c +=================================================================== +--- uClibc.orig/libpthread/linuxthreads/pthread.c 2008-08-28 00:00:00.825141935 +0200 ++++ uClibc/libpthread/linuxthreads/pthread.c 2008-08-28 00:00:35.438472147 +0200 +@@ -698,6 +698,16 @@ + mgr = &__pthread_manager_thread; + #endif + ++ /* Copy the stack guard canary. */ ++#ifdef THREAD_COPY_STACK_GUARD ++ THREAD_COPY_STACK_GUARD (mgr); ++#endif ++ ++ /* Copy the pointer guard value. */ ++#ifdef THREAD_COPY_POINTER_GUARD ++ THREAD_COPY_POINTER_GUARD (mgr); ++#endif ++ + __pthread_manager_request = manager_pipe[1]; /* writing end */ + __pthread_manager_reader = manager_pipe[0]; /* reading end */ + +@@ -738,17 +748,17 @@ + pid = __clone2(__pthread_manager_event, + (void **) __pthread_manager_thread_bos, + THREAD_MANAGER_STACK_SIZE, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, + mgr); + #elif _STACK_GROWS_UP + pid = __clone(__pthread_manager_event, + (void **) __pthread_manager_thread_bos, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, + mgr); + #else + pid = __clone(__pthread_manager_event, + (void **) __pthread_manager_thread_tos, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, + mgr); + #endif + +@@ -778,13 +788,13 @@ + #ifdef NEED_SEPARATE_REGISTER_STACK + pid = __clone2(__pthread_manager, (void **) __pthread_manager_thread_bos, + THREAD_MANAGER_STACK_SIZE, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, mgr); ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, mgr); + #elif _STACK_GROWS_UP + pid = __clone(__pthread_manager, (void **) __pthread_manager_thread_bos, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, mgr); ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, mgr); + #else + pid = __clone(__pthread_manager, (void **) __pthread_manager_thread_tos, +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, mgr); ++ CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, mgr); + #endif + } + if (__builtin_expect (pid, 0) == -1) { +@@ -971,6 +981,10 @@ + struct pthread_request request; + pthread_descr self = thread_self(); + ++ /* Make sure we come back here after suspend(), in case we entered ++ from a signal handler. */ ++ THREAD_SETMEM(self, p_signal_jmp, NULL); ++ + request.req_thread = self; + request.req_kind = REQ_PROCESS_EXIT; + request.req_args.exit.code = retcode; +@@ -1198,13 +1212,13 @@ + + void __pthread_restart_old(pthread_descr th) + { +- if (atomic_increment(&th->p_resume_count) == -1) ++ if (pthread_atomic_increment(&th->p_resume_count) == -1) + kill(th->p_pid, __pthread_sig_restart); + } + + void __pthread_suspend_old(pthread_descr self) + { +- if (atomic_decrement(&self->p_resume_count) <= 0) ++ if (pthread_atomic_decrement(&self->p_resume_count) <= 0) + __pthread_wait_for_restart_signal(self); + } + +@@ -1215,7 +1229,7 @@ + int was_signalled = 0; + sigjmp_buf jmpbuf; + +- if (atomic_decrement(&self->p_resume_count) == 0) { ++ if (pthread_atomic_decrement(&self->p_resume_count) == 0) { + /* Set up a longjmp handler for the restart signal, unblock + the signal and sleep. */ + +@@ -1272,9 +1286,9 @@ + being delivered. */ + + if (!was_signalled) { +- if (atomic_increment(&self->p_resume_count) != -1) { ++ if (pthread_atomic_increment(&self->p_resume_count) != -1) { + __pthread_wait_for_restart_signal(self); +- atomic_decrement(&self->p_resume_count); /* should be zero now! */ ++ pthread_atomic_decrement(&self->p_resume_count); /* should be zero now! */ + /* woke spontaneously and consumed restart signal */ + return 1; + } +Index: uClibc/libpthread/linuxthreads/specific.c +=================================================================== +--- uClibc.orig/libpthread/linuxthreads/specific.c 2008-08-28 00:00:07.595139286 +0200 ++++ uClibc/libpthread/linuxthreads/specific.c 2008-08-28 00:00:35.438472147 +0200 +@@ -104,13 +104,14 @@ + that if the key is reallocated later by pthread_key_create, its + associated values will be NULL in all threads. + +- If no threads have been created yet, clear it just in the +- current thread. */ ++ If no threads have been created yet, or if we are exiting, clear ++ it just in the current thread. */ + + struct pthread_key_delete_helper_args args; + args.idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE; + args.idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE; +- if (__pthread_manager_request != -1) ++ if (__pthread_manager_request != -1 ++ && !(__builtin_expect (__pthread_exit_requested, 0))) + { + struct pthread_request request; + +@@ -203,8 +204,9 @@ + __pthread_lock(THREAD_GETMEM(self, p_lock), self); + for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++) { + if (THREAD_GETMEM_NC(self, p_specific[i]) != NULL) { +- free(THREAD_GETMEM_NC(self, p_specific[i])); ++ void *p = THREAD_GETMEM_NC(self, p_specific[i]); + THREAD_SETMEM_NC(self, p_specific[i], NULL); ++ free(p); + } + } + __pthread_unlock(THREAD_GETMEM(self, p_lock)); +Index: uClibc/libpthread/linuxthreads/spinlock.c +=================================================================== +--- uClibc.orig/libpthread/linuxthreads/spinlock.c 2008-08-28 00:00:17.805140454 +0200 ++++ uClibc/libpthread/linuxthreads/spinlock.c 2008-08-28 00:00:35.438472147 +0200 +@@ -637,8 +637,20 @@ + #if defined HAS_COMPARE_AND_SWAP + wait_node_dequeue(pp_head, pp_max_prio, p_max_prio); + #endif ++ ++ /* Release the spinlock before restarting. */ ++#if defined TEST_FOR_COMPARE_AND_SWAP ++ if (!__pthread_has_cas) ++#endif ++#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP ++ { ++ __pthread_release(&lock->__spinlock); ++ } ++#endif ++ + restart(p_max_prio->thr); +- break; ++ ++ return; + } + } + +Index: uClibc/libpthread/linuxthreads/spinlock.h +=================================================================== +--- uClibc.orig/libpthread/linuxthreads/spinlock.h 2008-08-28 00:00:24.768471655 +0200 ++++ uClibc/libpthread/linuxthreads/spinlock.h 2008-08-28 00:02:42.971786951 +0200 +@@ -172,7 +172,7 @@ + + /* Operations on pthread_atomic, which is defined in internals.h */ + +-static __inline__ long atomic_increment(struct pthread_atomic *pa) ++static __inline__ long pthread_atomic_increment(struct pthread_atomic *pa) + { + long oldval; + +@@ -184,7 +184,7 @@ + } + + +-static __inline__ long atomic_decrement(struct pthread_atomic *pa) ++static __inline__ long pthread_atomic_decrement(struct pthread_atomic *pa) + { + long oldval; + diff --git a/packages/uclibc/uclibc-svn/uclibc_mathc99.patch b/packages/uclibc/uclibc-svn/uclibc_mathc99.patch new file mode 100644 index 0000000000..6fbb11af6b --- /dev/null +++ b/packages/uclibc/uclibc-svn/uclibc_mathc99.patch @@ -0,0 +1,270 @@ +Index: uClibc/test/math/libm-test.inc +=================================================================== +--- uClibc.orig/test/math/libm-test.inc 2008-07-25 11:03:24.000000000 +0200 ++++ uClibc/test/math/libm-test.inc 2008-08-28 10:54:29.714525665 +0200 +@@ -3414,7 +3414,6 @@ + } + + +-#if 0 + static void + log2_test (void) + { +@@ -3444,7 +3443,6 @@ + + END (log2); + } +-#endif + + + static void +@@ -4967,9 +4965,7 @@ + log_test (); + log10_test (); + log1p_test (); +-#if 0 + log2_test (); +-#endif + logb_test (); + modf_test (); + ilogb_test (); +Index: uClibc/libm/Makefile.in +=================================================================== +--- uClibc.orig/libm/Makefile.in 2008-07-25 11:03:27.000000000 +0200 ++++ uClibc/libm/Makefile.in 2008-08-28 10:54:29.714525665 +0200 +@@ -62,7 +62,7 @@ + libm_CSRC := \ + e_acos.c e_acosh.c e_asin.c e_atan2.c e_atanh.c e_cosh.c \ + e_exp.c e_fmod.c e_gamma.c e_gamma_r.c e_hypot.c e_j0.c \ +- e_j1.c e_jn.c e_lgamma.c e_lgamma_r.c e_log.c e_log10.c \ ++ e_j1.c e_jn.c e_lgamma.c e_lgamma_r.c e_log.c e_log2.c e_log10.c \ + e_pow.c e_remainder.c e_rem_pio2.c e_scalb.c e_sinh.c \ + e_sqrt.c k_cos.c k_rem_pio2.c k_sin.c k_standard.c k_tan.c \ + s_asinh.c s_atan.c s_cbrt.c s_ceil.c s_copysign.c s_cos.c \ +@@ -73,7 +73,7 @@ + s_tanh.c s_trunc.c w_acos.c w_acosh.c w_asin.c w_atan2.c w_atanh.c \ + w_cabs.c w_cosh.c w_drem.c w_exp.c w_fmod.c w_gamma.c w_gamma_r.c \ + w_hypot.c w_j0.c w_j1.c w_jn.c w_lgamma.c w_lgamma_r.c \ +- w_log.c w_log10.c w_pow.c w_remainder.c w_scalb.c w_sinh.c \ ++ w_log.c w_log2.c w_log10.c w_pow.c w_remainder.c w_scalb.c w_sinh.c \ + w_sqrt.c fpmacros.c nan.c carg.c s_llrint.c + FL_MOBJ := \ + acosf.o acoshf.o asinf.o asinhf.o atan2f.o atanf.o atanhf.o cbrtf.o \ +@@ -89,10 +89,10 @@ + libm_CSRC := \ + w_acos.c w_asin.c s_atan.c w_atan2.c s_ceil.c s_cos.c \ + w_cosh.c w_exp.c s_fabs.c s_floor.c w_fmod.c s_frexp.c \ +- s_ldexp.c w_log.c w_log10.c s_modf.c w_pow.c s_sin.c \ ++ s_ldexp.c w_log.c w_log2.c w_log10.c s_modf.c w_pow.c s_sin.c \ + w_sinh.c w_sqrt.c s_tan.c s_tanh.c \ + s_expm1.c s_scalbn.c s_copysign.c e_acos.c e_asin.c e_atan2.c \ +- k_cos.c e_cosh.c e_exp.c e_fmod.c e_log.c e_log10.c e_pow.c \ ++ k_cos.c e_cosh.c e_exp.c e_fmod.c e_log.c e_log2.c e_log10.c e_pow.c \ + k_sin.c e_sinh.c e_sqrt.c k_tan.c e_rem_pio2.c k_rem_pio2.c \ + s_finite.c + # We'll add sqrtf to avoid problems with libstdc++ +Index: uClibc/libm/w_log2.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ uClibc/libm/w_log2.c 2008-08-28 10:58:48.676013259 +0200 +@@ -0,0 +1,33 @@ ++/* ++ * wrapper log2(X) ++ */ ++ ++#include "math.h" ++#include "math_private.h" ++ ++libm_hidden_proto(log2) ++#ifdef __STDC__ ++ double log2(double x) /* wrapper log */ ++#else ++ double log2(x) /* wrapper log */ ++ double x; ++#endif ++{ ++#ifdef _IEEE_LIBM ++ return __ieee754_log2 (x); ++#else ++ double z; ++ z = __ieee754_log2 (x); ++ if (_LIB_VERSION == _IEEE_ || __isnan (x)) return z; ++ if (x <= 0.0) ++ { ++ if (x == 0.0) ++ return __kernel_standard (x, x, 48); /* log2 (0) */ ++ else ++ return __kernel_standard (x, x, 49); /* log2 (x < 0) */ ++ } ++ else ++ return z; ++#endif ++} ++libm_hidden_def(log2) +Index: uClibc/libm/e_log2.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ uClibc/libm/e_log2.c 2008-08-28 10:54:29.717859030 +0200 +@@ -0,0 +1,130 @@ ++/* Adapted for log2 by Ulrich Drepper . */ ++/* ++ * ==================================================== ++ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. ++ * ++ * Developed at SunPro, a Sun Microsystems, Inc. business. ++ * Permission to use, copy, modify, and distribute this ++ * software is freely granted, provided that this notice ++ * is preserved. ++ * ==================================================== ++ */ ++ ++/* __ieee754_log2(x) ++ * Return the logarithm to base 2 of x ++ * ++ * Method : ++ * 1. Argument Reduction: find k and f such that ++ * x = 2^k * (1+f), ++ * where sqrt(2)/2 < 1+f < sqrt(2) . ++ * ++ * 2. Approximation of log(1+f). ++ * Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s) ++ * = 2s + 2/3 s**3 + 2/5 s**5 + ....., ++ * = 2s + s*R ++ * We use a special Reme algorithm on [0,0.1716] to generate ++ * a polynomial of degree 14 to approximate R The maximum error ++ * of this polynomial approximation is bounded by 2**-58.45. In ++ * other words, ++ * 2 4 6 8 10 12 14 ++ * R(z) ~ Lg1*s +Lg2*s +Lg3*s +Lg4*s +Lg5*s +Lg6*s +Lg7*s ++ * (the values of Lg1 to Lg7 are listed in the program) ++ * and ++ * | 2 14 | -58.45 ++ * | Lg1*s +...+Lg7*s - R(z) | <= 2 ++ * | | ++ * Note that 2s = f - s*f = f - hfsq + s*hfsq, where hfsq = f*f/2. ++ * In order to guarantee error in log below 1ulp, we compute log ++ * by ++ * log(1+f) = f - s*(f - R) (if f is not too large) ++ * log(1+f) = f - (hfsq - s*(hfsq+R)). (better accuracy) ++ * ++ * 3. Finally, log(x) = k + log(1+f). ++ * = k+(f-(hfsq-(s*(hfsq+R)))) ++ * ++ * Special cases: ++ * log2(x) is NaN with signal if x < 0 (including -INF) ; ++ * log2(+INF) is +INF; log(0) is -INF with signal; ++ * log2(NaN) is that NaN with no signal. ++ * ++ * Constants: ++ * The hexadecimal values are the intended ones for the following ++ * constants. The decimal values may be used, provided that the ++ * compiler will convert from decimal to binary accurately enough ++ * to produce the hexadecimal values shown. ++ */ ++ ++#include "math.h" ++#include "math_private.h" ++ ++#ifdef __STDC__ ++static const double ++#else ++static double ++#endif ++ln2 = 0.69314718055994530942, ++two54 = 1.80143985094819840000e+16, /* 43500000 00000000 */ ++Lg1 = 6.666666666666735130e-01, /* 3FE55555 55555593 */ ++Lg2 = 3.999999999940941908e-01, /* 3FD99999 9997FA04 */ ++Lg3 = 2.857142874366239149e-01, /* 3FD24924 94229359 */ ++Lg4 = 2.222219843214978396e-01, /* 3FCC71C5 1D8E78AF */ ++Lg5 = 1.818357216161805012e-01, /* 3FC74664 96CB03DE */ ++Lg6 = 1.531383769920937332e-01, /* 3FC39A09 D078C69F */ ++Lg7 = 1.479819860511658591e-01; /* 3FC2F112 DF3E5244 */ ++ ++#ifdef __STDC__ ++static const double zero = 0.0; ++#else ++static double zero = 0.0; ++#endif ++ ++#ifdef __STDC__ ++ double attribute_hidden __ieee754_log2(double x) ++#else ++ double attribute_hidden __ieee754_log2(x) ++ double x; ++#endif ++{ ++ double hfsq,f,s,z,R,w,t1,t2,dk; ++ int32_t k,hx,i,j; ++ u_int32_t lx; ++ ++ EXTRACT_WORDS(hx,lx,x); ++ ++ k=0; ++ if (hx < 0x00100000) { /* x < 2**-1022 */ ++ if (((hx&0x7fffffff)|lx)==0) ++ return -two54/(x-x); /* log(+-0)=-inf */ ++ if (hx<0) return (x-x)/(x-x); /* log(-#) = NaN */ ++ k -= 54; x *= two54; /* subnormal number, scale up x */ ++ GET_HIGH_WORD(hx,x); ++ } ++ if (hx >= 0x7ff00000) return x+x; ++ k += (hx>>20)-1023; ++ hx &= 0x000fffff; ++ i = (hx+0x95f64)&0x100000; ++ SET_HIGH_WORD(x,hx|(i^0x3ff00000)); /* normalize x or x/2 */ ++ k += (i>>20); ++ dk = (double) k; ++ f = x-1.0; ++ if((0x000fffff&(2+hx))<3) { /* |f| < 2**-20 */ ++ if(f==zero) return dk; ++ R = f*f*(0.5-0.33333333333333333*f); ++ return dk-(R-f)/ln2; ++ } ++ s = f/(2.0+f); ++ z = s*s; ++ i = hx-0x6147a; ++ w = z*z; ++ j = 0x6b851-hx; ++ t1= w*(Lg2+w*(Lg4+w*Lg6)); ++ t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7))); ++ i |= j; ++ R = t2+t1; ++ if(i>0) { ++ hfsq=0.5*f*f; ++ return dk-((hfsq-(s*(hfsq+R)))-f)/ln2; ++ } else { ++ return dk-((s*(f-R))-f)/ln2; ++ } ++} +Index: uClibc/libm/math_private.h +=================================================================== +--- uClibc.orig/libm/math_private.h 2008-05-07 00:23:27.000000000 +0200 ++++ uClibc/libm/math_private.h 2008-08-28 10:54:29.717859030 +0200 +@@ -158,6 +158,7 @@ + extern double __ieee754_acos (double) attribute_hidden; + extern double __ieee754_acosh (double) attribute_hidden; + extern double __ieee754_log (double) attribute_hidden; ++extern double __ieee754_log2 (double) attribute_hidden; + extern double __ieee754_atanh (double) attribute_hidden; + extern double __ieee754_asin (double) attribute_hidden; + extern double __ieee754_atan2 (double,double) attribute_hidden; +Index: uClibc/libm/float_wrappers.c +=================================================================== +--- uClibc.orig/libm/float_wrappers.c 2008-05-07 00:23:27.000000000 +0200 ++++ uClibc/libm/float_wrappers.c 2008-08-28 10:54:29.717859030 +0200 +@@ -20,7 +20,6 @@ + #undef L_fmaf /*float fmaf(float, float, float);*/ + #undef L_fmaxf /*float fmaxf(float, float);*/ + #undef L_fminf /*float fminf(float, float);*/ +-#undef L_log2f /*float log2f(float);*/ + #undef L_nearbyintf /*float nearbyintf(float);*/ + #undef L_nexttowardf /*float nexttowardf(float, long double);*/ + #undef L_remquof /*float remquof(float, float, int *);*/ +@@ -55,6 +54,7 @@ + float lgammaf(float); + long long llroundf(float); + float log10f(float); ++float log2f(float); + float log1pf(float); + float logbf(float); + float logf(float); diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 7363d09b7c..e536424c40 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -PR = "r14" +PR = "r15" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. @@ -30,6 +30,9 @@ SRC_URI += "svn://uclibc.org/trunk;module=uClibc \ file://uclibc-arm-ftruncate64.patch;patch=1 \ file://arm_fix_alignment.patch;patch=1 \ file://unistd_arm.patch;patch=1 \ - " + file://arm-linuxthreads.patch;patch=1 \ + file://linuxthreads-changes.patch;patch=1 \ + file://uclibc_mathc99.patch;patch=1 \ + " S = "${WORKDIR}/uClibc" -- cgit v1.2.3 From 9fff0af5d645ccfaa6d0f6c3b3b4e71dd9a67995 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 17 Sep 2008 23:24:54 +0000 Subject: navit: add icon. Thanks Gilles Casse. close oebug#4533 --- packages/navit/files/navit.desktop | 2 +- packages/navit/files/navit.png | Bin 0 -> 8341 bytes packages/navit/navit.inc | 3 +++ packages/navit/navit_0.0.4.bb | 2 +- packages/navit/navit_svn.bb | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 packages/navit/files/navit.png diff --git a/packages/navit/files/navit.desktop b/packages/navit/files/navit.desktop index 4d7fda0e35..085c8c9238 100644 --- a/packages/navit/files/navit.desktop +++ b/packages/navit/files/navit.desktop @@ -2,7 +2,7 @@ Name=Navit Comment=GPS Navigation Exec=navit -Icon=openmoko-terminal +Icon=navit.png Terminal=false Type=Application Categories=GTK; diff --git a/packages/navit/files/navit.png b/packages/navit/files/navit.png new file mode 100644 index 0000000000..a23ba5ce03 Binary files /dev/null and b/packages/navit/files/navit.png differ diff --git a/packages/navit/navit.inc b/packages/navit/navit.inc index 011c058370..8db05950e2 100644 --- a/packages/navit/navit.inc +++ b/packages/navit/navit.inc @@ -16,11 +16,14 @@ FILES_${PN}-dev += "${libdir}/${PN}/*/*.so ${libdir}/${PN}/*/*.la" SRC_URI_append = " \ file://navit.desktop \ file://navit.launcher \ + file://navit.png \ " do_install_append() { install -d ${D}${datadir}/applications/ install -m 0644 ${WORKDIR}/navit.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/navit.png ${D}${datadir}/pixmaps/ mv ${D}${bindir}/navit ${D}${bindir}/navit.real install -m 0755 ${WORKDIR}/navit.launcher ${D}${bindir}/navit diff --git a/packages/navit/navit_0.0.4.bb b/packages/navit/navit_0.0.4.bb index 104495f6f5..f22d35e5a8 100644 --- a/packages/navit/navit_0.0.4.bb +++ b/packages/navit/navit_0.0.4.bb @@ -1,6 +1,6 @@ require navit.inc -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz" diff --git a/packages/navit/navit_svn.bb b/packages/navit/navit_svn.bb index 2cf3750671..df712a0eb2 100644 --- a/packages/navit/navit_svn.bb +++ b/packages/navit/navit_svn.bb @@ -1,7 +1,7 @@ require navit.inc PV = "0.1.0+svnrev${SRCREV}" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From bf61ce13a5dd72d4e733303e5405e17e3946985f Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Tue, 16 Sep 2008 11:53:42 +0000 Subject: kdepimpi/pwmpi: bump to 2.2.10 # drop to gcc4 patches that went upstream --- packages/kdepimpi/files/gcc4.patch | 107 ----------------------------------- packages/kdepimpi/files/gcc42.patch | 17 ------ packages/kdepimpi/kdepimpi_2.2.10.bb | 6 ++ packages/kdepimpi/kdepimpi_2.2.7.bb | 8 --- packages/kdepimpi/pwmpi_2.2.10.bb | 3 + packages/kdepimpi/pwmpi_2.2.7.bb | 3 - 6 files changed, 9 insertions(+), 135 deletions(-) delete mode 100644 packages/kdepimpi/files/gcc4.patch delete mode 100644 packages/kdepimpi/files/gcc42.patch create mode 100644 packages/kdepimpi/kdepimpi_2.2.10.bb delete mode 100644 packages/kdepimpi/kdepimpi_2.2.7.bb create mode 100644 packages/kdepimpi/pwmpi_2.2.10.bb delete mode 100644 packages/kdepimpi/pwmpi_2.2.7.bb diff --git a/packages/kdepimpi/files/gcc4.patch b/packages/kdepimpi/files/gcc4.patch deleted file mode 100644 index 4f0f212ea6..0000000000 --- a/packages/kdepimpi/files/gcc4.patch +++ /dev/null @@ -1,107 +0,0 @@ -upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951 -status: upstream is pretty dead - ---- ./gammu/emb/gammu/depend/siemens/dsiemens.c 2006/04/14 23:30:53 1.1 -+++ ./gammu/emb/gammu/depend/siemens/dsiemens.c 2006/04/14 23:31:08 -@@ -351,7 +351,7 @@ - GSM_Terminate(); - } - --static GSM_Reply_Function UserReplyFunctionsAtS[] = { -+GSM_Reply_Function UserReplyFunctionsAtS[] = { - {ATSIEMENS_Reply_GetSAT, "AT^SSTK", 0x00,0x00,ID_User1 }, - {ATSIEMENS_Reply_GetNetmon, "AT^S^MI", 0x00,0x00,ID_User2 }, - {NULL, "\x00", 0x00,0x00,ID_None } ---- ./gammu/emb/gammu/depend/nokia/dct4.c 2006/04/14 23:28:56 1.1 -+++ ./gammu/emb/gammu/depend/nokia/dct4.c 2006/04/14 23:29:17 -@@ -1288,7 +1288,7 @@ - GSM_Terminate(); - } - --static GSM_Reply_Function UserReplyFunctions4[] = { -+GSM_Reply_Function UserReplyFunctions4[] = { - - #ifdef DEBUG - {DCT4_ReplyResetSecurityCode, "\x08",0x03,0x05,ID_User2 }, ---- ./gammu/emb/gammu/depend/nokia/dct3trac/wmx.c 2006/04/14 23:31:48 1.1 -+++ ./gammu/emb/gammu/depend/nokia/dct3trac/wmx.c 2006/04/14 23:31:55 -@@ -462,7 +462,7 @@ - GSMDecoder_free(gsmdec); - } - --static GSM_Reply_Function UserReplyFunctionsX[] = { -+GSM_Reply_Function UserReplyFunctionsX[] = { - {DCT3_ReplySwitchDebug, "\x40",0x02,0x70,ID_DebugSwitch }, - {DCT3_ReplySwitchDebug, "\x40",0x02,0x71,ID_DebugSwitch }, - {DCT3_ReplyDebugTrace, "\x00",0x00,0x00,ID_IncomingFrame }, ---- ./gammu/emb/gammu/depend/nokia/dct3.c 2006/04/14 23:25:59 1.1 -+++ ./gammu/emb/gammu/depend/nokia/dct3.c 2006/04/14 23:27:52 -@@ -770,7 +770,7 @@ - } - #endif - --static GSM_Reply_Function UserReplyFunctions3[] = { -+GSM_Reply_Function UserReplyFunctions3[] = { - #ifdef GSM_ENABLE_NOKIA6110 - {DCT3_ReplyDisplayOutput, "\x0D",0x03,0x50,ID_IncomingFrame }, - {DCT3_ReplyDisplayOutput, "\x0D",0x03,0x54,ID_User7 }, ---- ./gammu/emb/common/phone/alcatel/alcatel.c 2006/04/14 23:23:19 1.1 -+++ ./gammu/emb/common/phone/alcatel/alcatel.c 2006/04/14 23:24:16 -@@ -3833,7 +3833,7 @@ - return ATGEN_SetFastSMSSending(s, enable); - } - --static GSM_Reply_Function ALCATELReplyFunctions[] = { -+GSM_Reply_Function ALCATELReplyFunctions[] = { - {ALCATEL_ReplyGeneric, "\x02",0x00,0x00, ID_AlcatelAttach }, - {ALCATEL_ReplyGeneric, "\x02",0x00,0x00, ID_AlcatelDetach }, - {ALCATEL_ReplyGeneric, "\x02",0x00,0x00, ID_AlcatelCommit }, ---- ./kaddressbook/addresseeeditorwidget.h 2006/04/14 23:14:39 1.1 -+++ ./kaddressbook/addresseeeditorwidget.h 2006/04/14 23:14:51 -@@ -43,6 +43,8 @@ - class QMultiLineEdit; - #endif //KAB_EMBEDDED - -+class QComboBox; -+ - class KComboBox; - class KDateEdit; - class KLineEdit; ---- ./korganizer/koeditordetails.cpp 2006/04/14 22:51:27 1.1 -+++ ./korganizer/koeditordetails.cpp 2006/04/14 23:04:05 -@@ -54,13 +54,13 @@ - #include "koeditordetails.h" - - template <> --CustomListViewItem::~CustomListViewItem() -+CustomListViewItem::~CustomListViewItem() - { - delete mData; - } - - template <> --void CustomListViewItem::updateItem() -+void CustomListViewItem::updateItem() - { - setText(0,mData->name()); - setText(1,mData->email()); ---- ./pwmanager/libcrypt/cipher/serpent.c 2006/04/15 00:30:57 1.1 -+++ ./pwmanager/libcrypt/cipher/serpent.c 2006/04/15 00:33:06 -@@ -687,7 +687,7 @@ - if (! serpent_init_done) - { - /* Execute a self-test the first time, Serpent is used. */ -- static const char *serpent_test (void); -+ const char *serpent_test (void); - - serpent_test_ret = serpent_test (); - if (serpent_test_ret) -@@ -864,7 +864,7 @@ - - /* Serpent test. */ - --static const char * -+const char * - serpent_test (void) - { - serpent_context_t context; diff --git a/packages/kdepimpi/files/gcc42.patch b/packages/kdepimpi/files/gcc42.patch deleted file mode 100644 index e6328eb1ee..0000000000 --- a/packages/kdepimpi/files/gcc42.patch +++ /dev/null @@ -1,17 +0,0 @@ -upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951 -status: upstream is pretty dead - -diff --git -a/kabc/secrecy.h b/kabc/secrecy.h -index 21e22f2..3011ae9 100644 ---- a/kabc/secrecy.h -+++ b/kabc/secrecy.h -@@ -98,5 +98,8 @@ private: - int mType; - }; - -+QDataStream& operator<<(QDataStream& s,const Secrecy &secrecy); -+QDataStream& operator>>(QDataStream& s,Secrecy &secrecy); -+ - } - #endif diff --git a/packages/kdepimpi/kdepimpi_2.2.10.bb b/packages/kdepimpi/kdepimpi_2.2.10.bb new file mode 100644 index 0000000000..f6a1caf212 --- /dev/null +++ b/packages/kdepimpi/kdepimpi_2.2.10.bb @@ -0,0 +1,6 @@ +SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \ + file://qt-mt.patch;patch=1" + +require kdepimpi-base.inc + +PR = "r0" diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb deleted file mode 100644 index f21aebb4f3..0000000000 --- a/packages/kdepimpi/kdepimpi_2.2.7.bb +++ /dev/null @@ -1,8 +0,0 @@ -SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \ - file://gcc4.patch;patch=1 \ - file://qt-mt.patch;patch=1 \ - file://gcc42.patch;patch=1" - -require kdepimpi-base.inc - -PR = "r3" diff --git a/packages/kdepimpi/pwmpi_2.2.10.bb b/packages/kdepimpi/pwmpi_2.2.10.bb new file mode 100644 index 0000000000..6e67f5c7c2 --- /dev/null +++ b/packages/kdepimpi/pwmpi_2.2.10.bb @@ -0,0 +1,3 @@ +require kdepimpi_${PV}.bb + +require pwmpi.inc diff --git a/packages/kdepimpi/pwmpi_2.2.7.bb b/packages/kdepimpi/pwmpi_2.2.7.bb deleted file mode 100644 index 6e67f5c7c2..0000000000 --- a/packages/kdepimpi/pwmpi_2.2.7.bb +++ /dev/null @@ -1,3 +0,0 @@ -require kdepimpi_${PV}.bb - -require pwmpi.inc -- cgit v1.2.3 From 34018942665dc27bda7a671c56549e96e728211c Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Tue, 16 Sep 2008 17:17:24 +0000 Subject: sqlite: bump to 3.6.2 drop old recipes --- packages/sqlite/sqlite-2.8.15/.mtn2git_empty | 0 packages/sqlite/sqlite-2.8.15/main.mk | 444 ---------------------- packages/sqlite/sqlite-2.8.16/.mtn2git_empty | 0 packages/sqlite/sqlite-2.8.16/main.mk | 444 ---------------------- packages/sqlite/sqlite-2.8.16/sqlite.pc | 12 - packages/sqlite/sqlite-2.8.9/.mtn2git_empty | 0 packages/sqlite/sqlite-2.8.9/crosscompile.patch | 147 ------- packages/sqlite/sqlite3-3.2.2/.mtn2git_empty | 0 packages/sqlite/sqlite3-3.2.2/cross-compile.patch | 84 ---- packages/sqlite/sqlite3-3.2.2/ldflags.patch | 77 ---- packages/sqlite/sqlite3-3.2.5/.mtn2git_empty | 0 packages/sqlite/sqlite3-3.2.5/cross-compile.patch | 84 ---- packages/sqlite/sqlite3-3.2.5/ldflags.patch | 77 ---- packages/sqlite/sqlite3-3.2.7/.mtn2git_empty | 0 packages/sqlite/sqlite3-3.2.7/cross-compile.patch | 84 ---- packages/sqlite/sqlite3-3.2.7/ldflags.patch | 77 ---- packages/sqlite/sqlite3-3.3.12/.mtn2git_empty | 0 packages/sqlite/sqlite3-3.3.12/ldflags.patch | 70 ---- packages/sqlite/sqlite3-3.3.13/.mtn2git_empty | 0 packages/sqlite/sqlite3-3.3.13/ldflags.patch | 70 ---- packages/sqlite/sqlite3-native_3.5.6.bb | 1 - packages/sqlite/sqlite3-native_3.6.2.bb | 1 + packages/sqlite/sqlite3_3.2.2.bb | 2 - packages/sqlite/sqlite3_3.2.5.bb | 2 - packages/sqlite/sqlite3_3.2.7.bb | 2 - packages/sqlite/sqlite3_3.3.12.bb | 3 - packages/sqlite/sqlite3_3.3.13.bb | 3 - packages/sqlite/sqlite3_3.3.17.bb | 3 - packages/sqlite/sqlite3_3.4.1.bb | 3 - packages/sqlite/sqlite3_3.5.6.bb | 3 - packages/sqlite/sqlite3_3.6.2.bb | 3 + packages/sqlite/sqlite_2.8.15.bb | 56 --- packages/sqlite/sqlite_2.8.16.bb | 59 --- packages/sqlite/sqlite_2.8.9.bb | 39 -- 34 files changed, 4 insertions(+), 1846 deletions(-) delete mode 100644 packages/sqlite/sqlite-2.8.15/.mtn2git_empty delete mode 100644 packages/sqlite/sqlite-2.8.15/main.mk delete mode 100644 packages/sqlite/sqlite-2.8.16/.mtn2git_empty delete mode 100644 packages/sqlite/sqlite-2.8.16/main.mk delete mode 100644 packages/sqlite/sqlite-2.8.16/sqlite.pc delete mode 100644 packages/sqlite/sqlite-2.8.9/.mtn2git_empty delete mode 100644 packages/sqlite/sqlite-2.8.9/crosscompile.patch delete mode 100644 packages/sqlite/sqlite3-3.2.2/.mtn2git_empty delete mode 100644 packages/sqlite/sqlite3-3.2.2/cross-compile.patch delete mode 100644 packages/sqlite/sqlite3-3.2.2/ldflags.patch delete mode 100644 packages/sqlite/sqlite3-3.2.5/.mtn2git_empty delete mode 100644 packages/sqlite/sqlite3-3.2.5/cross-compile.patch delete mode 100644 packages/sqlite/sqlite3-3.2.5/ldflags.patch delete mode 100644 packages/sqlite/sqlite3-3.2.7/.mtn2git_empty delete mode 100644 packages/sqlite/sqlite3-3.2.7/cross-compile.patch delete mode 100644 packages/sqlite/sqlite3-3.2.7/ldflags.patch delete mode 100644 packages/sqlite/sqlite3-3.3.12/.mtn2git_empty delete mode 100644 packages/sqlite/sqlite3-3.3.12/ldflags.patch delete mode 100644 packages/sqlite/sqlite3-3.3.13/.mtn2git_empty delete mode 100644 packages/sqlite/sqlite3-3.3.13/ldflags.patch delete mode 100644 packages/sqlite/sqlite3-native_3.5.6.bb create mode 100644 packages/sqlite/sqlite3-native_3.6.2.bb delete mode 100644 packages/sqlite/sqlite3_3.2.2.bb delete mode 100644 packages/sqlite/sqlite3_3.2.5.bb delete mode 100644 packages/sqlite/sqlite3_3.2.7.bb delete mode 100644 packages/sqlite/sqlite3_3.3.12.bb delete mode 100644 packages/sqlite/sqlite3_3.3.13.bb delete mode 100644 packages/sqlite/sqlite3_3.3.17.bb delete mode 100644 packages/sqlite/sqlite3_3.4.1.bb delete mode 100644 packages/sqlite/sqlite3_3.5.6.bb create mode 100644 packages/sqlite/sqlite3_3.6.2.bb delete mode 100644 packages/sqlite/sqlite_2.8.15.bb delete mode 100644 packages/sqlite/sqlite_2.8.16.bb delete mode 100644 packages/sqlite/sqlite_2.8.9.bb diff --git a/packages/sqlite/sqlite-2.8.15/.mtn2git_empty b/packages/sqlite/sqlite-2.8.15/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sqlite/sqlite-2.8.15/main.mk b/packages/sqlite/sqlite-2.8.15/main.mk deleted file mode 100644 index 522749bc9f..0000000000 --- a/packages/sqlite/sqlite-2.8.15/main.mk +++ /dev/null @@ -1,444 +0,0 @@ -############################################################################### -# The following macros should be defined before this script is -# invoked: -# -# TOP The toplevel directory of the source tree. This is the -# directory that contains this "Makefile.in" and the -# "configure.in" script. -# -# BCC C Compiler and options for use in building executables that -# will run on the platform that is doing the build. -# -# USLEEP If the target operating system supports the "usleep()" system -# call, then define the HAVE_USLEEP macro for all C modules. -# -# THREADSAFE If you want the SQLite library to be safe for use within a -# multi-threaded program, then define the following macro -# appropriately: -# -# THREADLIB Specify any extra linker options needed to make the library -# thread safe -# -# OPTS Extra compiler command-line options. -# -# EXE The suffix to add to executable files. ".exe" for windows -# and "" for Unix. -# -# TCC C Compiler and options for use in building executables that -# will run on the target platform. This is usually the same -# as BCC, unless you are cross-compiling. -# -# AR Tools used to build a static library. -# RANLIB -# -# TCL_FLAGS Extra compiler options needed for programs that use the -# TCL library. -# -# LIBTCL Linker options needed to link against the TCL library. -# -# READLINE_FLAGS Compiler options needed for programs that use the -# readline() library. -# -# LIBREADLINE Linker options needed by programs using readline() must -# link against. -# -# ENCODING "UTF8" or "ISO8859" -# -# Once the macros above are defined, the rest of this make script will -# build the SQLite library and testing tools. -################################################################################ - -# This is how we compile -# -TCCX = $(TCC) $(OPTS) $(THREADSAFE) $(USLEEP) -I. -I$(TOP)/src - -# Object files for the SQLite library. -# -LIBOBJ = attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \ - expr.o func.o hash.o insert.o \ - main.o opcodes.o os.o pager.o parse.o pragma.o printf.o random.o \ - select.o table.o tokenize.o trigger.o update.o util.o \ - vacuum.o vdbe.o vdbeaux.o where.o - -# All of the source code files. -# -SRC = \ - $(TOP)/src/attach.c \ - $(TOP)/src/auth.c \ - $(TOP)/src/btree.c \ - $(TOP)/src/btree.h \ - $(TOP)/src/btree_rb.c \ - $(TOP)/src/build.c \ - $(TOP)/src/copy.c \ - $(TOP)/src/date.c \ - $(TOP)/src/delete.c \ - $(TOP)/src/encode.c \ - $(TOP)/src/expr.c \ - $(TOP)/src/func.c \ - $(TOP)/src/hash.c \ - $(TOP)/src/hash.h \ - $(TOP)/src/insert.c \ - $(TOP)/src/main.c \ - $(TOP)/src/os.c \ - $(TOP)/src/pager.c \ - $(TOP)/src/pager.h \ - $(TOP)/src/parse.y \ - $(TOP)/src/pragma.c \ - $(TOP)/src/printf.c \ - $(TOP)/src/random.c \ - $(TOP)/src/select.c \ - $(TOP)/src/shell.c \ - $(TOP)/src/sqlite.h.in \ - $(TOP)/src/sqliteInt.h \ - $(TOP)/src/table.c \ - $(TOP)/src/tokenize.c \ - $(TOP)/src/trigger.c \ - $(TOP)/src/update.c \ - $(TOP)/src/util.c \ - $(TOP)/src/vacuum.c \ - $(TOP)/src/vdbe.c \ - $(TOP)/src/vdbe.h \ - $(TOP)/src/vdbeaux.c \ - $(TOP)/src/vdbeInt.h \ - $(TOP)/src/where.c - -# Source code to the test files. -# -TESTSRC = \ - $(TOP)/src/btree.c \ - $(TOP)/src/func.c \ - $(TOP)/src/os.c \ - $(TOP)/src/pager.c \ - $(TOP)/src/test1.c \ - $(TOP)/src/test2.c \ - $(TOP)/src/test3.c \ - $(TOP)/src/test4.c \ - $(TOP)/src/vdbe.c \ - $(TOP)/src/md5.c - -# Header files used by all library source files. -# -HDR = \ - sqlite.h \ - $(TOP)/src/btree.h \ - config.h \ - $(TOP)/src/hash.h \ - opcodes.h \ - $(TOP)/src/os.h \ - $(TOP)/src/sqliteInt.h \ - $(TOP)/src/vdbe.h \ - parse.h - -# Header files used by the VDBE submodule -# -VDBEHDR = \ - $(HDR) \ - $(TOP)/src/vdbeInt.h - -# This is the default Makefile target. The objects listed here -# are what get build when you type just "make" with no arguments. -# -all: sqlite.h config.h libsqlite.so sqlite$(EXE) - -# Generate the file "last_change" which contains the date of change -# of the most recently modified source code file -# -last_change: $(SRC) - cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \ - | awk '{print $$5,$$6}' >last_change - -libsqlite.so: $(LIBOBJ) - $(CC) -shared -o libsqlite.so -Wl,-soname,libsqlite.so.0 $(LIBOBJ) - -sqlite$(EXE): $(TOP)/src/shell.c libsqlite.so sqlite.h - $(TCCX) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ - -lsqlite $(LIBREADLINE) $(THREADLIB) - -sqlite_analyzer$(EXE): $(TOP)/src/tclsqlite.c libsqlite.a $(TESTSRC) \ - $(TOP)/tool/spaceanal.tcl - sed \ - -e '/^#/d' \ - -e 's,\\,\\\\,g' \ - -e 's,",\\",g' \ - -e 's,^,",' \ - -e 's,$$,\\n",' \ - $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h - $(TCCX) $(TCL_FLAGS) -DTCLSH=2 -DSQLITE_TEST=1 -static -o \ - sqlite_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \ - libsqlite.a $(LIBTCL) - - -# This target creates a directory named "tsrc" and fills it with -# copies of all of the C source code and header files needed to -# build on the target system. Some of the C source code and header -# files are automatically generated. This target takes care of -# all that automatic generation. -# -target_source: $(SRC) $(VDBEHDR) opcodes.c - rm -rf tsrc - mkdir tsrc - cp $(SRC) $(VDBEHDR) tsrc - rm tsrc/sqlite.h.in tsrc/parse.y - cp parse.c opcodes.c tsrc - -# Rules to build the LEMON compiler generator -# -lemon: $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c - $(BCC) -o lemon $(TOP)/tool/lemon.c - cp $(TOP)/tool/lempar.c . - -btree.o: $(TOP)/src/btree.c $(HDR) $(TOP)/src/pager.h - $(TCCX) -c $(TOP)/src/btree.c - -btree_rb.o: $(TOP)/src/btree_rb.c $(HDR) - $(TCCX) -c $(TOP)/src/btree_rb.c - -build.o: $(TOP)/src/build.c $(HDR) - $(TCCX) -c $(TOP)/src/build.c - -main.o: $(TOP)/src/main.c $(HDR) - $(TCCX) -c $(TOP)/src/main.c - -pager.o: $(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h - $(TCCX) -c $(TOP)/src/pager.c - -opcodes.o: opcodes.c - $(TCCX) -c opcodes.c - -opcodes.c: $(TOP)/src/vdbe.c - echo '/* Automatically generated file. Do not edit */' >opcodes.c - echo 'char *sqliteOpcodeNames[] = { "???", ' >>opcodes.c - grep '^case OP_' $(TOP)/src/vdbe.c | \ - sed -e 's/^.*OP_/ "/' -e 's/:.*$$/", /' >>opcodes.c - echo '};' >>opcodes.c - -opcodes.h: $(TOP)/src/vdbe.h - echo '/* Automatically generated file. Do not edit */' >opcodes.h - grep '^case OP_' $(TOP)/src/vdbe.c | \ - sed -e 's/://' | \ - awk '{printf "#define %-30s %3d\n", $$2, ++cnt}' >>opcodes.h - -os.o: $(TOP)/src/os.c $(HDR) - $(TCCX) -c $(TOP)/src/os.c - -parse.o: parse.c $(HDR) - $(TCCX) -c parse.c - -parse.h: parse.c - -parse.c: $(TOP)/src/parse.y lemon - cp $(TOP)/src/parse.y . - ./lemon parse.y - -# The config.h file will contain a single #define that tells us how -# many bytes are in a pointer. This only works if a pointer is the -# same size on the host as it is on the target. If you are cross-compiling -# to a target with a different pointer size, you'll need to manually -# configure the config.h file. -# -config.h: - echo '#include ' >temp.c - echo 'int main(){printf(' >>temp.c - echo '"#define SQLITE_PTR_SZ %d",sizeof(char*));' >>temp.c - echo 'exit(0);}' >>temp.c - $(BCC) -o temp temp.c - ./temp >config.h - echo >>config.h - rm -f temp.c temp - -sqlite.h: $(TOP)/src/sqlite.h.in - sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \ - -e s/--ENCODING--/$(ENCODING)/ \ - $(TOP)/src/sqlite.h.in >sqlite.h - -tokenize.o: $(TOP)/src/tokenize.c $(HDR) - $(TCCX) -c $(TOP)/src/tokenize.c - -trigger.o: $(TOP)/src/trigger.c $(HDR) - $(TCCX) -c $(TOP)/src/trigger.c - -util.o: $(TOP)/src/util.c $(HDR) - $(TCCX) -c $(TOP)/src/util.c - -vacuum.o: $(TOP)/src/vacuum.c $(HDR) - $(TCCX) -c $(TOP)/src/vacuum.c - -vdbe.o: $(TOP)/src/vdbe.c $(VDBEHDR) - $(TCCX) -c $(TOP)/src/vdbe.c - -vdbeaux.o: $(TOP)/src/vdbeaux.c $(VDBEHDR) - $(TCCX) -c $(TOP)/src/vdbeaux.c - -where.o: $(TOP)/src/where.c $(HDR) - $(TCCX) -c $(TOP)/src/where.c - -copy.o: $(TOP)/src/copy.c $(HDR) - $(TCCX) -c $(TOP)/src/copy.c - -date.o: $(TOP)/src/date.c $(HDR) - $(TCCX) -c $(TOP)/src/date.c - -delete.o: $(TOP)/src/delete.c $(HDR) - $(TCCX) -c $(TOP)/src/delete.c - -encode.o: $(TOP)/src/encode.c - $(TCCX) -c $(TOP)/src/encode.c - -expr.o: $(TOP)/src/expr.c $(HDR) - $(TCCX) -c $(TOP)/src/expr.c - -func.o: $(TOP)/src/func.c $(HDR) - $(TCCX) -c $(TOP)/src/func.c - -hash.o: $(TOP)/src/hash.c $(HDR) - $(TCCX) -c $(TOP)/src/hash.c - -insert.o: $(TOP)/src/insert.c $(HDR) - $(TCCX) -c $(TOP)/src/insert.c - -random.o: $(TOP)/src/random.c $(HDR) - $(TCCX) -c $(TOP)/src/random.c - -select.o: $(TOP)/src/select.c $(HDR) - $(TCCX) -c $(TOP)/src/select.c - -table.o: $(TOP)/src/table.c $(HDR) - $(TCCX) -c $(TOP)/src/table.c - -update.o: $(TOP)/src/update.c $(HDR) - $(TCCX) -c $(TOP)/src/update.c - -tclsqlite.o: $(TOP)/src/tclsqlite.c $(HDR) - $(TCCX) $(TCL_FLAGS) -c $(TOP)/src/tclsqlite.c - -pragma.o: $(TOP)/src/pragma.c $(HDR) - $(TCCX) $(TCL_FLAGS) -c $(TOP)/src/pragma.c - -printf.o: $(TOP)/src/printf.c $(HDR) - $(TCCX) $(TCL_FLAGS) -c $(TOP)/src/printf.c - -attach.o: $(TOP)/src/attach.c $(HDR) - $(TCCX) -c $(TOP)/src/attach.c - -auth.o: $(TOP)/src/auth.c $(HDR) - $(TCCX) -c $(TOP)/src/auth.c - -tclsqlite: $(TOP)/src/tclsqlite.c libsqlite.a - $(TCCX) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite \ - $(TOP)/src/tclsqlite.c libsqlite.a $(LIBTCL) - -testfixture$(EXE): $(TOP)/src/tclsqlite.c libsqlite.a $(TESTSRC) - $(TCCX) $(TCL_FLAGS) -DTCLSH=1 -DSQLITE_TEST=1 -o testfixture$(EXE) \ - $(TESTSRC) $(TOP)/src/tclsqlite.c \ - libsqlite.a $(LIBTCL) $(THREADLIB) - -fulltest: testfixture$(EXE) sqlite$(EXE) - ./testfixture$(EXE) $(TOP)/test/all.test - -test: testfixture$(EXE) sqlite$(EXE) - ./testfixture$(EXE) $(TOP)/test/quick.test - -index.html: $(TOP)/www/index.tcl last_change - tclsh $(TOP)/www/index.tcl `cat $(TOP)/VERSION` >index.html - -sqlite.html: $(TOP)/www/sqlite.tcl - tclsh $(TOP)/www/sqlite.tcl >sqlite.html - -c_interface.html: $(TOP)/www/c_interface.tcl - tclsh $(TOP)/www/c_interface.tcl >c_interface.html - -changes.html: $(TOP)/www/changes.tcl - tclsh $(TOP)/www/changes.tcl >changes.html - -lang.html: $(TOP)/www/lang.tcl - tclsh $(TOP)/www/lang.tcl >lang.html - -vdbe.html: $(TOP)/www/vdbe.tcl - tclsh $(TOP)/www/vdbe.tcl >vdbe.html - -arch.html: $(TOP)/www/arch.tcl - tclsh $(TOP)/www/arch.tcl >arch.html - -arch.png: $(TOP)/www/arch.png - cp $(TOP)/www/arch.png . - -opcode.html: $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c - tclsh $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c >opcode.html - -mingw.html: $(TOP)/www/mingw.tcl - tclsh $(TOP)/www/mingw.tcl >mingw.html - -tclsqlite.html: $(TOP)/www/tclsqlite.tcl - tclsh $(TOP)/www/tclsqlite.tcl >tclsqlite.html - -speed.html: $(TOP)/www/speed.tcl - tclsh $(TOP)/www/speed.tcl >speed.html - -faq.html: $(TOP)/www/faq.tcl - tclsh $(TOP)/www/faq.tcl >faq.html - -formatchng.html: $(TOP)/www/formatchng.tcl - tclsh $(TOP)/www/formatchng.tcl >formatchng.html - -conflict.html: $(TOP)/www/conflict.tcl - tclsh $(TOP)/www/conflict.tcl >conflict.html - -download.html: $(TOP)/www/download.tcl - tclsh $(TOP)/www/download.tcl >download.html - -omitted.html: $(TOP)/www/omitted.tcl - tclsh $(TOP)/www/omitted.tcl >omitted.html - -datatypes.html: $(TOP)/www/datatypes.tcl - tclsh $(TOP)/www/datatypes.tcl >datatypes.html - -quickstart.html: $(TOP)/www/quickstart.tcl - tclsh $(TOP)/www/quickstart.tcl >quickstart.html - -fileformat.html: $(TOP)/www/fileformat.tcl - tclsh $(TOP)/www/fileformat.tcl >fileformat.html - -nulls.html: $(TOP)/www/nulls.tcl - tclsh $(TOP)/www/nulls.tcl >nulls.html - - -# Files to be published on the website. -# -DOC = \ - index.html \ - sqlite.html \ - changes.html \ - lang.html \ - opcode.html \ - arch.html \ - arch.png \ - vdbe.html \ - c_interface.html \ - mingw.html \ - tclsqlite.html \ - download.html \ - speed.html \ - faq.html \ - formatchng.html \ - conflict.html \ - omitted.html \ - datatypes.html \ - quickstart.html \ - fileformat.html \ - nulls.html - -doc: $(DOC) - mkdir -p doc - mv $(DOC) doc - -install: sqlite libsqlite.a sqlite.h - mv sqlite /usr/bin - mv libsqlite.a /usr/lib - mv sqlite.h /usr/include - -clean: - rm -f *.o sqlite libsqlite.a sqlite.h opcodes.* - rm -f lemon lempar.c parse.* sqlite*.tar.gz - rm -f $(PUBLISH) - rm -f *.da *.bb *.bbg gmon.out - rm -rf tsrc diff --git a/packages/sqlite/sqlite-2.8.16/.mtn2git_empty b/packages/sqlite/sqlite-2.8.16/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sqlite/sqlite-2.8.16/main.mk b/packages/sqlite/sqlite-2.8.16/main.mk deleted file mode 100644 index 522749bc9f..0000000000 --- a/packages/sqlite/sqlite-2.8.16/main.mk +++ /dev/null @@ -1,444 +0,0 @@ -############################################################################### -# The following macros should be defined before this script is -# invoked: -# -# TOP The toplevel directory of the source tree. This is the -# directory that contains this "Makefile.in" and the -# "configure.in" script. -# -# BCC C Compiler and options for use in building executables that -# will run on the platform that is doing the build. -# -# USLEEP If the target operating system supports the "usleep()" system -# call, then define the HAVE_USLEEP macro for all C modules. -# -# THREADSAFE If you want the SQLite library to be safe for use within a -# multi-threaded program, then define the following macro -# appropriately: -# -# THREADLIB Specify any extra linker options needed to make the library -# thread safe -# -# OPTS Extra compiler command-line options. -# -# EXE The suffix to add to executable files. ".exe" for windows -# and "" for Unix. -# -# TCC C Compiler and options for use in building executables that -# will run on the target platform. This is usually the same -# as BCC, unless you are cross-compiling. -# -# AR Tools used to build a static library. -# RANLIB -# -# TCL_FLAGS Extra compiler options needed for programs that use the -# TCL library. -# -# LIBTCL Linker options needed to link against the TCL library. -# -# READLINE_FLAGS Compiler options needed for programs that use the -# readline() library. -# -# LIBREADLINE Linker options needed by programs using readline() must -# link against. -# -# ENCODING "UTF8" or "ISO8859" -# -# Once the macros above are defined, the rest of this make script will -# build the SQLite library and testing tools. -################################################################################ - -# This is how we compile -# -TCCX = $(TCC) $(OPTS) $(THREADSAFE) $(USLEEP) -I. -I$(TOP)/src - -# Object files for the SQLite library. -# -LIBOBJ = attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \ - expr.o func.o hash.o insert.o \ - main.o opcodes.o os.o pager.o parse.o pragma.o printf.o random.o \ - select.o table.o tokenize.o trigger.o update.o util.o \ - vacuum.o vdbe.o vdbeaux.o where.o - -# All of the source code files. -# -SRC = \ - $(TOP)/src/attach.c \ - $(TOP)/src/auth.c \ - $(TOP)/src/btree.c \ - $(TOP)/src/btree.h \ - $(TOP)/src/btree_rb.c \ - $(TOP)/src/build.c \ - $(TOP)/src/copy.c \ - $(TOP)/src/date.c \ - $(TOP)/src/delete.c \ - $(TOP)/src/encode.c \ - $(TOP)/src/expr.c \ - $(TOP)/src/func.c \ - $(TOP)/src/hash.c \ - $(TOP)/src/hash.h \ - $(TOP)/src/insert.c \ - $(TOP)/src/main.c \ - $(TOP)/src/os.c \ - $(TOP)/src/pager.c \ - $(TOP)/src/pager.h \ - $(TOP)/src/parse.y \ - $(TOP)/src/pragma.c \ - $(TOP)/src/printf.c \ - $(TOP)/src/random.c \ - $(TOP)/src/select.c \ - $(TOP)/src/shell.c \ - $(TOP)/src/sqlite.h.in