From: mlcreech Date: Sun, 9 Mar 2008 02:20:11 +0000 (+0000) Subject: Fix for #1802, #2041, and #2270 - link libsqlite with -lrt (CVS 4848) X-Git-Tag: version-3.6.10~1329 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c658b0ffb898232250a9deab9a90960ebdac264b;p=thirdparty%2Fsqlite.git Fix for #1802, #2041, and #2270 - link libsqlite with -lrt (CVS 4848) FossilOrigin-Name: ccd70a6ee495a02362161b4004597fa191d46bc2 --- diff --git a/Makefile.in b/Makefile.in index bb9e946218..0a3b4b1275 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,15 +54,12 @@ LIBREADLINE = @TARGET_READLINE_LIBS@ # TCC += -DSQLITE_THREADSAFE=@SQLITE_THREADSAFE@ -# The pthreads library if needed -# -LIBPTHREAD=@TARGET_THREAD_LIB@ - # Do threads override each others locks by default (1), or do we test (-1) # TCC += -DSQLITE_THREAD_OVERRIDE_LOCK=@THREADSOVERRIDELOCKS@ -# The fdatasync library +# Any target libraries which libsqlite must be linked against +# TLIBS = @LIBS@ # Flags controlling use of the in memory btree implementation @@ -361,17 +358,17 @@ last_change: $(SRC) | $(NAWK) '{print $$5,$$6}' >last_change libsqlite3.la: $(LIBOBJ) - $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ + $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TLIBS) \ ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8" libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ - $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \ + $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TLIBS) \ -rpath $(libdir)/sqlite \ -version-info "8:6:8" sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h - $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \ + $(LTLINK) $(READLINE_FLAGS) \ -o $@ $(TOP)/src/shell.c libsqlite3.la \ $(LIBREADLINE) $(TLIBS) diff --git a/configure b/configure index d49875718b..2e21368de3 100755 --- a/configure +++ b/configure @@ -844,7 +844,6 @@ RELEASE VERSION_NUMBER BUILD_CC SQLITE_THREADSAFE -TARGET_THREAD_LIB XTHREADCONNECT THREADSOVERRIDELOCKS ALLOWRELEASE @@ -1946,7 +1945,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # The following RCS revision string applies to configure.in -# $Revision: 1.51 $ +# $Revision: 1.52 $ ######### # Programs needed @@ -3697,7 +3696,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3700 "configure"' > conftest.$ac_ext + echo '#line 3699 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6376,11 +6375,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6379: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6378: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6383: \$? = $ac_status" >&5 + echo "$as_me:6382: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6644,11 +6643,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6647: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6646: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6651: \$? = $ac_status" >&5 + echo "$as_me:6650: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6748,11 +6747,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6751: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6750: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6755: \$? = $ac_status" >&5 + echo "$as_me:6754: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9093,7 +9092,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11531: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11536: \$? = $ac_status" >&5 + echo "$as_me:11535: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11633,11 +11632,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11636: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11635: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11640: \$? = $ac_status" >&5 + echo "$as_me:11639: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13240,11 +13239,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13243: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13242: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13247: \$? = $ac_status" >&5 + echo "$as_me:13246: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13344,11 +13343,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13347: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13346: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13351: \$? = $ac_status" >&5 + echo "$as_me:13350: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15579,11 +15578,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15582: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15581: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15586: \$? = $ac_status" >&5 + echo "$as_me:15585: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15847,11 +15846,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15850: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15849: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15854: \$? = $ac_status" >&5 + echo "$as_me:15853: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15951,11 +15950,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15954: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15953: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15958: \$? = $ac_status" >&5 + echo "$as_me:15957: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19776,15 +19775,12 @@ fi if test "$SQLITE_THREADSAFE" = "1"; then - LIBS="" - -{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then + { echo "$as_me:$LINENO: checking for library containing pthread_create" >&5 +echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6; } +if test "${ac_cv_search_pthread_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19807,7 +19803,14 @@ return pthread_create (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' pthread; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -19825,35 +19828,37 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_pthread_pthread_create=yes + ac_cv_search_pthread_create=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pthread_pthread_create=no + fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_pthread_create+set}" = set; then + break fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; } -if test $ac_cv_lib_pthread_pthread_create = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBPTHREAD 1 -_ACEOF - - LIBS="-lpthread $LIBS" - +done +if test "${ac_cv_search_pthread_create+set}" = set; then + : +else + ac_cv_search_pthread_create=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_search_pthread_create" >&6; } +ac_res=$ac_cv_search_pthread_create +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - TARGET_THREAD_LIB="$LIBS" - LIBS="" -else - TARGET_THREAD_LIB="" fi +fi ########## # Do we want to allow a connection created in one thread to be used @@ -21462,7 +21467,6 @@ RELEASE!$RELEASE$ac_delim VERSION_NUMBER!$VERSION_NUMBER$ac_delim BUILD_CC!$BUILD_CC$ac_delim SQLITE_THREADSAFE!$SQLITE_THREADSAFE$ac_delim -TARGET_THREAD_LIB!$TARGET_THREAD_LIB$ac_delim XTHREADCONNECT!$XTHREADCONNECT$ac_delim THREADSOVERRIDELOCKS!$THREADSOVERRIDELOCKS$ac_delim ALLOWRELEASE!$ALLOWRELEASE$ac_delim @@ -21481,6 +21485,7 @@ TCL_LIB_FILE!$TCL_LIB_FILE$ac_delim TCL_LIB_FLAG!$TCL_LIB_FLAG$ac_delim TCL_LIB_SPEC!$TCL_LIB_SPEC$ac_delim TCL_STUB_LIB_FILE!$TCL_STUB_LIB_FILE$ac_delim +TCL_STUB_LIB_FLAG!$TCL_STUB_LIB_FLAG$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -21522,7 +21527,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -TCL_STUB_LIB_FLAG!$TCL_STUB_LIB_FLAG$ac_delim TCL_STUB_LIB_SPEC!$TCL_STUB_LIB_SPEC$ac_delim HAVE_TCL!$HAVE_TCL$ac_delim TARGET_READLINE_LIBS!$TARGET_READLINE_LIBS$ac_delim @@ -21536,7 +21540,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 8e7ce9623d..839b63eb2d 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,7 @@ AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n'])) dnl Put the RCS revision string after AC_INIT so that it will also dnl show in in configure. # The following RCS revision string applies to configure.in -# $Revision: 1.37 $ +# $Revision: 1.38 $ ######### # Programs needed @@ -204,14 +204,8 @@ fi AC_SUBST(SQLITE_THREADSAFE) if test "$SQLITE_THREADSAFE" = "1"; then - LIBS="" - AC_CHECK_LIB(pthread, pthread_create) - TARGET_THREAD_LIB="$LIBS" - LIBS="" -else - TARGET_THREAD_LIB="" + AC_SEARCH_LIBS(pthread_create, pthread) fi -AC_SUBST(TARGET_THREAD_LIB) ########## # Do we want to allow a connection created in one thread to be used diff --git a/manifest b/manifest index 9487674430..a2c9a6cf18 100644 --- a/manifest +++ b/manifest @@ -1,7 +1,7 @@ -C Change\s\sto\s"sqlite3.h"\sin\s#includes\s(CVS\s4847) -D 2008-03-09T02:00:20 +C Fix\sfor\s#1802,\s#2041,\sand\s#2270\s-\slink\slibsqlite\swith\s-lrt\s(CVS\s4848) +D 2008-03-09T02:20:11 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 -F Makefile.in d521464011d6965bbda1b699f1850c6e33141c73 +F Makefile.in 43632cf376a6aa25c91711a50a3c584fc4e0f36f F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac F VERSION 2e206fc9458bf10a8c3ba2d13bf521a04ef441c6 @@ -16,8 +16,8 @@ F art/nocopy.gif 716aa07d4bb7250d4e75756073bf8ef9f56bec8f F art/powered_by_sqlite.gif 7fbcd7d3675391fd3d21672c14c05f5999eb60d1 F config.guess dba2d1300ec8f8cd00c6fb44b9edde21c14e960c F config.sub 9a842e7c332ed65cef3f2c20354e06dc998b2796 -F configure fa502784b1efa3038d4d8ae0ab2eecd100102a1b x -F configure.ac 63c0c01703f4c19ee9d65998ddfcbd6496982210 +F configure 4bb2a7714734900dd8f49e0eb0e2556c2bf129e1 x +F configure.ac d587b392e1b92ad60cf14dacf74806e773f83d6c F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac @@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 9894d2ce418180b874406a7407e019dc872f289a -R dddbe4a2ad5e6cb4902a9c11cece403b +P 98e55fa4d32c4579d54b3a8cc26abdb3c8148e13 +R 1e7314b15a5dee3b574fd286539e39a5 U mlcreech -Z 990a18886adc61b96972dd27d203a36e +Z 21663c7e9ed3939bafa77fde47a22a2e diff --git a/manifest.uuid b/manifest.uuid index 786e214bb3..5e84fa815b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -98e55fa4d32c4579d54b3a8cc26abdb3c8148e13 \ No newline at end of file +ccd70a6ee495a02362161b4004597fa191d46bc2 \ No newline at end of file