diff options
| author | joerg <joerg@pkgsrc.org> | 2006-01-03 20:54:15 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-01-03 20:54:15 +0000 |
| commit | 77682d00ba2872abf81ab6247cddade8e370ae25 (patch) | |
| tree | c6928760cd05dab7cf39455badf9bc50b82709f6 /math/qalculate/patches | |
| parent | a485b489e3fe3bda9608352907ab2388f5303f90 (diff) | |
| download | pkgsrc-77682d00ba2872abf81ab6247cddade8e370ae25.tar.gz | |
pthread user => include pthread.b3.mk. Use PTHREAD_* instead of
hard-wired -lpthread. Use sys/wait.h on DragonFly as well.
Diffstat (limited to 'math/qalculate/patches')
| -rw-r--r-- | math/qalculate/patches/patch-aa | 4 | ||||
| -rw-r--r-- | math/qalculate/patches/patch-ab | 28 |
2 files changed, 29 insertions, 3 deletions
diff --git a/math/qalculate/patches/patch-aa b/math/qalculate/patches/patch-aa index 8c4f1b87ae5..bbc3d3b687a 100644 --- a/math/qalculate/patches/patch-aa +++ b/math/qalculate/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2005/08/03 13:36:05 adam Exp $ +$NetBSD: patch-aa,v 1.3 2006/01/03 20:54:15 joerg Exp $ --- libqalculate/Calculator.cc.orig 2004-10-18 12:30:49.000000000 +0000 +++ libqalculate/Calculator.cc @@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.2 2005/08/03 13:36:05 adam Exp $ #include <sys/types.h> #include <sys/stat.h> #include <dirent.h> -+#if defined(__NetBSD__) ++#if defined(__NetBSD__) || defined(__DragonFly__) +#include <sys/wait.h> +#else #include <wait.h> diff --git a/math/qalculate/patches/patch-ab b/math/qalculate/patches/patch-ab index afb76040cb9..0a7a63084e8 100644 --- a/math/qalculate/patches/patch-ab +++ b/math/qalculate/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2005/10/11 12:35:06 adam Exp $ +$NetBSD: patch-ab,v 1.4 2006/01/03 20:54:15 joerg Exp $ --- configure.orig 2005-10-08 22:24:33.000000000 +0000 +++ configure @@ -15,3 +15,29 @@ $NetBSD: patch-ab,v 1.3 2005/10/11 12:35:06 adam Exp $ ;; esac fi +@@ -21215,13 +21213,13 @@ QALCULATE_AGE=0 + + + +-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 + /* confdefs.h. */ + _ACEOF +@@ -21280,7 +21278,7 @@ 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 +- LIBS="$LIBS -lpthread" ++ LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" + fi + + |