X-Recipient: archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status: No, hits=-2.1 required=5.0	tests=AWL,BAYES_00,KHOP_THREADED,RCVD_NUMERIC_HELO,SPF_HELO_PASS,TW_FN,T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
To: cygwin AT cygwin DOT com
From: Achim Gratz <Stromeko AT NexGo DOT DE>
Subject: Re: [RFU] SQlite3 (was: Something fishy going on with sqlite3...)
Date: Mon, 4 Jun 2012 08:11:00 +0000 (UTC)
Lines: 60
Message-ID: <loom.20120604T095327-586@post.gmane.org>
References: <87aa3hd4a5 DOT fsf AT Rainer DOT invalid> <jjti4r$2t7$1 AT dough DOT gmane DOT org>	<8762e5d3le DOT fsf AT Rainer DOT invalid> <jjtkmo$po1$1 AT dough DOT gmane DOT org> <871uotd0ub DOT fsf AT Rainer DOT invalid> <jjtqmt$93i$1 AT dough DOT gmane DOT org> <loom DOT 20120316T080148-390 AT post DOT gmane DOT org> <loom DOT 20120403T153444-198 AT post DOT gmane DOT org> <4F7B8E9A DOT 100 AT etr-usa DOT com> <loom DOT 20120404T093239-277 AT post DOT gmane DOT org> <4F7CADC3 DOT 9080603 AT etr-usa DOT com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
User-Agent: Loom/3.14 (http://gmane.org/)
X-IsSubscribed: yes
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id: <cygwin.cygwin.com>
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com

Hi Warren,

There's a new version for SQlite3 released.  I've put the fix in the source
patch now and removed the define from the CPPFLAGS, also ignoring sqlite3.pc for
the diff.

(watch for the linewraps)

-------8<-------->8-------
--- origsrc/sqlite-autoconf-3071201/sqlite3.c   2012-05-22 13:03:53 +0200
+++ src/sqlite-autoconf-3071201/sqlite3.c       2012-06-04 10:05:17 +0200
@@ -9263,7 +9263,7 @@ SQLITE_PRIVATE void sqlite3PCacheSetDefa
 #if !defined(SQLITE_OS_UNIX) && !defined(SQLITE_OS_OTHER)
 # define SQLITE_OS_OTHER 0
 # ifndef SQLITE_OS_WIN
-#   if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) ||\
 defined(__MINGW32__) || defined(__BORLANDC__)
+#   if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) ||\
 defined(__BORLANDC__)
 #     define SQLITE_OS_WIN 1
 #     define SQLITE_OS_UNIX 0
 #     define SQLITE_OS_OS2 0
@@ -35626,8 +35626,7 @@ static int winFullPathname(

 #if defined(__CYGWIN__)
   SimulateIOError( return SQLITE_ERROR );
-  UNUSED_PARAMETER(nFull);
-  cygwin_conv_to_full_win32_path(zRelative, zFull);
+  cygwin_conv_path(CCP_POSIX_TO_WIN_A, zRelative, zFull, nFull);
   return SQLITE_OK;
 #endif

-------8<-------->8-------

-------8<-------->8-------
ORIG_PN="sqlite"
ORIG_PV=`echo $PV|tr . " " |\
 awk -e '{printf "%1d%02d%02d%02d", $1, $2, $3, $4;}'`
DESCRIPTION="SQLite database library"
HOMEPAGE="http://www.sqlite.org/"
SRC_URI="http://www.sqlite.org/${ORIG_PN}-autoconf-${ORIG_PV}.tar.gz"
SRC_DIR="${ORIG_PN}-autoconf-${ORIG_PV}"

PKG_NAMES="${PN} lib${PN}_0 lib${PN}-devel"
PKG_HINTS='setup lib devel'
PKG_CONTENTS[0]='usr/bin/*.exe usr/share/'
PKG_CONTENTS[1]='usr/bin/*.dll'
PKG_CONTENTS[2]='usr/include/ usr/lib/'

DIFF_EXCLUDES=sqlite3.pc

CYGCONF_ARGS="CC=gcc-4 CXX=g++-4"
# define -DSQLITE_OS_UNIX to avoid Cygwin being recognized as "Windows"
CPPFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS3\
 $CPPFLAGS -DSQLITE_ENABLE_FTS_PARENTHESIS -DSQLITE_ENABLE_FTS4"
-------8<-------->8-------

Regards,
Achim.



--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple