diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-06-02 21:58:33 -0700 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2017-06-28 10:27:52 -0400 |
| commit | 91d77d978fc6ad83777ed077d6acbb8b59a949ba (patch) | |
| tree | 4ccc8c2ba87970e609a29c7e6af2038f348ac34b /meta-networking | |
| parent | de124b8dba0deee37b03708743ade9b8f0ab43be (diff) | |
| download | meta-openembedded-contrib-91d77d978fc6ad83777ed077d6acbb8b59a949ba.tar.gz | |
samba: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
3 files changed, 36 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch b/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch new file mode 100644 index 0000000000..894bc8bb2c --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch @@ -0,0 +1,15 @@ +Index: samba-4.6.2/ctdb/tests/src/test_mutex_raw.c +=================================================================== +--- samba-4.6.2.orig/ctdb/tests/src/test_mutex_raw.c ++++ samba-4.6.2/ctdb/tests/src/test_mutex_raw.c +@@ -166,8 +166,10 @@ int main(int argc, const char **argv) + if (ret == 0) { + pthread_mutex_unlock(mutex); + } ++#ifdef __GLIBC__ + } else if (ret == EBUSY) { + printf("pid=%u\n", mutex->__data.__owner); ++#endif + } else if (ret == 0) { + pthread_mutex_unlock(mutex); + } diff --git a/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch b/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch new file mode 100644 index 0000000000..eb06866f46 --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch @@ -0,0 +1,19 @@ +Index: samba-4.6.2/nsswitch/wins.c +=================================================================== +--- samba-4.6.2.orig/nsswitch/wins.c ++++ samba-4.6.2/nsswitch/wins.c +@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = + #define INADDRSZ 4 + #endif + ++#ifndef NETDB_INTERNAL ++#define NETDB_INTERNAL (-1) ++#endif ++ ++#ifndef NETDB_SUCCESS ++#define NETDB_SUCCESS 0 ++#endif ++ + NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, + struct hostent *he, + char *buffer, diff --git a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb index 38876c2c35..7574aefb4d 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb @@ -18,6 +18,8 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://21-add-config-option-without-valgrind.patch \ file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \ file://0006-avoid-using-colon-in-the-checking-msg.patch \ + file://netdb_defines.patch \ + file://glibc_only.patch \ file://volatiles.03_samba \ " SRC_URI_append_libc-musl = " \ |