1From eae97632157b73f0ca7c099232617b2777d0fa54 Mon Sep 17 00:00:00 2001
2From: Sergio Prado <sergio.prado@e-labworks.com>
3Date: Sat, 21 Dec 2019 12:00:42 -0300
4Subject: [PATCH] Fix error when building on a Fedora host machine.
5
6Remove the code that adds unsafe header/library path when
7cross-compiling on a Fedora host machine.
8
9Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
10[Fabrice: Update for 2.9.18.1 (also fix build on Centos host machine)]
11Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
12---
13 configure.in | 24 ------------------------
14 1 file changed, 24 deletions(-)
15
16diff --git a/configure.in b/configure.in
17index e6586f399898..fb35d4d7e3e3 100644
18--- a/configure.in
19+++ b/configure.in
20@@ -957,54 +957,6 @@ if test "x$enable_dlclose" = "xno"; then
21     AC_DEFINE([DISABLE_DLCLOSE_FOR_VALGRIND_TESTING],[1],[Don't close opened shared objects for valgrind leak testing of dynamic libraries])
22 fi
23
24-##################################################
25-# Fedora 28+ does not have inbuilt SunRPC support#
26-# in glibc and is separately availble in tirpc   #
27-# package. Make sure we've got the library and   #
28-# link it                                        #
29-##################################################
30-
31-if test -f /etc/fedora-release ; then
32-    DISTRO_VERSION=$(awk '{ print $3 }' /etc/fedora-release)
33-    if test $DISTRO_VERSION -ge 28 ; then
34-        TIRPC=""
35-        AC_CHECK_LIB(tirpc,bindresvport,, TIRPC="no")
36-        echo "$TIRPC"
37-        if test "x$TIRPC" = "xno"; then
38-            echo
39-            echo " ERROR! tirpc not found, get it by running "
40-            echo " yum install libtirpc-devel "
41-            exit
42-        fi
43-        LIBS="${LIBS} -ltirpc"
44-        extra_incl="-I/usr/include/tirpc"
45-    fi
46-fi
47-
48-##################################################
49-# Centos 8+ does not have inbuilt SunRPC support  #
50-# in glibc and is separately availble in tirpc   #
51-# package. Make sure we've got the library and   #
52-# link it                                        #
53-##################################################
54-if test -f /etc/centos-release ; then
55-    LINUX_FLAVOUR=$(awk '{ print $1 }' /etc/centos-release)
56-    DISTRO_VERSION=`cut -d ' ' -f 4 /etc/centos-release | cut -d '.' -f 1`
57-    if [[ "$LINUX_FLAVOUR" == "CentOS" ]] && [[ $DISTRO_VERSION -ge 8 ]]; then
58-        TIRPC=""
59-        AC_CHECK_LIB(tirpc,bindresvport,, TIRPC="no")
60-        echo "$TIRPC"
61-        if test "x$TIRPC" = "xno"; then
62-            echo
63-            echo " ERROR! tirpc not found, get it by running "
64-            echo " yum install libtirpc-devel or dnf install libtirpc-devel"
65-            exit
66-        fi
67-        LIBS="${LIBS} -ltirpc"
68-        extra_incl="-I/usr/include/tirpc"
69-    fi
70-fi
71-
72 Z_LIB=""
73 AC_CHECK_HEADERS(zlib.h,, Z_LIB="no")
74 if test "x$Z_LIB" = "xno"; then
75--
762.17.1
77
78