pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/fox Fix pthread detection, force non-threadsafe ve...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6e14f6cad0bb
branches: trunk
changeset: 515159:6e14f6cad0bb
user: joerg <joerg%pkgsrc.org@localhost>
date: Mon Jun 26 13:12:00 2006 +0000
description:
Fix pthread detection, force non-threadsafe version for DragonFly due
to lack of getpwuid_r and friends.
diffstat:
x11/fox/Makefile | 7 +++++--
x11/fox/distinfo | 4 ++--
x11/fox/patches/patch-aa | 28 +++++++++++++++++++++++++++-
3 files changed, 34 insertions(+), 5 deletions(-)
diffs (84 lines):
diff -r a9545133cecf -r 6e14f6cad0bb x11/fox/Makefile
--- a/x11/fox/Makefile Mon Jun 26 13:05:19 2006 +0000
+++ b/x11/fox/Makefile Mon Jun 26 13:12:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/04/17 13:45:58 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/06/26 13:12:00 joerg Exp $
DISTNAME= fox-1.4.17
PKGREVISION= 2
@@ -17,10 +17,12 @@
CONFIGURE_ARGS+= --with-shm
CONFIGURE_ARGS+= --with-x
+CONFIGURE_ENV+= REAL_PTHREAD_LIBS=${PTHREAD_LIBS:Q}
+
.include "../../mk/bsd.prefs.mk"
# NetBSD < 3.0 does not have getpwnam_r() getpwuin_r()
-.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[1-2]*)
+.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[1-2]*) || ${OPSYS} == "DragonFly"
CONFIGURE_ARGS+= --disable-threadsafe
.endif
@@ -29,5 +31,6 @@
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r a9545133cecf -r 6e14f6cad0bb x11/fox/distinfo
--- a/x11/fox/distinfo Mon Jun 26 13:05:19 2006 +0000
+++ b/x11/fox/distinfo Mon Jun 26 13:12:00 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2005/08/02 10:26:43 adam Exp $
+$NetBSD: distinfo,v 1.12 2006/06/26 13:12:00 joerg Exp $
SHA1 (fox-1.4.17.tar.gz) = d3636ad3e1e6b3ba66ce88af9063030469f55e89
RMD160 (fox-1.4.17.tar.gz) = 13915ec4164ef7ba7a38d3e64cd7e8b6663ca974
Size (fox-1.4.17.tar.gz) = 4022067 bytes
-SHA1 (patch-aa) = 04e387ae07788640871f83d45290eb3b94453f8c
+SHA1 (patch-aa) = d9e0e66b4dd9eadde585757ef9a698c07ebbf884
diff -r a9545133cecf -r 6e14f6cad0bb x11/fox/patches/patch-aa
--- a/x11/fox/patches/patch-aa Mon Jun 26 13:05:19 2006 +0000
+++ b/x11/fox/patches/patch-aa Mon Jun 26 13:12:00 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2005/08/02 10:26:43 adam Exp $
+$NetBSD: patch-aa,v 1.4 2006/06/26 13:12:00 joerg Exp $
--- configure.orig 2005-08-02 00:16:27.000000000 +0000
+++ configure
@@ -10,6 +10,32 @@
echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+@@ -23331,13 +23330,13 @@ fi
+
+ PTHREAD_LIBS=notfound
+ if test "x$PTHREAD_LIBS" = xnotfound; then
+-echo "$as_me:$LINENO: checking for pthread_exit in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_exit in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_exit in ${PTHREAD_LDFLAGS} ${REAL_PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${REAL_PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -23396,7 +23395,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_exit" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_exit" >&6
+ if test $ac_cv_lib_pthread_pthread_exit = yes; then
+- PTHREAD_LIBS="-lpthread"
++ PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${REAL_PTHREAD_LIBS}"
+ fi
+
+ fi
@@ -25467,7 +25466,7 @@ fi;
echo "$as_me:$LINENO: result: $enable_release" >&5
echo "${ECHO_T}$enable_release" >&6
Home |
Main Index |
Thread Index |
Old Index