nfs-utils: fix build again

diff --git a/.gitignore b/.gitignore
index 484b316b8025c4a71dfb4771e4df7bc301aace5b..4d4a9c208423a665b22caf4766be208212d4269e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ my-skel-*
 *~
 /*.patch
 /*.diff
+*.orig
+custom.mk

diff --git a/archive-patches/nfs-utils_06_res_querydomain.patch b/archive-patches/nfs-utils_06_res_querydomain.patch
index 19f69f4976dc50165314b40b8c5f0d4e19723e8d..9e5f49dd4c63565b6507bba6ba8774f9c4dca7f3 100644 (file)
--- a/archive-patches/nfs-utils_06_res_querydomain.patch
+++ b/archive-patches/nfs-utils_06_res_querydomain.patch
@@ -1,11 +1,12 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -401,7 +401,7 @@
+@@ -401,7 +401,8 @@
  fi
  
  dnl libdnsidmap specific checks
 -AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
-+AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
++AC_CHECK_LIB([resolv], [__res_querydomain], ,
++      AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed)))
  
  AC_ARG_ENABLE([ldap],
        [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])

diff --git a/make/applications.mk b/make/applications.mk
index 22e9a961d1d6610abf54f2d7e59476f3adedfea0..77ae47a89838106dd1e52ef271e4f1bc537b3f49 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -869,17 +869,18 @@ ifeq ($(BOXSERIES), hd1)
        NFS_UTILS_IPV6=--disable-ipv6
 endif
 $(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/nfs-utils-$(NFS_UTILS_VER).tar.bz2 | $(TARGETPREFIX)
+       $(START_BUILD)
        $(REMOVE)/nfs-utils-$(NFS_UTILS_VER)
        $(UNTAR)/nfs-utils-$(NFS_UTILS_VER).tar.bz2
        pushd $(BUILD_TMP)/nfs-utils-$(NFS_UTILS_VER) && \
-       $(PATCH)/nfs-utils_01-Patch-taken-from-Gentoo.patch && \
-       $(PATCH)/nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch && \
-       $(PATCH)/nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-libt.patch && \
-       $(PATCH)/nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch && \
-       $(PATCH)/nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch && \
-       $(PATCH)/nfs-utils_06_res_querydomain.patch && \
-       $(PATCH)/nfs-utils_08_fix_multiple_definition.patch && \
-       export knfsd_cv_bsd_signals=no && \
+               $(PATCH)/nfs-utils_01-Patch-taken-from-Gentoo.patch && \
+               $(PATCH)/nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch && \
+               $(PATCH)/nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-libt.patch && \
+               $(PATCH)/nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch && \
+               $(PATCH)/nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch && \
+               $(PATCH)/nfs-utils_06_res_querydomain.patch && \
+               $(PATCH)/nfs-utils_08_fix_multiple_definition.patch && \
+               export knfsd_cv_bsd_signals=no && \
                autoreconf -fi && \
                $(CONFIGURE) \
                        --prefix= \