summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
l---------data/_apr/_metadata/maintainer2
-rw-r--r--data/_apr/_metadata/version2
-rw-r--r--data/_apr/apr-1.3.3.tar.bz2bin947648 -> 0 bytes
-rw-r--r--data/_apr/apr-1.6.3.tar.bz2bin0 -> 854100 bytes
-rw-r--r--data/_apr/make.sh2
-rw-r--r--data/_apr/offsetof.diff4
6 files changed, 6 insertions, 4 deletions
diff --git a/data/_apr/_metadata/maintainer b/data/_apr/_metadata/maintainer
index 0fa66e077..573d7ebef 120000
--- a/data/_apr/_metadata/maintainer
+++ b/data/_apr/_metadata/maintainer
@@ -1 +1 @@
-../../../people/saurik \ No newline at end of file
+../../../people/sbingner \ No newline at end of file
diff --git a/data/_apr/_metadata/version b/data/_apr/_metadata/version
index 31e5c8434..266146b87 100644
--- a/data/_apr/_metadata/version
+++ b/data/_apr/_metadata/version
@@ -1 +1 @@
-1.3.3
+1.6.3
diff --git a/data/_apr/apr-1.3.3.tar.bz2 b/data/_apr/apr-1.3.3.tar.bz2
deleted file mode 100644
index 6ca0f0358..000000000
--- a/data/_apr/apr-1.3.3.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/data/_apr/apr-1.6.3.tar.bz2 b/data/_apr/apr-1.6.3.tar.bz2
new file mode 100644
index 000000000..28ee2662a
--- /dev/null
+++ b/data/_apr/apr-1.6.3.tar.bz2
Binary files differ
diff --git a/data/_apr/make.sh b/data/_apr/make.sh
index 3b14e1f9b..a9cf50549 100644
--- a/data/_apr/make.sh
+++ b/data/_apr/make.sh
@@ -1,5 +1,7 @@
pkg:setup
pkg:configure --disable-static ac_cv_ebcdic=no lt_cv_dlopen_self=yes ap_cv_atomic_builtins=no apr_cv_use_lfs64=no apr_cv_mutex_recursive=yes apr_cv_epoll=no ac_cv_file__dev_zero=yes ac_cv_c_stack_direction=-1 ac_cv_strerror_r_rc_int=yes ac_cv_func_setpgrp_void=yes ac_cv_sizeof_pid_t=4 ac_cv_sizeof_ssize_t=4 ac_cv_sizeof_size_t=4 ac_cv_sizeof_off_t=8 ac_cv_sizeof_struct_iovec=8 ac_cv_struct_rlimit=yes ac_cv_func_sem_open=yes apr_cv_process_shared_works=yes apr_cv_mutex_robust_shared=no apr_fcntl_tryacquire_eacces=no ac_cv_tcp_nodelay_inherited=yes ac_cv_o_nonblock_inherited=yes apr_cv_tcp_nodelay_with_cork=no apr_cv_sctp=no ac_cv_working_getaddrinfo=yes ac_cv_negative_eai=no ac_cv_working_getnameinfo=yes apr_cv_gai_addrconfig=yes #--with-installbuilddir=/usr/lib/apr-1/build
+gcc -o tools/gen_test_char.lo -c tools/gen_test_char.c
+gcc -o tools/gen_test_char tools/gen_test_char.lo
pkg:make
pkg:install
pkg: rm -rf /usr/build-1
diff --git a/data/_apr/offsetof.diff b/data/_apr/offsetof.diff
index bbb6889bc..d9f3a3e89 100644
--- a/data/_apr/offsetof.diff
+++ b/data/_apr/offsetof.diff
@@ -5,8 +5,8 @@ diff -r -u apr-1.2.12/include/apr_general.h apr-1.2.12+iPhone/include/apr_genera
* @return offset
*/
--#if defined(CRAY) || (defined(__arm) && !defined(LINUX))
-+#if defined(CRAY) || (defined(__arm) && !defined(LINUX) && !defined(__APPLE__))
+-#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__FreeBSD__)))
++#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__FreeBSD__) || defined(__APPLE__)))
#ifdef __STDC__
#define APR_OFFSET(p_type,field) _Offsetof(p_type,field)
#else