From: Peter Wagner <​tripolar@gmx.at>
Date: Thu, 7 Jun 2012 17:00:55 +0000 (+0000)
Subject: [packages]: nfs-kernel server: fix the configure problem with CONFIGURE_VARS instead... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=486b2b6c78de1e0007ccd6e5c5da48ebc53e2884;p=openwrt%2Fsvn-archive%2Farchive.git

[packages]: nfs-kernel server: fix the configure problem with CONFIGURE_VARS instead  of a patch


SVN-Revision: 32120
---

diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile
index fcf6e44e23..c98a204f1c 100644
--- a/net/nfs-kernel-server/Makefile
+++ b/net/nfs-kernel-server/Makefile
@@ -80,6 +80,10 @@ CONFIGURE_ARGS += \
 	--disable-tirpc \
 	--disable-nfsdcld
 
+CONFIGURE_VARS += \
+	CONFIG_SQLITE3_TRUE="\#" \
+	CONFIG_NFSDCLD_TRUE="\#"
+
 MAKE_FLAGS += \
 	OPT="$(TARGET_CFLAGS)" \
 	INSTALLSUID="install -m 4755" \
@@ -106,7 +110,8 @@ HOST_CONFIGURE_VARS += \
 	GSSGLUE_LIBS=" " \
 	RPCSECGSS_CFLAGS=" " \
 	RPCSECGSS_LIBS=" " \
-
+	CONFIG_SQLITE3_TRUE="\#" \
+	CONFIG_NFSDCLD_TRUE="\#"
 
 define Host/Compile
 	$(MAKE) -C $(HOST_BUILD_DIR)/tools/rpcgen all
diff --git a/net/nfs-kernel-server/patches/200-configure.patch b/net/nfs-kernel-server/patches/200-configure.patch
deleted file mode 100644
index 65208e47f0..0000000000
--- a/net/nfs-kernel-server/patches/200-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -868,6 +868,8 @@ RPCSECGSS_LIBS'
- 
- 
- # Initialize some variables set by options.
-+CONFIG_SQLITE3_TRUE='#'
-+CONFIG_NFSDCLD_TRUE='#'
- ac_init_help=
- ac_init_version=false
- ac_unrecognized_opts=
diff --git a/net/nfs-kernel-server/patches/200-osd_login-install.patch b/net/nfs-kernel-server/patches/200-osd_login-install.patch
new file mode 100644
index 0000000000..749443fbb3
--- /dev/null
+++ b/net/nfs-kernel-server/patches/200-osd_login-install.patch
@@ -0,0 +1,10 @@
+--- a/utils/osd_login/Makefile.in
++++ b/utils/osd_login/Makefile.in
+@@ -426,6 +426,7 @@ uninstall-am:
+ all-local: $(OSD_LOGIN_FILES)
+ 
+ install-data-hook:
++	mkdir -p $(DESTDIR)/sbin
+ 	$(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/nfs-kernel-server/patches/300-osd_login-install.patch b/net/nfs-kernel-server/patches/300-osd_login-install.patch
deleted file mode 100644
index 749443fbb3..0000000000
--- a/net/nfs-kernel-server/patches/300-osd_login-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/utils/osd_login/Makefile.in
-+++ b/utils/osd_login/Makefile.in
-@@ -426,6 +426,7 @@ uninstall-am:
- all-local: $(OSD_LOGIN_FILES)
- 
- install-data-hook:
-+	mkdir -p $(DESTDIR)/sbin
- 	$(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.