Skip to contentSkip to conversation

use pkg-config to search for libtirpc to fix cross-compilation

PATCH Superseded Waldemar Brodkorb 2 participants 4 messages Jun 28, 2017 – Jun 29, 2017

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 use pkg-config to search for libtirpc to fix cross-compilation

When trying to cross-compile autofs for example with a buildsystem like buildroot, the compilation fails in case the user wants to use libtirpc library as RPC implementation. A hard coded include path in aclocal.m4 is used. Other opensource software like rpcbind or nfs-utils are suing autotools pkgconfig infrastructure to find the libtirpc headers and to pass the correct linker flags.

Convert configure.in to use PKG_CHECK_MODULES and remove the hand written autoconf macros from aclocal.m4.

To autoreconf the package you need pkg-config or pkgconf installed, which provides the needed autoconf macros in pkg.m4. For an non-automake project a full path to pkg.m4 is required.

This fixes cross-compilation of autofs and allows to use alternative C libraries as uClibc-ng without internal RPC support to be used in cross-compiling environments.

---
v1 -> v2:
- add a better commit decription
- add back missing TIRPC_WORKAROUND/WITH_LIBTIRPC defines
- add back AC_CHECK_FUNCS([getrpcbyname getservbyname])

For autoheader/autoconf to generate configure/config.h you need to have pkg-config installed on your development machine. When the user does not have installed pkg-config later, he can use autofs without libtirpc as before.
Configure will fail when the user use --with-libtirpc and pkg-config is not installed.

---
 Makefile.conf.in |  3 ++-
 Makefile.rules   |  2 +-
 aclocal.m4       | 48 ------------------------------------------------
 configure.in     | 16 ++++++++++++++--
 4 files changed, 17 insertions(+), 52 deletions(-)
Makefile.conf.in +2 -1
index 2bc3202..f879e26 100644
@@ -64,7 +64,8 @@ RPCGEN = @PATH_RPCGEN@
 RANLIB = @PATH_RANLIB@
 
 # Use libtirpc if requested and available
-TIRPCLIB = @TIRPCLIB@
+TIRPCLIB = @TIRPC_LIBS@
+TIRPCCFLAGS = @TIRPC_CFLAGS@
 
 # Use dmalloc for memory debuging
 DMALLOCLIB = @DMALLOCLIB@
Makefile.rules +1 -1
index 7d1af2e..0edf9bf 100644
@@ -46,7 +46,7 @@ CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
 LIBS += -lpthread
 
 ifdef TIRPCLIB
-CFLAGS += -I/usr/include/tirpc
+CFLAGS += $(TIRPCCFLAGS)
 LIBS += $(TIRPCLIB)
 endif
 
aclocal.m4 +0 -48

51 lines not on this page · raw message

configure.in +14 -2
index 0521252..71e9573 100644
@@ -11,6 +11,9 @@ define([AC_CACHE_LOAD], )dnl
 define([AC_CACHE_SAVE], )dnl
 AC_INIT(.autofs-5.1.3)
 
+# for pkg-config macros
+m4_include([/usr/share/aclocal/pkg.m4])
+
 #
 # autofs installs by default in /usr
 #
@@ -124,8 +127,17 @@ AC_SUBST(flagdir)
 #
 # Use libtirpc
 #
-AF_WITH_LIBTIRPC()
-AC_SUBST(TIRPCLIB)
+PKG_PROG_PKG_CONFIG()
+AC_ARG_WITH([libtirpc], AS_HELP_STRING([--with-libtirpc], [use libtirpc if available]))
+if test "x$with_libtirpc" = "xyes"; then
+  PKG_CHECK_MODULES([TIRPC],[libtirpc],[
+		AC_DEFINE(WITH_LIBTIRPC,1,
+			[Define to 1 if you have the libtirpc library installed])
+		AC_DEFINE(TIRPC_WORKAROUND,1,
+			[Define to 1 to use the libtirpc tsd usage workaround])
+    ])
+  AC_CHECK_FUNCS([getrpcbyname getservbyname])
+fi
 
 #
 # Optional include dmalloc
Signature · 4 lines
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe autofs" in
maintainer
#1 lore raw
Quoted 25 lines · Waldemar Brodkorb

When trying to cross-compile autofs for example with a buildsystem like buildroot, the compilation fails in case the user wants to use libtirpc library as RPC implementation. A hard coded include path in aclocal.m4 is used. Other opensource software like rpcbind or nfs-utils are suing autotools pkgconfig infrastructure to find the libtirpc headers and to pass the correct linker flags.

Convert configure.in to use PKG_CHECK_MODULES and remove the hand written autoconf macros from aclocal.m4.

To autoreconf the package you need pkg-config or pkgconf installed, which provides the needed autoconf macros in pkg.m4. For an non-automake project a full path to pkg.m4 is required.

This fixes cross-compilation of autofs and allows to use alternative C libraries as uClibc-ng without internal RPC support to be used in cross-compiling environments.

---
v1 -> v2:
  - add a better commit decription
  - add back missing TIRPC_WORKAROUND/WITH_LIBTIRPC defines
  - add back AC_CHECK_FUNCS([getrpcbyname getservbyname])

Quoted 6 lines

For autoheader/autoconf to generate configure/config.h you need to have pkg-config installed on your development machine. When the user does not have installed pkg-config later, he can use autofs without libtirpc as before.
Configure will fail when the user use --with-libtirpc and pkg-config is not installed.

Thanks for this, I'll have a look through it.

Quoted 129 lines

---
 Makefile.conf.in |  3 ++-
 Makefile.rules   |  2 +-
 aclocal.m4       | 48 ------------------------------------------------ configure.in     | 16 ++++++++++++++--

 4 files changed, 17 insertions(+), 52 deletions(-)
Makefile.conf.in +0 -0
index 2bc3202..f879e26 100644
@@ -64,7 +64,8 @@ RPCGEN = @PATH_RPCGEN@

 RANLIB = @PATH_RANLIB@

 # Use libtirpc if requested and available

Makefile.conf.in +2 -1
-TIRPCLIB = @TIRPCLIB@
+TIRPCLIB = @TIRPC_LIBS@
+TIRPCCFLAGS = @TIRPC_CFLAGS@


 # Use dmalloc for memory debuging
 DMALLOCLIB = @DMALLOCLIB@

Makefile.rules +0 -0
index 7d1af2e..0edf9bf 100644
@@ -46,7 +46,7 @@ CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64

 LIBS += -lpthread

 ifdef TIRPCLIB

Makefile.rules +1 -1
-CFLAGS += -I/usr/include/tirpc
+CFLAGS += $(TIRPCCFLAGS)

 LIBS += $(TIRPCLIB)
 endif

aclocal.m4 +0 -0
index 00811e0..31ca602 100644
@@ -399,51 +399,3 @@ fi

 LIBS="$af_check_ldap_parse_page_control_save_libs" ])

aclocal.m4 +0 -28
-dnl -----------------------------------------------------------------------
---
-dnl AF_CHECK_LIBTIRPC
-dnl
-dnl Use libtirpc for rpc transport
-dnl -----------------------------------------------------------------------
---
-AC_DEFUN([AF_CHECK_LIBTIRPC],
-[
-# save current flags
-af_check_libtirpc_save_cflags="$CFLAGS"
-af_check_libtirpc_save_libs="$LIBS"
-CFLAGS="$CFLAGS -I/usr/include/tirpc"
-LIBS="$LIBS -ltirpc"
-
-AC_TRY_LINK(
-    [ #include <rpc/rpc.h> ],
-    [ CLIENT *cl;
-      struct sockaddr_in addr;
-      int fd;
-      unsigned long ul; struct timeval t; unsigned int ui;
-      cl = clntudp_bufcreate(&addr,ul,ul,t,&fd,ui,ui); ],
-    [ af_have_libtirpc=yes
-      AC_MSG_RESULT(yes) ],
-    [ AC_MSG_RESULT(no) ])
-
-if test "$af_have_libtirpc" = "yes"; then
-    AC_DEFINE(WITH_LIBTIRPC,1, [Define to 1 if you have the libtirpc library

installed])
-    AC_DEFINE(TIRPC_WORKAROUND,1, [Define to 1 to use the libtirpc tsd usage workaround])
-    TIRPCLIB="-ltirpc"

aclocal.m4 +0 -20
-fi
-
-AC_CHECK_FUNCS([getrpcbyname getservbyname])
-
-# restore flags
-CFLAGS="$af_check_libtirpc_save_cflags"
-LIBS="$af_check_libtirpc_save_libs"
-])
-
-AC_DEFUN([AF_WITH_LIBTIRPC],
-[AC_MSG_CHECKING([if libtirpc is requested and available])
-AC_ARG_WITH(libtirpc,
-[  --with-libtirpc         use libtirpc if available],
-[if test "$withval" = yes; then
-  AF_CHECK_LIBTIRPC()
-else
-  AC_MSG_RESULT(no)
-fi], [AC_MSG_RESULT(no)])
-])
-
configure.in +0 -0
index 0521252..71e9573 100644
@@ -11,6 +11,9 @@ define([AC_CACHE_LOAD], )dnl

 define([AC_CACHE_SAVE], )dnl
 AC_INIT(.autofs-5.1.3)

configure.in +3 -0
+# for pkg-config macros
+m4_include([/usr/share/aclocal/pkg.m4])
+

 #

 # autofs installs by default in /usr
 #
configure.in +11 -2
@@ -124,8 +127,17 @@ AC_SUBST(flagdir)
  #
  # Use libtirpc
  #
-AF_WITH_LIBTIRPC()
-AC_SUBST(TIRPCLIB)
+PKG_PROG_PKG_CONFIG()
+AC_ARG_WITH([libtirpc], AS_HELP_STRING([--with-libtirpc], [use libtirpc if
 available]))
+if test "x$with_libtirpc" = "xyes"; then
+  PKG_CHECK_MODULES([TIRPC],[libtirpc],[
+		AC_DEFINE(WITH_LIBTIRPC,1,
+			[Define to 1 if you have the libtirpc library
 installed])
+		AC_DEFINE(TIRPC_WORKAROUND,1,
+			[Define to 1 to use the libtirpc tsd usage
 workaround])
+    ])
+  AC_CHECK_FUNCS([getrpcbyname getservbyname])
+fi
Quoted 3 lines


 #
 # Optional include dmalloc

--
To unsubscribe from this list: send the line "unsubscribe autofs" in

#2 lore raw

Hi,
Ian Kent wrote,

Quoted 33 lines · Waldemar Brodkorb
Quoted 25 lines

When trying to cross-compile autofs for example with a buildsystem like buildroot, the compilation fails in case the user wants to use libtirpc library as RPC implementation. A hard coded include path in aclocal.m4 is used. Other opensource software like rpcbind or nfs-utils are suing autotools pkgconfig infrastructure to find the libtirpc headers and to pass the correct linker flags.

Convert configure.in to use PKG_CHECK_MODULES and remove the hand written autoconf macros from aclocal.m4.

To autoreconf the package you need pkg-config or pkgconf installed, which provides the needed autoconf macros in pkg.m4. For an non-automake project a full path to pkg.m4 is required.

This fixes cross-compilation of autofs and allows to use alternative C libraries as uClibc-ng without internal RPC support to be used in cross-compiling environments.

---
v1 -> v2:
  - add a better commit decription
  - add back missing TIRPC_WORKAROUND/WITH_LIBTIRPC defines
  - add back AC_CHECK_FUNCS([getrpcbyname getservbyname])

Quoted 6 lines

For autoheader/autoconf to generate configure/config.h you need to have pkg-config installed on your development machine. When the user does not have installed pkg-config later, he can use autofs without libtirpc as before.
Configure will fail when the user use --with-libtirpc and pkg-config is not installed.

Quoted 5 lines

Thanks for this, I'll have a look through it.

configure.in define([AC_CACHE_LOAD], )dnl · line 16

Quoted 3 lines
configure.in +3 -0
+# for pkg-config macros
+m4_include([/usr/share/aclocal/pkg.m4])
+

Yann (Buildroot developer) found out, that this include can be avoided when the aclocal.m4 would be moved. It seems autoconf does not search for macros in any global directories, if this file is in the current directory found.

Add this to configure.in: AC_CONFIG_MACRO_DIR([m4]) mkdir m4
git mv aclocal.m4 m4/autofs-macros.m4

Should I update the patch, according to this?

best regards
Waldemar
--
To unsubscribe from this list: send the line "unsubscribe autofs" in

maintainer
#3 lore raw
Quoted 38 lines · Waldemar Brodkorb

Hi,
Ian Kent wrote,

Quoted 35 lines · Waldemar Brodkorb
Quoted 25 lines

When trying to cross-compile autofs for example with a buildsystem like buildroot, the compilation fails in case the user wants to use libtirpc library as RPC implementation. A hard coded include path in aclocal.m4 is used. Other opensource software like rpcbind or nfs-utils are suing autotools pkgconfig infrastructure to find the libtirpc headers and to pass the correct linker flags.

Convert configure.in to use PKG_CHECK_MODULES and remove the hand written autoconf macros from aclocal.m4.

To autoreconf the package you need pkg-config or pkgconf installed, which provides the needed autoconf macros in pkg.m4. For an non-automake project a full path to pkg.m4 is required.

This fixes cross-compilation of autofs and allows to use alternative C libraries as uClibc-ng without internal RPC support to be used in cross-compiling environments.

---
v1 -> v2:
  - add a better commit decription
  - add back missing TIRPC_WORKAROUND/WITH_LIBTIRPC defines
  - add back AC_CHECK_FUNCS([getrpcbyname getservbyname])

Quoted 6 lines

For autoheader/autoconf to generate configure/config.h you need to have pkg-config installed on your development machine. When the user does not have installed pkg-config later, he can use autofs without libtirpc as before.
Configure will fail when the user use --with-libtirpc and pkg-config is not installed.

Thanks for this, I'll have a look through it.

Quoted 9 lines
Quoted 3 lines

configure.in define([AC_CACHE_LOAD], )dnl · line 16

Quoted 3 lines
configure.in +3 -0
+# for pkg-config macros
+m4_include([/usr/share/aclocal/pkg.m4])
+

Yann (Buildroot developer) found out, that this include can be avoided when the aclocal.m4 would be moved. It seems autoconf does not search for macros in any global directories, if this file is in the current directory found.

Yes, I was wondering if there was a way to avoid the full path.

Quoted 6 lines

Add this to configure.in: AC_CONFIG_MACRO_DIR([m4]) mkdir m4
git mv aclocal.m4 m4/autofs-macros.m4

Should I update the patch, according to this?

You could, to save me a bit of time, I won't get to it until tomorrow (my time).

Ian
--
To unsubscribe from this list: send the line "unsubscribe autofs" in