diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2007-03-01 16:02:14 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2007-03-01 16:02:14 +0000 |
| commit | 0c362b45405f55f7717deba21b8b8728c82f2a2b (patch) | |
| tree | 30db36bed192103656536c3a790ddec3f5a789ae /security/clamav | |
| parent | - Fix problems with thread caused by a bad REINPLACE_CMD. (diff) | |
Change the way to patch configure to respect ${PTHREAD_LIBS} to a better one.
Notes
Notes:
svn path=/head/; revision=186303
Diffstat (limited to 'security/clamav')
| -rw-r--r-- | security/clamav/Makefile | 2 | ||||
| -rw-r--r-- | security/clamav/files/patch-configure | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile index c3ac5529bc24..2ce7bce361f3 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -137,7 +137,7 @@ CONFIGURE_ARGS+= --enable-experimental .endif post-patch: - @${REINPLACE_CMD} -e 's|-lpthread -lc_r|${PTHREAD_LIBS}|g' \ + @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -E 's,^(pkgconfigdir = ).*$$,\1$$(prefix)/libdata/pkgconfig,g' \ ${WRKSRC}/Makefile.in diff --git a/security/clamav/files/patch-configure b/security/clamav/files/patch-configure index 96f1b1ce1785..71208b2c4cb1 100644 --- a/security/clamav/files/patch-configure +++ b/security/clamav/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Jun 23 23:12:00 2005 -+++ configure Tue Jun 28 20:53:10 2005 -@@ -11195,19 +11201,25 @@ +--- configure.orig Mon Feb 12 23:11:56 2007 ++++ configure Thu Mar 1 13:00:28 2007 +@@ -22426,19 +22426,25 @@ sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'` @@ -26,3 +26,12 @@ fi fi +@@ -23082,7 +23088,7 @@ + ;; + freebsd*) + if test "$have_pthreads" = "yes"; then +- THREAD_LIBS="-lpthread -lc_r" ++ THREAD_LIBS="%%PTHREAD_LIBS%%" + TH_SAFE="-thread-safe" + + cat >>confdefs.h <<\_ACEOF |