diff options
Diffstat (limited to 'devel/apr2/files')
| -rw-r--r-- | devel/apr2/files/patch-apr_atomic.h | 20 | ||||
| -rw-r--r-- | devel/apr2/files/patch-apr_hints.m4 | 25 | ||||
| -rw-r--r-- | devel/apr2/files/patch-buildconf | 11 |
3 files changed, 0 insertions, 56 deletions
diff --git a/devel/apr2/files/patch-apr_atomic.h b/devel/apr2/files/patch-apr_atomic.h deleted file mode 100644 index c4e031f3ffd5..000000000000 --- a/devel/apr2/files/patch-apr_atomic.h +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/apr2/files/patch-apr_hints.m4 b/devel/apr2/files/patch-apr_hints.m4 deleted file mode 100644 index 9e01ac75f936..000000000000 --- a/devel/apr2/files/patch-apr_hints.m4 +++ /dev/null @@ -1,25 +0,0 @@ ---- apr-0.9.4/build/apr_hints.m4.orig Mon Jun 2 11:52:28 2003 -+++ apr-0.9.4/build/apr_hints.m4 Sun Nov 9 18:15:30 2003 -@@ -130,14 +130,15 @@ - APR_ADDTO(CPPFLAGS, [-DNETBSD]) - ;; - *-freebsd*) -- case $host in -- *freebsd[2345]*) -- APR_ADDTO(CFLAGS, [-funsigned-char]) -- ;; -- esac -- APR_SETIFNULL(enable_threads, [no]) -+ os_version=`sysctl -n kern.osreldate` -+ APR_ADDTO(CFLAGS, [-funsigned-char]) - APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) -- APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE]) -+ if test $os_version -lt "500016"; then -+ ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT" -+ LIBS="$LIBS -pthread" -+ else -+ ac_cv_pthreads_lib="c_r" -+ fi - ;; - *-next-nextstep*) - APR_SETIFNULL(CFLAGS, [-O]) diff --git a/devel/apr2/files/patch-buildconf b/devel/apr2/files/patch-buildconf deleted file mode 100644 index a8d5f6549af1..000000000000 --- a/devel/apr2/files/patch-buildconf +++ /dev/null @@ -1,11 +0,0 @@ ---- apr-0.9.4/buildconf.orig Wed Jun 18 05:44:25 2003 -+++ apr-0.9.4/buildconf Thu Oct 2 15:58:45 2003 -@@ -81,7 +81,7 @@ - $libtoolize --copy --automake - - ltpath=`dirname $libtoolize` --ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} -+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool14.m4} - - if [ ! -f $ltfile ]; then - echo "$ltfile not found" |