diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-04 22:06:23 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-04 22:06:23 +0100 |
| commit | 783c5c8160ab86b9502a33ad9144fdefeb0e0084 (patch) | |
| tree | 6c54622698900bb666eb78019bcf732f95ac6fa1 /package/sqlite | |
| parent | 71855c832d1b9f1557f3663570d2adf9422d8df5 (diff) | |
| parent | 71d64690550602953eea0737507cbc47999b4126 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/sqlite')
| -rw-r--r-- | package/sqlite/Makefile | 5 | ||||
| -rw-r--r-- | package/sqlite/patches/patch-configure | 22 |
2 files changed, 25 insertions, 2 deletions
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index 175c53518..d1c290edf 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -26,6 +26,7 @@ CONFIGURE_ENV+= config_BUILD_CC="${CC_FOR_BUILD}" \ config_TARGET_CFLAGS="${TARGET_CFLAGS}" \ config_TARGET_READLINE_INC="-I${STAGING_TARGET_DIR}/usr/include" \ config_TARGET_READLINE_LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lreadline -lncurses" + MAKE_FLAGS+= LIBPTHREAD=-lm TARGET_CPPFLAGS+= -DSQLITE_SECURE_DELETE=1 CONFIGURE_ARGS+= --disable-tcl \ @@ -34,8 +35,8 @@ CONFIGURE_ARGS+= --disable-tcl \ 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/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/sqlite3 ${IDIR_SQLITE_CLI}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sqlite/patches/patch-configure b/package/sqlite/patches/patch-configure new file mode 100644 index 000000000..f4a1d91fd --- /dev/null +++ b/package/sqlite/patches/patch-configure @@ -0,0 +1,22 @@ +--- sqlite-3.7.3.orig/configure 2010-10-07 16:48:41.000000000 +0200 ++++ sqlite-3.7.3/configure 2011-03-04 21:58:45.000000000 +0100 +@@ -12389,8 +12389,8 @@ fi + # generate command-line programs that run on the build machine. + # + if test x"$cross_compiling" = xno; then +- BUILD_CC=$CC +- BUILD_CFLAGS=$CFLAGS ++ BUILD_CC=$CC_FOR_BUILD ++ BUILD_CFLAGS=$CFLAGS_FOR_BUILD + else + if test "${BUILD_CC+set}" != set; then + for ac_prog in gcc cc cl +@@ -12437,7 +12437,7 @@ done + + fi + if test "${BUILD_CFLAGS+set}" != set; then +- BUILD_CFLAGS="-g" ++ BUILD_CFLAGS=$CFLAGS_FOR_BUILD + fi + fi + |