0007-Fix-error-when-building-on-a-Fedora-host-machine.patch 2.8 KB

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