diff options
author | Lev A. Serebryakov <lev@FreeBSD.org> | 2004-01-31 10:04:40 +0000 |
---|---|---|
committer | Lev A. Serebryakov <lev@FreeBSD.org> | 2004-01-31 10:04:40 +0000 |
commit | b2931451eb3c09c64f2da6da5a66ce7a51486517 (patch) | |
tree | 5d9351bae08c8f1f85936e2c63c756a783962f5a /devel/apr2/files/patch-apr_hints.m4 | |
parent | Update to 1.4. Mostly minor fixes; see Changelog for details. (diff) |
Honor `--disable-threads' in configure scripts [1]
Support latest 5-CURRENT (-lpthread instad of -lc_r) [2]
Submitted by: lev [1]
Craig Rodrigues <rodrigc@crodrigues.org> (maintainer) [2]
Reviewed by: Craig Rodrigues <rodrigc@crodrigues.org> (maintainer)
Approved by: Craig Rodrigues <rodrigc@crodrigues.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=99594
Diffstat (limited to 'devel/apr2/files/patch-apr_hints.m4')
-rw-r--r-- | devel/apr2/files/patch-apr_hints.m4 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/devel/apr2/files/patch-apr_hints.m4 b/devel/apr2/files/patch-apr_hints.m4 index 0421617617bb..dacf60b85454 100644 --- a/devel/apr2/files/patch-apr_hints.m4 +++ b/devel/apr2/files/patch-apr_hints.m4 @@ -1,6 +1,6 @@ ---- apr-0.9.4/build/apr_hints.m4.orig Tue Dec 23 08:26:10 2003 -+++ apr-0.9.4/build/apr_hints.m4 Fri Jan 23 12:23:36 2004 -@@ -129,14 +129,17 @@ +--- apr-0.9.4/build/apr_hints.m4.orig Mon Dec 22 18:26:10 2003 ++++ apr-0.9.4/build/apr_hints.m4 Fri Jan 30 22:53:49 2004 +@@ -129,14 +129,19 @@ APR_ADDTO(CPPFLAGS, [-DNETBSD]) ;; *-freebsd*) @@ -16,11 +16,13 @@ - APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE]) + if test $os_version -lt "500016"; then + ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT" -+ ac_cv_pthreads_lib="none" -+ LIBS="$LIBS -pthread" -+ else ++ ac_cv_pthreads_lib="-pthread" ++ elif test $os_version -lt "502102"; then + ac_cv_pthreads_cflags="none" + ac_cv_pthreads_lib="c_r" ++ else ++ ac_cv_pthreads_cflags="none" ++ ac_cv_pthreads_lib="pthread" + fi ;; *-next-nextstep*) |