enhance the musl-only patch to degrade certain Werros into Warnings which helps in compiling on musl, since its checking for __GLIBC__ defines which are undefined on musl.
Signed-off-by: Khem Raj <[email protected]> --- .../nfs-utils-musl-res_querydomain.patch | 43 +++++++++++++++++-- ...{nfs-utils_2.3.1.bb => nfs-utils_2.3.2.bb} | 4 +- 2 files changed, 41 insertions(+), 6 deletions(-) rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.3.1.bb => nfs-utils_2.3.2.bb} (97%) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch index a169e6a222..22002fadca 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch @@ -1,17 +1,24 @@ +From caa19231196d73541445728e6813c8fa70345acb Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Tue, 26 Jun 2018 15:59:00 +0800 +Subject: [PATCH] nfs-utils: 2.1.1 -> 2.3.1 + Fixed: configure: error: res_querydomain needed -Upstream-Status: Pending [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/musl-res_querydomain.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096] +Upstream-Status: Pending [https://github.com/alpinelinux/aports/blob/master/main/nfs-utils/musl-configure_ac.patch] Signed-off-by: Robert Yang <[email protected]> + --- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + configure.ac | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac +index 276dec3..760238b 100644 --- a/configure.ac +++ b/configure.ac -@@ -401,7 +401,7 @@ if test "$enable_gss" = yes; then +@@ -408,7 +408,7 @@ if test "$enable_gss" = yes; then fi dnl libdnsidmap specific checks @@ -20,3 +27,31 @@ diff --git a/configure.ac b/configure.ac AC_ARG_ENABLE([ldap], [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])]) +@@ -547,11 +547,11 @@ my_am_cflags="\ + -pipe \ + -Wall \ + -Wextra \ +- -Werror=strict-prototypes \ +- -Werror=missing-prototypes \ +- -Werror=missing-declarations \ ++ -Wstrict-prototypes \ ++ -Wmissing-prototypes \ ++ -Wmissing-declarations \ + -Werror=format=2 \ +- -Werror=undef \ ++ -Wundef \ + -Werror=missing-include-dirs \ + -Werror=strict-aliasing=2 \ + -Werror=init-self \ +@@ -579,10 +579,9 @@ AC_DEFUN([CHECK_CCSUPPORT], [ + + CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1]) + CHECK_CCSUPPORT([-Werror=int-conversion], [flg2]) +-CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3]) + CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4]) + +-AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"]) ++AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg4"]) + + # Make sure that $ACLOCAL_FLAGS are used during a rebuild + AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.2.bb similarity index 97% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.2.bb index 6d450c7510..5c0586fa75 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.2.bb @@ -34,8 +34,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch" -SRC_URI[md5sum] = "d77b182a9ee396aa6221ac2401ad7046" -SRC_URI[sha256sum] = "96d06b5a86b185815760d8f04c34fdface8fa8b9949ff256ac05c3ebc08335a5" +SRC_URI[md5sum] = "01f5e6cd187aecf72b489c9c86cce865" +SRC_URI[sha256sum] = "3cfe50805c4c9f57bec845eaa28dfbe5a8acb90a8d21d8d56d2840e424335b19" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. -- 2.19.2 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
