From 1ed4e64c7f67c17a0cb017817761ffc4dfa82d2c Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Thu, 2 Apr 2009 20:17:29 +0000
Subject: sqlite: use LDFLAGS (fixes QA error)

---
 .../sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch    | 18 ++++++++++--------
 recipes/sqlite/sqlite_2.8.17.bb                        |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'recipes/sqlite')

diff --git a/recipes/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch b/recipes/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch
index e936f81c72..914422f1df 100644
--- a/recipes/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch
+++ b/recipes/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch
@@ -1,6 +1,6 @@
-diff -bur sqlite-2.8.17~orig/main.mk sqlite-2.8.17/main.mk
---- sqlite-2.8.17~orig/main.mk	2005-04-23 17:43:23.000000000 -0500
-+++ sqlite-2.8.17/main.mk	2006-02-13 03:31:03.000000000 -0600
+diff -urN sqlite-2.8.17.orig/main.mk sqlite-2.8.17/main.mk
+--- sqlite-2.8.17.orig/main.mk	2005-04-23 22:43:23.000000000 +0000
++++ sqlite-2.8.17/main.mk	2009-04-02 20:10:36.000000000 +0000
 @@ -139,7 +139,7 @@
  # This is the default Makefile target.  The objects listed here
  # are what get build when you type just "make" with no arguments.
@@ -17,13 +17,15 @@ diff -bur sqlite-2.8.17~orig/main.mk sqlite-2.8.17/main.mk
 -libsqlite.a:	$(LIBOBJ)
 -	$(AR) libsqlite.a $(LIBOBJ)
 -	$(RANLIB) libsqlite.a
-+libsqlite.so:	$(LIBOBJ)
-+	$(CC) -shared -o libsqlite.so -Wl,-soname,libsqlite.so.0 $(LIBOBJ)
- 
+-
 -sqlite$(EXE):	$(TOP)/src/shell.c libsqlite.a sqlite.h
-+sqlite$(EXE):	$(TOP)/src/shell.c libsqlite.so sqlite.h
- 	$(TCCX) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \
+-	$(TCCX) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \
 -		libsqlite.a $(LIBREADLINE) $(THREADLIB)
++libsqlite.so:	$(LIBOBJ)
++	$(CC) $(LDFLAGS) -shared -o libsqlite.so -Wl,-soname,libsqlite.so.0 $(LIBOBJ)
++
++sqlite$(EXE):	$(TOP)/src/shell.c libsqlite.so sqlite.h
++	$(TCCX) $(LDFLAGS) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \
 +		-lsqlite $(LIBREADLINE) $(THREADLIB)
  
  sqlite_analyzer$(EXE):	$(TOP)/src/tclsqlite.c libsqlite.a $(TESTSRC) \
diff --git a/recipes/sqlite/sqlite_2.8.17.bb b/recipes/sqlite/sqlite_2.8.17.bb
index b5939d9848..9f6ec7efe2 100644
--- a/recipes/sqlite/sqlite_2.8.17.bb
+++ b/recipes/sqlite/sqlite_2.8.17.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "readline ncurses"
 LICENSE = "PD"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \
        file://mainmk_build_dynamic.patch;patch=1 \
-- 
cgit 1.2.3-korg