diff options
| author | Andy Walsh <andy.walsh44+github@gmail.com> | 2019-12-13 17:22:33 +0100 |
|---|---|---|
| committer | Andy Walsh <andy.walsh44+github@gmail.com> | 2019-12-17 11:54:50 +0100 |
| commit | c50c5836ea9b5b955d224b721208c2ee29bc9f62 (patch) | |
| tree | a69f2ae1b286400b80411225c89808b7d9d7fbae /net/samba4/patches/005-musl_uintptr.patch | |
| parent | bce8c531e876a3769d55886c237541647d5b9e0b (diff) | |
samba4: update to 4.11.4
* update to 4.11.4 (python3 version)
* re-enable AD-DC option
* add 'samba_nice' UCI option via "config procd 'extra'"
* restructure buildsteps (don't rely on waf --targets logic)
* move quota option into VFS
* move ACL option into AC-DC
* add more admin-tools
* use rpath_install for libs
* fix rpath + rstrip
Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
Diffstat (limited to 'net/samba4/patches/005-musl_uintptr.patch')
| -rw-r--r-- | net/samba4/patches/005-musl_uintptr.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/net/samba4/patches/005-musl_uintptr.patch b/net/samba4/patches/005-musl_uintptr.patch new file mode 100644 index 000000000..c5f36bef2 --- /dev/null +++ b/net/samba4/patches/005-musl_uintptr.patch @@ -0,0 +1,35 @@ +commit f81e5b71ce78f33250347914dacc75c8463bf102 +Author: Breno Leitao <breno.leitao@gmail.com> +Date: Wed Mar 29 15:22:38 2017 -0300 + + include: Check for previous declaration of uintptr_t + + Adding a extra check before declaring uintptr_t. Currently musl uses + macro __DEFINED_uintptr_t once it defines uintptr_t type. Checking + this macro before defining it, and, defining it when uintptr_t is + defined. + + Signed-off-by: Breno Leitao <breno.leitao@gmail.com> + +diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h +index 303d0ae..a2bfc40 100644 +--- a/third_party/cmocka/cmocka.h ++++ b/third_party/cmocka/cmocka.h +@@ -110,7 +110,7 @@ + ((LargestIntegralType)(value)) + + /* Smallest integral type capable of holding a pointer. */ +-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) ++#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(__DEFINED_uintptr_t) + # if defined(_WIN32) + /* WIN32 is an ILP32 platform */ + typedef unsigned int uintptr_t; +@@ -136,6 +136,8 @@ + + # define _UINTPTR_T + # define _UINTPTR_T_DEFINED ++# define __DEFINED_uintptr_t ++ + #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ + + /* Perform an unsigned cast to uintptr_t. */ |