diff options
author | joerg <joerg@pkgsrc.org> | 2006-01-03 16:25:59 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-01-03 16:25:59 +0000 |
commit | f5fde00665223ed46d5271e38998466601a73234 (patch) | |
tree | ac2774694173b7bdbbd92073a60424c5f672d8f1 /devel/chmlib | |
parent | 90b206b87d8030cf2b67c1fbb0c0332c0e9badf6 (diff) | |
download | pkgsrc-f5fde00665223ed46d5271e38998466601a73234.tar.gz |
Use PTHREAD_* instead of hard-wired -lpthread.
Diffstat (limited to 'devel/chmlib')
-rw-r--r-- | devel/chmlib/distinfo | 5 | ||||
-rw-r--r-- | devel/chmlib/patches/patch-ab | 11 | ||||
-rw-r--r-- | devel/chmlib/patches/patch-ac | 68 |
3 files changed, 80 insertions, 4 deletions
diff --git a/devel/chmlib/distinfo b/devel/chmlib/distinfo index bab6cc455e2..8779e5a5c5f 100644 --- a/devel/chmlib/distinfo +++ b/devel/chmlib/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.9 2005/11/07 19:56:46 tv Exp $ +$NetBSD: distinfo,v 1.10 2006/01/03 16:25:59 joerg Exp $ SHA1 (chmlib-0.37.4.tbz) = 7efd0def927aa3eed70838ee2261a01fa66b3cfa RMD160 (chmlib-0.37.4.tbz) = 84512ac999a3b38cb09bbd1db6edcbc0356d2394 Size (chmlib-0.37.4.tbz) = 260643 bytes SHA1 (patch-aa) = c4a7c21e8ae0cb097e9225cdf7e099395c5ed331 -SHA1 (patch-ab) = 079dd5db5a658539ce4dc57097daa63dc9d3a602 +SHA1 (patch-ab) = 30e496d927d7816dab6e5da03264e198b0645c1e +SHA1 (patch-ac) = e480d6193e737ca7ffe7510b05f9213b9ba8cf9a diff --git a/devel/chmlib/patches/patch-ab b/devel/chmlib/patches/patch-ab index 1258ad3749b..a97633ad76f 100644 --- a/devel/chmlib/patches/patch-ab +++ b/devel/chmlib/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.3 2005/11/07 19:56:47 tv Exp $ +$NetBSD: patch-ab,v 1.4 2006/01/03 16:25:59 joerg Exp $ ---- Makefile.in.orig 2005-10-28 13:26:18.000000000 -0400 +--- Makefile.in.orig 2005-10-28 17:26:18.000000000 +0000 +++ Makefile.in @@ -35,8 +35,8 @@ src/libchm.la: src/chm_lib.lo src/lzx.lo @@ -13,3 +13,10 @@ $NetBSD: patch-ab,v 1.3 2005/11/07 19:56:47 tv Exp $ clean: rm -fr src/libchm.la src/*.o src/*.lo .libs src/.libs src/${EXAMPLES} +@@ -54,5 +54,5 @@ extract_chmLib: $(srcdir)/src/extract_ch + ${CC} -o $@ $^ -I$(includedir) -L$(libdir) -lchm ${CFLAGS} + + chm_http: $(srcdir)/src/chm_http.c +- ${CC} -o $@ $^ -I$(includedir) -L$(libdir) -lchm -lpthread ${CFLAGS} ++ ${CC} -o $@ $^ -I$(includedir) -L$(libdir) -lchm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${CFLAGS} + diff --git a/devel/chmlib/patches/patch-ac b/devel/chmlib/patches/patch-ac new file mode 100644 index 00000000000..8364f4b315f --- /dev/null +++ b/devel/chmlib/patches/patch-ac @@ -0,0 +1,68 @@ +$NetBSD: patch-ac,v 1.1 2006/01/03 16:25:59 joerg Exp $ + +--- configure.orig 2006-01-03 16:13:34.000000000 +0000 ++++ configure +@@ -3201,13 +3201,13 @@ if test "${enable_pthread+set}" = set; t + + if test "$enableval" = "yes"; then + +-echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5 +-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6 + if test "${ac_cv_lib_pthread_pthread_mutex_init+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 +@@ -3269,12 +3269,12 @@ if test $ac_cv_lib_pthread_pthread_mutex + #define HAVE_LIBPTHREAD 1 + _ACEOF + +- LIBS="-lpthread $LIBS" ++ LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" + + fi + + EXAMPLES="$EXAMPLES chm_http" +- LDFLAGS="$LDFLAGS -lpthread" ++ LDFLAGS="$LDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" + else + CHM_MT="" + { echo "$as_me:$LINENO: WARNING: Thread safe mode turned off. chm_http will not be built" >&5 +@@ -3284,13 +3284,13 @@ echo "$as_me: WARNING: Thread safe mode + else + + +-echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5 +-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6 + if test "${ac_cv_lib_pthread_pthread_mutex_init+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 +@@ -3352,12 +3352,12 @@ if test $ac_cv_lib_pthread_pthread_mutex + #define HAVE_LIBPTHREAD 1 + _ACEOF + +- LIBS="-lpthread $LIBS" ++ LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" + + fi + + EXAMPLES="$EXAMPLES chm_http" +- LDFLAGS="$LDFLAGS -lpthread" ++ LDFLAGS="$LDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" + + fi; + |