2017-11-02 15:07:24

by Steve Dickson

[permalink] [raw]
Subject: [PATCH 0/2] nfs-utils: Remove dependency on libnfsidmap-devel

With commit a867b45e (Release: 2.2.1) libnfsidmap-devel
is now compiled and installed by nfs-utils. So the programs
that are dependent libnfsidmap-devel need to look
inward verse outward for header files.

Justin Mitchell (1):
nfs-utils: Remove dependency on libnfsidmap-devel package

Steve Dickson (1):
gitignore: ignore files generated by libnfsidmap compilation

.gitignore | 1 +
configure.ac | 2 ++
support/nfsidmap/libnfsidmap.pc | 11 -----------
3 files changed, 3 insertions(+), 11 deletions(-)
delete mode 100644 support/nfsidmap/libnfsidmap.pc

--
2.13.6



2017-11-02 15:07:25

by Steve Dickson

[permalink] [raw]
Subject: [PATCH 2/2] gitignore: ignore files generated by libnfsidmap compilation

libnfsidmap.pc is generated during the compiling of libnfsidmap
which needed to be ignored.

Signed-off-by: Steve Dickson <[email protected]>
---
.gitignore | 1 +
support/nfsidmap/libnfsidmap.pc | 11 -----------
2 files changed, 1 insertion(+), 11 deletions(-)
delete mode 100644 support/nfsidmap/libnfsidmap.pc

diff --git a/.gitignore b/.gitignore
index 540737d..f17db9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ support/include/stamp-h1
*.o
*.lo
*.la
+*.pc
.libs
lib*.a
test-driver
diff --git a/support/nfsidmap/libnfsidmap.pc b/support/nfsidmap/libnfsidmap.pc
deleted file mode 100644
index 5ec28ae..0000000
--- a/support/nfsidmap/libnfsidmap.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib64
-includedir=${prefix}/include
-
-Name: libnfsidmap
-Description: Library that handles mapping between names and ids for NFSv4.
-Requires:
-Version: 2.1.1
-Libs: -L${exec_prefix}/lib64 -lnfsidmap
-Cflags: -I${prefix}/include
--
2.13.6


2017-11-02 15:07:24

by Steve Dickson

[permalink] [raw]
Subject: [PATCH 1/2] nfs-utils: Remove dependency on libnfsidmap-devel package

From: Justin Mitchell <[email protected]>

With commit a867b45 (Release: 2.2.1) the libnfsidmap-devel
package is now build from with the nfs-utils source tree.
So the programs dependent on libnfsidmap-devel need to
look inward verses outward for the nfsidmap.h header file.

Signed-off-by: Steve Dickson <[email protected]>
---
configure.ac | 2 ++
1 file changed, 2 insertions(+)

diff --git a/configure.ac b/configure.ac
index 9b2a502..c7651f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -441,6 +441,8 @@ if test -n "$path_plugins" ; then
fi
AM_CONDITIONAL(PATH_PLUGINS, test -n "$path_plugins")

+AC_SUBST(AM_CPPFLAGS, "$AM_CPPFLAGS -I../../support/nfsidmap")
+
dnl Check for IPv6 support
AC_IPV6

--
2.13.6


2017-11-02 17:23:59

by Steve Dickson

[permalink] [raw]
Subject: Re: [PATCH 0/2] nfs-utils: Remove dependency on libnfsidmap-devel



On 11/02/2017 11:07 AM, Steve Dickson wrote:
> With commit a867b45e (Release: 2.2.1) libnfsidmap-devel
> is now compiled and installed by nfs-utils. So the programs
> that are dependent libnfsidmap-devel need to look
> inward verse outward for header files.
>
> Justin Mitchell (1):
> nfs-utils: Remove dependency on libnfsidmap-devel package
>
> Steve Dickson (1):
> gitignore: ignore files generated by libnfsidmap compilation
>
> .gitignore | 1 +
> configure.ac | 2 ++
> support/nfsidmap/libnfsidmap.pc | 11 -----------
> 3 files changed, 3 insertions(+), 11 deletions(-)
> delete mode 100644 support/nfsidmap/libnfsidmap.pc
>
Both committed!

steved.