Skip to contentSkip to conversation

nfs-utils: Remove dependency on libnfsidmap-devel

PATCH In review Steve Dickson 1 participant 4 messages Nov 2, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover 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
Signature · 1 line
2.13.6
#1 lore raw

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.

---
 configure.ac | 2 ++
 1 file changed, 2 insertions(+)
configure.ac +2 -0
index 9b2a502..c7651f2 100644
@@ -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
 
Signature · 1 line
2.13.6
#2 lore raw

PATCH 2/2 gitignore: ignore files generated by libnfsidmap compilation

In reply to Steve Dickson

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

---
 .gitignore                      |  1 +
 support/nfsidmap/libnfsidmap.pc | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 support/nfsidmap/libnfsidmap.pc
.gitignore +1 -0
index 540737d..f17db9c 100644
@@ -35,6 +35,7 @@ support/include/stamp-h1
 *.o
 *.lo
 *.la
+*.pc
 .libs
 lib*.a
 test-driver
support/nfsidmap/libnfsidmap.pc deleted +0 -11
deleted file mode 100644
index 5ec28ae..0000000
@@ -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
Signature · 1 line
2.13.6
#3 lore raw
In reply to Steve Dickson
Quoted 8 lines · Steve Dickson

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

Quoted 9 lines

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.