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