diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-22 11:36:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-22 11:36:13 +0100 |
| commit | 15f7f8f402eab5b7cd03094c358435c4c880b5b6 (patch) | |
| tree | dcad0212391e8a9fbb89423d8b9b58ba6466420c /package | |
| parent | 79d3532b0f8f04ec07788c997b24162cdaab8b26 (diff) | |
more bulk build fixes
- update rtorrent, libtorrent and libsigc++
- add skeleton for cfinstaller
- fix uclibc samba compile
- fix parallel builds
- update tcl
- update iw
- remove mac80211 package, use kernel integrated drivers
- mark packages which can not be compiled parallel (make -j2)
Diffstat (limited to 'package')
41 files changed, 6028 insertions, 132 deletions
diff --git a/package/Config.in b/package/Config.in index 01c79c14f..1d32edd5e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -9,6 +9,7 @@ menu "Basesystem" source "package/base-files/Config.in" source "package/busybox/Config.in" source "package/cfgfs/Config.in" +source "package/cfinstall/Config.in" source "package/cryptinit/Config.in" source "package/uclibc/Config.in" source "package/glibc/Config.in" diff --git a/package/Makefile b/package/Makefile index 5cce2a31d..c12cf3067 100644 --- a/package/Makefile +++ b/package/Makefile @@ -39,6 +39,7 @@ package-$(ADK_PACKAGE_BISON) += bison package-$(ADK_PACKAGE_BZIP2) += bzip2 package-$(ADK_PACKAGE_CA_CERTS) += ca-certificates package-$(ADK_PACKAGE_CFGFS) += cfgfs +package-$(ADK_PACKAGE_CFINSTALL) += cfinstall package-$(ADK_PACKAGE_CPIO) += cpio package-$(ADK_PACKAGE_CRYPTINIT) += cryptinit package-$(ADK_PACKAGE_BIGREQSPROTO) += bigreqsproto @@ -442,7 +443,6 @@ package-$(ADK_PACKAGE_ZLIB_DEV) += zlib package-$(ADK_PACKAGE_ZSH) += zsh # kernel addon packages package-$(ADK_PACKAGE_KMOD_EM28XX) += em28xx -package-$(ADK_PACKAGE_KMOD_MAC80211) += mac80211 package-$(ADK_PACKAGE_NTFS_3G) += ntfs-3g DOWNLOAD:=$(patsubst %,%-download,$(package-y) $(package-m)) diff --git a/package/cfinstall/Config.in b/package/cfinstall/Config.in new file mode 100644 index 000000000..f02c4e809 --- /dev/null +++ b/package/cfinstall/Config.in @@ -0,0 +1,10 @@ +config ADK_PACKAGE_CFINSTALL + prompt "cfinstall........................... compact flash installer" + tristate + select ADK_PACKAGE_SFDISK + select ADK_PACKAGE_PARTED + select ADK_PACKAGE_GRUB_BIN + depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_MIPS_RB532 + default n + help + Installs a rootfs tar archive onto a Compact Flash disk. diff --git a/package/cfinstall/Makefile b/package/cfinstall/Makefile new file mode 100644 index 000000000..7f10dba27 --- /dev/null +++ b/package/cfinstall/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= cfinstall +PKG_VERSION:= 1.0 +PKG_RELEASE:= 1 +PKG_DESCR:= compact flash installer +PKG_SECTION:= base + +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} +NO_DISTFILES:= 1 + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,CFINSTALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +pre-configure: + mkdir -p ${WRKBUILD} + +do-install: + ${INSTALL_DIR} $(IDIR_CFINSTALL)/sbin + ${INSTALL_BIN} ./src/cfinstall.sh $(IDIR_CFINSTALL)/sbin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cfinstall/src/cfinstall.sh b/package/cfinstall/src/cfinstall.sh new file mode 100644 index 000000000..1ff908963 --- /dev/null +++ b/package/cfinstall/src/cfinstall.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# installs a rootfs tar archive from OpenADK onto a Compact Flash disk + + diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in index 862b8c460..fa6f355d5 100644 --- a/package/ctorrent/Config.in +++ b/package/ctorrent/Config.in @@ -24,6 +24,7 @@ config ADK_COMPILE_CTORRENT_WITH_STDCXX config ADK_COMPILE_CTORRENT_WITH_UCLIBCXX bool "Embedded uClibc++ library" select ADK_PACKAGE_UCLIBCXX + depends on ADK_BROKEN help endchoice diff --git a/package/cxxtools/Config.in b/package/cxxtools/Config.in index bdc0168a7..5c040b674 100644 --- a/package/cxxtools/Config.in +++ b/package/cxxtools/Config.in @@ -10,7 +10,7 @@ config ADK_PACKAGE_CXXTOOLS choice prompt "C++ library to use" depends on ADK_PACKAGE_CXXTOOLS -default ADK_COMPILE_CXXTOOLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC +default ADK_COMPILE_CXXTOOLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC default ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC config ADK_COMPILE_CXXTOOLS_WITH_STDCXX diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index f3a270aa8..36e91f35c 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -24,8 +24,8 @@ endif $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -TCXXFLAGS+= -fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ -TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs +TCXXFLAGS+= -fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E +TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs -shared else TLDFLAGS+= -liconv -shared endif diff --git a/package/iw/Makefile b/package/iw/Makefile index 2f63420c0..606fbadf6 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iw -PKG_VERSION:= 0.9.14 +PKG_VERSION:= 0.9.17 PKG_RELEASE:= 1 -PKG_MD5SUM:= b5059cfe86bc7664511b79c159635a8f +PKG_MD5SUM:= 427841093ac11c5cbc025a3e13aac139 PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211) PKG_SECTION:= net PKG_DEPENDS:= libnl diff --git a/package/iw/patches/patch-Makefile b/package/iw/patches/patch-Makefile index 32ef25f93..ec12e1d38 100644 --- a/package/iw/patches/patch-Makefile +++ b/package/iw/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- iw-0.9.14.orig/Makefile 2009-05-13 00:10:08.000000000 +0200 -+++ iw-0.9.14/Makefile 2009-06-13 09:45:08.000000000 +0200 -@@ -81,10 +81,10 @@ check: +--- iw-0.9.17.orig/Makefile 2009-08-26 11:41:41.000000000 +0200 ++++ iw-0.9.17/Makefile 2009-11-20 23:10:19.000000000 +0100 +@@ -86,10 +86,10 @@ check: install: iw iw.8.gz @$(NQ) ' INST iw' $(Q)$(MKDIR) $(DESTDIR)$(BINDIR) diff --git a/package/iw/patches/patch-version_sh b/package/iw/patches/patch-version_sh index b4f0fc044..dfc939354 100644 --- a/package/iw/patches/patch-version_sh +++ b/package/iw/patches/patch-version_sh @@ -1,13 +1,9 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iw-0.9.14.orig/version.sh 2009-05-13 00:10:08.000000000 +0200 -+++ iw-0.9.14/version.sh 2009-05-21 23:14:24.000000000 +0200 -@@ -1,23 +1,7 @@ --#!/bin/sh -+#!/usr/bin/env bash +--- iw-0.9.17.orig/version.sh 2009-08-26 11:41:41.000000000 +0200 ++++ iw-0.9.17/version.sh 2009-11-20 23:11:10.000000000 +0100 +@@ -5,20 +5,6 @@ OUT="$1" + + echo '#include "iw.h"' > "$OUT" - VERSION="0.9.14" - OUT="$1" -- -if head=`git rev-parse --verify HEAD 2>/dev/null`; then - git update-index --refresh --unmerged > /dev/null - descr=$(git describe) @@ -16,7 +12,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - # is correct... - [ "${descr%%-*}" = "v$VERSION" ] || exit 2 - -- echo -n 'const char iw_version[] = "' > "$OUT" - v="${descr#v}" - if git diff-index --name-only HEAD | read dummy ; then - v="$v"-dirty @@ -26,4 +21,4 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -fi +v="$VERSION" - echo "const char iw_version[] = \"$v\";" > "$OUT" + echo "const char iw_version[] = \"$v\";" >> "$OUT" diff --git a/package/libsigc++/Config.in b/package/libsigc++/Config.in index cf47fe9bf..3eb28a28e 100644 --- a/package/libsigc++/Config.in +++ b/package/libsigc++/Config.in @@ -20,6 +20,7 @@ config ADK_COMPILE_LIBSIGCXX_WITH_STDCXX config ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX bool "Embedded uClibc++ library" select ADK_PACKAGE_UCLIBCXX + depends on ADK_BROKEN help endchoice diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile index e056aab28..eff341b7f 100644 --- a/package/libsigc++/Makefile +++ b/package/libsigc++/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libsigc++ -PKG_VERSION:= 2.2.2 +PKG_VERSION:= 2.2.4.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= e27a20ac9bc9100f48effdfca8e8c595 +PKG_MD5SUM:= a79b2fe9de69b40e020617c7a652d704 PKG_DESCR:= Callback framework for C++ PKG_SECTION:= libs PKG_URL:= http://libsigc.sourceforge.net @@ -30,7 +30,7 @@ endif CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto -INSTALL_STYLE:= auto confprog +INSTALL_STYLE:= auto ifeq (${ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ diff --git a/package/libsigc++/patches/patch-Makefile_in b/package/libsigc++/patches/patch-Makefile_in index 8a539b06b..a69fe45b0 100644 --- a/package/libsigc++/patches/patch-Makefile_in +++ b/package/libsigc++/patches/patch-Makefile_in @@ -1,12 +1,20 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libsigc++-2.2.2.orig/Makefile.in 2008-03-10 13:11:44.000000000 +0100 -+++ libsigc++-2.2.2/Makefile.in 2008-10-10 11:05:33.000000000 +0200 -@@ -206,7 +206,7 @@ top_srcdir = @top_srcdir@ - # other stuff here - EXTRA_DIST = autogen.sh sigc++config.h.in libsigc++-2.0.spec.in - # ACLOCAL_FLAGS = -I scripts --SUBDIRS = sigc++ tests docs examples scripts MSVC_Net2003 -+SUBDIRS = sigc++ scripts - DIST_SUBDIRS = $(SUBDIRS) - sigc_configdir = $(libdir)/sigc++-2.0/include - sigc_config_DATA = sigc++config.h +--- libsigc++-2.2.4.2.orig/Makefile.in 2009-09-02 17:55:19.000000000 +0200 ++++ libsigc++-2.2.4.2/Makefile.in 2009-11-20 20:31:56.000000000 +0100 +@@ -89,7 +89,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re + distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = sigc++ tests examples docs ++DIST_SUBDIRS = sigc++ + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -239,7 +239,7 @@ top_srcdir = @top_srcdir@ + ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} + @ENABLE_DOCUMENTATION_FALSE@doc_subdirs = + @ENABLE_DOCUMENTATION_TRUE@doc_subdirs = docs +-SUBDIRS = sigc++ tests examples $(doc_subdirs) ++SUBDIRS = sigc++ + sigc_configdir = $(libdir)/$(SIGCXX_MODULE_NAME)/include + nodist_sigc_config_HEADERS = sigc++config.h + pkgconfigdir = $(libdir)/pkgconfig diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in index ab8ae5585..c77cd4425 100644 --- a/package/libtorrent/Config.in +++ b/package/libtorrent/Config.in @@ -11,7 +11,7 @@ config ADK_PACKAGE_LIBTORRENT choice prompt "C++ library to use" depends on ADK_PACKAGE_LIBTORRENT -default ADK_COMPILE_LIBTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC +default ADK_COMPILE_LIBTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC default ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC config ADK_COMPILE_LIBTORRENT_WITH_STDCXX diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 74ab79c9a..331086440 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtorrent -PKG_VERSION:= 0.12.4 +PKG_VERSION:= 0.12.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7e4b4c29a69c86c38e3e60ec11fc2255 +PKG_MD5SUM:= fe8155d364b220713074423100d4bf29 PKG_DESCR:= A bittorrent library PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libsigc++ diff --git a/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc b/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc deleted file mode 100644 index 94dc7b1a8..000000000 --- a/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc +++ /dev/null @@ -1,10 +0,0 @@ ---- libtorrent-0.12.4.orig/src/tracker/tracker_dht.cc 2008-08-26 22:18:34.000000000 +0200 -+++ libtorrent-0.12.4/src/tracker/tracker_dht.cc 2009-08-28 17:44:05.940697717 +0200 -@@ -37,6 +37,7 @@ - #include "config.h" - - #include <sstream> -+#include <cstdio> - - #include "dht/dht_router.h" - #include "torrent/connection_manager.h" diff --git a/package/nss/Makefile b/package/nss/Makefile index 931d14a8c..e3011eebb 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -5,10 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= nss PKG_VERSION:= 3.12.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 1ee3ed9c1900079319bd1de51388d856 PKG_DESCR:= Network Security Services (NSS) library PKG_SECTION:= libs +PKG_NOPARALLEL:= 1 PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/ @@ -37,7 +38,7 @@ XAKE_FLAGS+= OS_TEST=${ARCH} NSS_DISABLE_DBM=1 post-install: $(INSTALL_DIR) $(IDIR_NSS)/usr/lib - ${INSTALL_DATA} ${WRKDIST}/dist/lib/*.so $(IDIR_NSS)/usr/lib + ${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{ssl3,smime3,nss3,nssutil3}.so $(IDIR_NSS)/usr/lib ${INSTALL_DIR} ${STAGING_DIR}/usr/include/nss ${INSTALL_DATA} ${WRKDIST}/mozilla/dist/public/nss/* ${STAGING_DIR}/usr/include/nss diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in index 19df602aa..e1d033315 100644 --- a/package/rtorrent/Config.in +++ b/package/rtorrent/Config.in @@ -12,11 +12,18 @@ config ADK_PACKAGE_RTORRENT choice prompt "C++ library to use" depends on ADK_PACKAGE_RTORRENT -default ADK_COMPILE_RTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC +default ADK_COMPILE_RTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC +default ADK_COMPILE_RTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC config ADK_COMPILE_RTORRENT_WITH_STDCXX bool "Standard C++ library" select ADK_PACKAGE_LIBSTDCXX help +config ADK_COMPILE_RTORRENT_WITH_UCLIBCXX + bool "Embedded uClibc++ library" + select ADK_PACKAGE_UCLIBCXX + depends on ADK_BROKEN + help + endchoice diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index e068e8eb4..c2de864ba 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rtorrent -PKG_VERSION:= 0.8.4 +PKG_VERSION:= 0.8.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= dc0f37d933b0b6c713ad617e09441f3b +PKG_MD5SUM:= e701095e1824b7e512a17000f4c0a783 PKG_DESCR:= console torrent application PKG_SECTION:= net PKG_DEPENDS:= libncurses libtorrent libcurl @@ -23,8 +23,7 @@ CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \ LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc" endif -CONFIGURE_STYLE:= autotool gnu -CONFIGURE_ARGS+= --enable-aligned +CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/rtorrent/patches/patch-configure_ac b/package/rtorrent/patches/patch-configure_ac deleted file mode 100644 index a0252588f..000000000 --- a/package/rtorrent/patches/patch-configure_ac +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.2.orig/configure.ac 2008-05-07 14:19:12.000000000 +0200 -+++ rtorrent-0.8.2/configure.ac 2008-12-14 22:11:22.000000000 +0100 -@@ -15,7 +15,6 @@ TORRENT_DISABLE_IPV6 - - AC_SYS_LARGEFILE - --TORRENT_CHECK_EXECINFO() - TORRENT_OTFD() - - TORRENT_ENABLE_ARCH diff --git a/package/rtorrent/patches/patch-src_display_utils_h b/package/rtorrent/patches/patch-src_display_utils_h deleted file mode 100644 index 30f0eabe1..000000000 --- a/package/rtorrent/patches/patch-src_display_utils_h +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.2.orig/src/display/utils.h 2008-05-07 14:19:11.000000000 +0200 -+++ rtorrent-0.8.2/src/display/utils.h 2009-05-29 01:25:58.000000000 +0200 -@@ -38,6 +38,7 @@ - #define RTORRENT_DISPLAY_UTILS_H - - #include <ctime> -+#include <cstdio> - #include <string> - - namespace core { diff --git a/package/samba/patches/patch-source3_registry_reg_perfcount_c b/package/samba/patches/patch-source3_registry_reg_perfcount_c new file mode 100644 index 000000000..650394f73 --- /dev/null +++ b/package/samba/patches/patch-source3_registry_reg_perfcount_c @@ -0,0 +1,20 @@ +--- samba-3.4.3.orig/source3/registry/reg_perfcount.c 2009-10-29 08:47:16.000000000 +0100 ++++ samba-3.4.3/source3/registry/reg_perfcount.c 2009-11-20 21:11:54.000000000 +0100 +@@ -613,14 +613,14 @@ static bool _reg_perfcount_add_counter(P + obj = NULL; + memset(buf, 0, PERFCOUNT_MAX_LEN); + memcpy(buf, data.dptr, data.dsize); +- begin = index(buf, '['); +- end = index(buf, ']'); ++ begin = strchr(buf, '['); ++ end = strchr(buf, ']'); + if(begin == NULL || end == NULL) + return False; + start = begin+1; + + while(start < end) { +- stop = index(start, ','); ++ stop = strchr(start, ','); + if(stop == NULL) + stop = end; + *stop = '\0'; diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index 8bf6f2604..f01b739b0 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= sqlite -PKG_VERSION:= 3.6.17 +PKG_VERSION:= 3.6.20 PKG_RELEASE:= 1 -PKG_MD5SUM:= f89f62afc765e08b3f0e47cdc47a15d4 +PKG_MD5SUM:= 0faf8fc8ccff5297513c6532b2b4ce23 PKG_DESCR:= Self-contained, embeddable, zero-configuration SQL database PKG_SECTION:= libs PKG_URL:= http://www.sqlite.org @@ -25,13 +25,15 @@ CONFIGURE_ENV+= config_BUILD_CC="${HOSTCC}" \ config_TARGET_READLINE_INC="-I${STAGING_DIR}/usr/include" \ config_TARGET_READLINE_LIBS="-L${STAGING_DIR}/usr/lib -lreadline -lncurses" MAKE_FLAGS+= LIBPTHREAD=-lm -CONFIGURE_ARGS+= --disable-tcl +CONFIGURE_ARGS+= --disable-tcl \ + --without-tcl \ + --disable-amalgamation BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBSQLITE}/usr/lib - ${CP} ${WRKINST}/usr/lib/libsqlite3.so.* ${IDIR_LIBSQLITE}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libsqlite3.so* ${IDIR_LIBSQLITE}/usr/lib/ ${INSTALL_DIR} ${IDIR_SQLITE_CLI}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/sqlite3 ${IDIR_SQLITE_CLI}/usr/bin/ diff --git a/package/sqlite/extra/sqlite3.h b/package/sqlite/extra/sqlite3.h new file mode 100644 index 000000000..fc015b08e --- /dev/null +++ b/package/sqlite/extra/sqlite3.h @@ -0,0 +1,5772 @@ +/* +** 2001 September 15 +** +** The author disclaims copyright to this source code. In place of +** a legal notice, here is a blessing: +** +** May you do good and not evil. +** May you find forgiveness for yourself and forgive others. +** May you share freely, never taking more than you give. +** +************************************************************************* +** This header file defines the interface that the SQLite library +** presents to client programs. If a C-function, structure, datatype, +** or constant definition does not appear in this file, then it is +** not a published API of SQLite, is subject to change without +** notice, and should not be referenced by programs that use SQLite. +** +** Some of the definitions that are in this file are marked as +** "experimental". Experimental interfaces are normally new +** features recently added to SQLite. We do not anticipate changes +** to experimental interfaces but reserve the right to make minor changes +** if experience from use "in the wild" suggest such changes are prudent. +** +** The official C-language API documentation for SQLite is derived +** from comments in this file. This file is the authoritative source +** on how SQLite interfaces are suppose to operate. +** +** The name of this file under configuration management is "sqlite.h.in". +** The makefile makes some minor changes to this file (such as inserting +** the version number) and changes its name to "sqlite3.h" as +** part of the build process. +*/ +#ifndef _SQLITE3_H_ +#define _SQLITE3_H_ +#include <stdarg.h> /* Needed for the definition of va_list */ + +/* +** Make sure we can call this stuff from C++. +*/ +#ifdef __cplusplus +extern "C" { +#endif + + +/* +** Add the ability to override 'extern' +*/ +#ifndef SQLITE_EXTERN +# define SQLITE_EXTERN extern +#endif + +#ifndef SQLITE_API +# define SQLITE_API +#endif + + +/* +** These no-op macros are used in front of interfaces to mark those +** interfaces as either deprecated or experimental. New applications +** should not use deprecated interfaces - they are support for backwards +** compatibility only. Application writers should be aware that +** experimental interfaces are subject to change in point releases. +** +** These macros used to resolve to various kinds of compiler magic that +** would generate warning messages when they were used. But that +** compiler magic ended up generating such a flurry of bug reports +** that we have taken it all out and gone back to using simple +** noop macros. +*/ +#define SQLITE_DEPRECATED +#define SQLITE_EXPERIMENTAL + +/* +** Ensure these symbols were not defined by some previous header file. +*/ +#ifdef SQLITE_VERSION +# undef SQLITE_VERSION +#endif +#ifdef SQLITE_VERSION_NUMBER +# undef SQLITE_VERSION_NUMBER +#endif + +/* +** CAPI3REF: Compile-Time Library Version Numbers {H10010} <S60100> +** +** The SQLITE_VERSION and SQLITE_VERSION_NUMBER #defines in +** the sqlite3.h file specify the version of SQLite with which +** that header file is associated. +** +** The "version" of SQLite is a string of the form "W.X.Y" or "W.X.Y.Z". +** The W value is major version number and is always 3 in SQLite3. +** The W value only changes when backwards compatibility is +** broken and we intend to never break backwards compatibility. +** The X value is the minor version number and only changes when +** there are major feature enhancements that are forwards compatible +** but not backwards compatible. +** The Y value is the release number and is incremented with +** each release but resets back to 0 whenever X is incremented. +** The Z value only appears on branch releases. +** +** The SQLITE_VERSION_NUMBER is an integer that is computed as +** follows: +** +** <blockquote><pre> +** SQLITE_VERSION_NUMBER = W*1000000 + X*1000 + Y +** </pre></blockquote> +** +** Since version 3.6.18, SQLite source code has been stored in the +** <a href="http://www.fossil-scm.org/">fossil configuration management +** system</a>. The SQLITE_SOURCE_ID +** macro is a string which identifies a particular check-in of SQLite +** within its configuration management system. The string contains the +** date and time of the check-in (UTC) and an SHA1 hash of the entire +** source tree. +** +** See also: [sqlite3_libversion()], +** [sqlite3_libversion_number()], [sqlite3_sourceid()], +** [sqlite_version()] and [sqlite_source_id()]. +** +** Requirements: [H10011] [H10014] +*/ +#define SQLITE_VERSION "3.6.20" +#define SQLITE_VERSION_NUMBER 3006020 +#define SQLITE_SOURCE_ID "2009-11-04 13:30:02 eb7a544fe49d1626bacecfe53ddc03fe082e3243" + +/* +** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100> +** KEYWORDS: sqlite3_version +** +** These interfaces provide the same information as the [SQLITE_VERSION], +** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] #defines in the header, +** but are associated with the library instead of the header file. Cautious +** programmers might include assert() statements in their application to +** verify that values returned by these interfaces match the macros in +** the header, and thus insure that the application is +** compiled with matching library and header files. +** +** <blockquote><pre> +** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER ); +** assert( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)==0 ); +** assert( strcmp(sqlite3_libversion,SQLITE_VERSION)==0 ); +** </pre></blockquote> +** +** The sqlite3_libversion() function returns the same information as is +** in the sqlite3_version[] string constant. The function is provided +** for use in DLLs since DLL users usually do not have direct access to string +** constants within the DLL. Similarly, the sqlite3_sourceid() function +** returns the same information as is in the [SQLITE_SOURCE_ID] #define of +** the header file. +** +** See also: [sqlite_version()] and [sqlite_source_id()]. +** +** Requirements: [H10021] [H10022] [H10023] +*/ +SQLITE_API SQLITE_EXTERN const char sqlite3_version[]; +SQLITE_API const char *sqlite3_libversion(void); +SQLITE_API const char *sqlite3_sourceid(void); +SQLITE_API int sqlite3_libversion_number(void); + +/* |