diff options
| author | James E. Housley <jeh@FreeBSD.org> | 2003-11-05 22:42:43 +0000 |
|---|---|---|
| committer | James E. Housley <jeh@FreeBSD.org> | 2003-11-05 22:42:43 +0000 |
| commit | fee29a8683f163cd8c30198a491484c85d4b5738 (patch) | |
| tree | 2ded1fe76edf26bdc415dff3e6dbcebe1f3caaed /devel/apr0 | |
| parent | f1a86569aa06730f58e02dd595c4085df4a332f6 (diff) | |
| download | ports-fee29a8683f163cd8c30198a491484c85d4b5738.tar.gz ports-fee29a8683f163cd8c30198a491484c85d4b5738.zip | |
Add thread support to APR port.
Bump PORTREVISION
PR: 58834
Submitted By: MAINTAINER
Notes
Notes:
svn path=/head/; revision=93196
Diffstat (limited to 'devel/apr0')
| -rw-r--r-- | devel/apr0/Makefile | 3 | ||||
| -rw-r--r-- | devel/apr0/files/patch-apr_atomic.h | 20 | ||||
| -rw-r--r-- | devel/apr0/files/patch-apr_hints.m4 | 12 |
3 files changed, 35 insertions, 0 deletions
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index b5c62bae6e21..323a0be16573 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/Makefile @@ -7,6 +7,7 @@ PORTNAME= apr PORTVERSION= 0.9.4 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.apache.org/dist/apr/ DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz @@ -24,6 +25,8 @@ USE_GMAKE= yes USE_LIBTOOL_VER= 14 LIBTOOLFILES= # none INSTALLS_SHLIB= yes +CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ + LIBS="${PTHREAD_LIBS}" WRKSRC= ${WRKDIR} diff --git a/devel/apr0/files/patch-apr_atomic.h b/devel/apr0/files/patch-apr_atomic.h new file mode 100644 index 000000000000..c4e031f3ffd5 --- /dev/null +++ b/devel/apr0/files/patch-apr_atomic.h @@ -0,0 +1,20 @@ +--- apr-0.9.4/include/apr_atomic.h.orig Sun Nov 2 01:57:08 2003 ++++ apr-0.9.4/include/apr_atomic.h Sun Nov 2 02:20:37 2003 +@@ -206,10 +206,16 @@ + + #define apr_atomic_t apr_uint32_t + #define apr_atomic_add(mem, val) atomic_add_int(mem,val) +-#define apr_atomic_dec(mem) atomic_subtract_int(mem,1) + #define apr_atomic_inc(mem) atomic_add_int(mem,1) + #define apr_atomic_set(mem, val) atomic_set_int(mem, val) + #define apr_atomic_read(mem) (*mem) ++ ++#define apr_atomic_dec(mem) \ ++({ \ ++ atomic_subtract_int(mem,1); \ ++ *(int *)mem; \ ++ }) ++ + + #elif (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC + diff --git a/devel/apr0/files/patch-apr_hints.m4 b/devel/apr0/files/patch-apr_hints.m4 new file mode 100644 index 000000000000..4adc12fafe34 --- /dev/null +++ b/devel/apr0/files/patch-apr_hints.m4 @@ -0,0 +1,12 @@ +--- apr-0.9.4/build/apr_hints.m4.orig Sun Nov 2 01:23:53 2003 ++++ apr-0.9.4/build/apr_hints.m4 Sun Nov 2 01:24:44 2003 +@@ -135,9 +135,7 @@ + APR_ADDTO(CFLAGS, [-funsigned-char]) + ;; + esac +- APR_SETIFNULL(enable_threads, [no]) + APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) +- APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE]) + ;; + *-next-nextstep*) + APR_SETIFNULL(CFLAGS, [-O]) |