summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-11-01 15:00:50 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-11-01 15:00:50 +0100
commit405ddea44fd87265c3a5eaa12a3e3b4d0de57117 (patch)
tree2f9cbf03874072954ae1d0a419cdb31f08a3d6b3
parent1fdba4fab5eb31fb53b0c9db7c03e10982e4f2e7 (diff)
fix build with musl libc
-rw-r--r--package/openldap/patches/patch-build_ltmain_sh6
-rw-r--r--package/openldap/patches/patch-libraries_librewrite_rewrite-int_h21
2 files changed, 24 insertions, 3 deletions
diff --git a/package/openldap/patches/patch-build_ltmain_sh b/package/openldap/patches/patch-build_ltmain_sh
index 3b48ef1c9..b96b508b6 100644
--- a/package/openldap/patches/patch-build_ltmain_sh
+++ b/package/openldap/patches/patch-build_ltmain_sh
@@ -1,6 +1,6 @@
---- openldap-2.4.25.orig/build/ltmain.sh 2011-01-05 00:49:25.000000000 +0100
-+++ openldap-2.4.25/build/ltmain.sh 2011-03-30 18:26:08.621808325 +0200
-@@ -1668,7 +1672,7 @@ EOF
+--- openldap-2.4.36.orig/build/ltmain.sh 2013-08-16 20:12:59.000000000 +0200
++++ openldap-2.4.36/build/ltmain.sh 2013-10-31 21:12:49.000000000 +0100
+@@ -1668,7 +1668,7 @@ EOF
# -pg pass through profiling flag for GCC
# @file GCC response files
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
diff --git a/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h b/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h
new file mode 100644
index 000000000..a80083bc2
--- /dev/null
+++ b/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h
@@ -0,0 +1,21 @@
+--- openldap-2.4.36.orig/libraries/librewrite/rewrite-int.h 2013-08-16 20:12:59.000000000 +0200
++++ openldap-2.4.36/libraries/librewrite/rewrite-int.h 2013-11-01 14:30:43.000000000 +0100
+@@ -40,12 +40,18 @@
+
+ #include <rewrite.h>
+
++/*
++#undef malloc
+ #define malloc(x) ber_memalloc(x)
++#undef calloc
+ #define calloc(x,y) ber_memcalloc(x,y)
++#undef realloc
+ #define realloc(x,y) ber_memrealloc(x,y)
++#undef free
+ #define free(x) ber_memfree(x)
+ #undef strdup
+ #define strdup(x) ber_strdup(x)
++*/
+
+ /* Uncomment to use ldap pvt threads */
+ #define USE_REWRITE_LDAP_PVT_THREADS