Fix pthread usage.
This commit is contained in:
parent
a9d025fbb3
commit
3f230bbeed
3 changed files with 34 additions and 2 deletions
|
@ -1,4 +1,4 @@
|
||||||
# $NetBSD: Makefile,v 1.2 2006/11/25 20:47:57 rillig Exp $
|
# $NetBSD: Makefile,v 1.3 2006/12/01 20:51:25 joerg Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
DISTNAME= worker-2.14.1
|
DISTNAME= worker-2.14.1
|
||||||
|
@ -22,4 +22,5 @@ REPLACE_BASH+= scripts/*.sh scripts/*r
|
||||||
USE_TOOLS+= bash:run
|
USE_TOOLS+= bash:run
|
||||||
|
|
||||||
.include "../../mk/x11.buildlink3.mk"
|
.include "../../mk/x11.buildlink3.mk"
|
||||||
|
.include "../../mk/pthread.buildlink3.mk"
|
||||||
.include "../../mk/bsd.pkg.mk"
|
.include "../../mk/bsd.pkg.mk"
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
$NetBSD: distinfo,v 1.1.1.1 2006/11/25 15:41:26 uebayasi Exp $
|
$NetBSD: distinfo,v 1.2 2006/12/01 20:51:25 joerg Exp $
|
||||||
|
|
||||||
SHA1 (worker-2.14.1.tar.gz) = 0e88043a00d12b477f098533cd0f163833221a37
|
SHA1 (worker-2.14.1.tar.gz) = 0e88043a00d12b477f098533cd0f163833221a37
|
||||||
RMD160 (worker-2.14.1.tar.gz) = 27cab3bd31ad440626946bfc445fa75be9545165
|
RMD160 (worker-2.14.1.tar.gz) = 27cab3bd31ad440626946bfc445fa75be9545165
|
||||||
Size (worker-2.14.1.tar.gz) = 1000621 bytes
|
Size (worker-2.14.1.tar.gz) = 1000621 bytes
|
||||||
|
SHA1 (patch-aa) = a2b89fba47a8d51e808a76bce8e2c1ce028c8572
|
||||||
|
|
30
x11/worker/patches/patch-aa
Normal file
30
x11/worker/patches/patch-aa
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
$NetBSD: patch-aa,v 1.1 2006/12/01 20:51:26 joerg Exp $
|
||||||
|
|
||||||
|
--- configure.orig 2006-12-01 20:25:16.000000000 +0000
|
||||||
|
+++ configure
|
||||||
|
@@ -10135,13 +10135,13 @@ fi
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
|
||||||
|
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
|
||||||
|
+echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
|
||||||
|
+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
|
||||||
|
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
-LIBS="-lpthread $LIBS"
|
||||||
|
+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
#line $LINENO "configure"
|
||||||
|
/* confdefs.h. */
|
||||||
|
@@ -10194,7 +10194,7 @@ if test $ac_cv_lib_pthread_pthread_creat
|
||||||
|
#define HAVE_LIBPTHREAD 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
- LIBS="$LIBS -lpthread"
|
||||||
|
+ LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
|
||||||
|
CPPFLAGS="-D_REENTRANT $CPPFLAGS"
|
||||||
|
|
||||||
|
else
|
Loading…
Reference in a new issue