cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use -pthread not -lpthread. Library major bump for safety.

Browse Source 
Inadvertently broken in last commit; the patch to the configure script
is fiddly and easily broken, so use extra lines of context for this patch
and add a warning comment.

Problem reported by James Turner, thanks!
This commit is contained in:
sthen 2012-01-07 13:47:52 +00:00
parent 859422beb1
commit c4d936d08a
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
databases/sqlite3/Makefile
View File

@ -1,16 +1,17 @@
# $OpenBSD: Makefile,v 1.60 2011/12/21 00:38:11 nigel Exp $
# $OpenBSD: Makefile,v 1.61 2012/01/07 13:47:52 sthen Exp $
COMMENT-main= embedded SQL implementation
COMMENT-tcl= TCL bindings for Sqlite3
COMMENT-lemon= LEMON LALR(1) parser generator
V= 3.7.9
REVISION= 0
DISTNAME= sqlite-src-3070900
EXTRACT_SUFX = .zip
PKGNAME-main= sqlite3-${V}
PKGNAME-tcl= sqlite3-tcl-${V}
PKGNAME-lemon= lemon-${V}
CATEGORIES= databases
SHARED_LIBS += sqlite3 15.2 # .8.6
SHARED_LIBS += sqlite3 16.0 # .8.6
MASTER_SITES= ${HOMEPAGE}
@ -46,7 +47,7 @@ MULTI_PACKAGES=-main -lemon -tcl
.include <bsd.port.arch.mk>
.if !${PROPERTIES:Mno_shared}
CONFIGURE_ARGS += --enable-load-extension
CONFIGURE_ARGS += --enable-load-extension
.endif
.if ${BUILD_PACKAGES:M-tcl}

21
databases/sqlite3/patches/patch-configure
View File

@ -1,7 +1,17 @@
$OpenBSD: patch-configure,v 1.12 2011/12/21 00:38:11 nigel Exp $
$OpenBSD: patch-configure,v 1.13 2012/01/07 13:47:52 sthen Exp $
XXX careful! this must apply to pthread and not any other lib.
if updating, to include additional context to help avoid problems later,
use a hand-rolled patch or 'make update-patches DIFF_ARGS=-u6'.
--- configure.orig Tue Nov 1 12:31:18 2011
+++ configure Sun Dec 18 11:43:24 2011
@@ -11231,8 +11231,8 @@ for ac_lib in '' dl; do
+++ configure Fri Jan 6 22:20:01 2012
@@ -10540,14 +10540,14 @@ return pthread_create ();
}
_ACEOF
for ac_lib in '' pthread; do
if test -z "$ac_lib"; then
ac_res="none required"
else
@ -11,4 +21,7 @@ $OpenBSD: patch-configure,v 1.12 2011/12/21 00:38:11 nigel Exp $
+ LIBS="-$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_dlopen=$ac_res
ac_cv_search_pthread_create=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext