From: Jan Engelhardt <jeng...@inai.de>
Date: 2013-09-04 12:52:32.851115468 +0200

build: resolve link failure in sqlite3 module

The sqlite3 backend fails to link because the wrong library name is
used. (Ideally, libdbi-drivers should use PKG_CHECK_MODULES instead.)

---
 acinclude.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: libdbi-drivers-0.9.0/acinclude.m4
===================================================================
--- libdbi-drivers-0.9.0.orig/acinclude.m4
+++ libdbi-drivers-0.9.0/acinclude.m4
@@ -310,7 +310,7 @@ if test "$ac_sqlite3" = "yes"; then
 		AC_SEARCH_LIBS_VAR([sqlite3_exec], sqlite3, , , , SQLITE3_LIBS)
 		SQLITE3_LDFLAGS=""
 	else
-		SQLITE3_LIBS=-lsqlite
+		SQLITE3_LIBS=-lsqlite3
 		SQLITE3_LDFLAGS=-L$ac_sqlite3_libdir
 	fi
 
From: Jan Engelhardt <jeng...@inai.de>
Date: 2013-09-07 22:51:05.518210575 +0200

build: resolve rpmlint aborting due to bad code

gcc:
src/constraint.c:167:32: warning: initialization makes pointer from integer without a cast [enabled by default]
src/constraint.c:168:5: warning: passing argument 1 of 'matches' makes pointer from integer without a cast [enabled by default]
src/constraint.c:168:5: note: expected 'const void *' but argument is of type 'intptr_t'

rpmlint:
E: libdbi-drivers 64bit-portability-issue src/constraint.c:167, 168

---
 tests/cgreen/src/constraint.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: libdbi-drivers-0.9.0/tests/cgreen/src/constraint.c
===================================================================
--- libdbi-drivers-0.9.0.orig/tests/cgreen/src/constraint.c
+++ libdbi-drivers-0.9.0/tests/cgreen/src/constraint.c
@@ -164,8 +164,8 @@ static void test_want_double(Constraint
 }
 
 static int compare_using_matcher(Constraint *constraint, intptr_t actual) {
-	int (*matches)(const void*) = constraint->expected;
-    return matches(actual);
+	int (*matches)(const void*) = (void *)(intptr_t)constraint->expected;
+    return matches((void *)actual);
 }
 
 static void test_with_matcher(Constraint *constraint, const char *function, const char* matcher_name, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter) {
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
_______________________________________________
Libdbi-drivers-devel mailing list
Libdbi-drivers-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libdbi-drivers-devel

Reply via email to