File 0105-erts-prepend-erl_xcomp_sysroot-when-detect... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0105-erts-prepend-erl_xcomp_sysroot-when-detecting-libdlp.patch of Package erlang (Revision 3c9c0418baf827024777fc45d8229550)

Currently displaying revision 3c9c0418baf827024777fc45d8229550 , Show latest

From b24cfcd03d9225237af3796b6cd2c82715211a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Henrique=20Ferreira=20de=20Freitas?=
 <joaohf@gmail.com>
Date: Thu, 3 Mar 2022 19:37:25 -0300
Subject: [PATCH] erts: prepend erl_xcomp_sysroot when detecting libdlpi

---
 erts/configure.ac | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/erts/configure.in b/erts/configure.in
index 25cecf01f1..5fecfdcc08 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -1695,12 +1695,12 @@ AS_IF([test x"$ac_cv_lib_dlpi_dlpi_open" = x"no"],
    dnl gcc makes /usr/ccs/bin/ld ignore the crle configured linker default paths
    dnl typically causing dlpi not being found on Solaris et.al
    save_ldflags="$LDFLAGS"
-   try_dlpi_lib=/lib
+   try_dlpi_lib=$erl_xcomp_sysroot/lib
    if test x"$ac_cv_sizeof_void_p" = x"8"; then
-      if test -d /lib64; then
-	 try_dlpi_lib=/lib64
-      elif test -d /lib/64; then
-	 try_dlpi_lib=/lib/64
+      if test -d  $erl_xcomp_sysroot/lib64; then
+	 try_dlpi_lib= $erl_xcomp_sysroot/lib64
+      elif test -d  $erl_xcomp_sysroot/lib/64; then
+	 try_dlpi_lib= $erl_xcomp_sysroot/lib/64
       fi
    fi
    if test ! -f "$try_dlpi_lib/libdlpi.so" && \
@@ -1719,7 +1719,7 @@ AS_IF([test x"$ac_cv_lib_dlpi_dlpi_open" = x"no"],
    fi
    LDFLAGS="-L$try_dlpi_lib -R$try_dlpi_lib $LDFLAGS"
    unset -v try_dlpi_lib
-   AC_MSG_NOTICE([Extending the search to include /lib])
+   AC_MSG_NOTICE([Extending the search to include  $erl_xcomp_sysroot/lib])
    AC_CHECK_LIB(dlpi, dlpi_open)
    if test x"$ac_cv_lib_dlpi_dlpi_open" = x"no"; then
       LDFLAGS="$save_ldflags"
-- 
2.34.1

Places

File 0105-erts-prepend-erl_xcomp_sysroot-when-detecting-libdlp.patch of Package erlang (Revision 3c9c0418baf827024777fc45d8229550)

Places