Attachment 166642 Details for Bug 206965 – patch to src/s_locader.c to solve issue

patch to src/s_locader.c to solve issue

patch-src_s_loader.c (text/x-csrc), 1.25 KB, created by Tobias Brodel on 2016-02-06 06:59:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Brodel

Created: 2016-02-06 06:59:45 UTC

Size: 1.25 KB

patch

obsolete

>--- src/s_loader.c.orig	2016-02-06 15:13:30.989025188 +1100
>+++ src/s_loader.c	2016-02-06 17:28:13.638085448 +1100
>@@ -2,7 +2,7 @@
> * For information on usage and redistribution, and for a DISCLAIMER OF ALL
> * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
> 
>-#ifdef HAVE_LIBDL
>+#if defined(HAVE_LIBDL) || defined(__FreeBSD__)
> #include <dlfcn.h>
> #endif
> #ifdef HAVE_UNISTD_H
>@@ -37,9 +37,7 @@
> darwin, or microsoft, followed by a more specific string, either "fat" for
> a fat binary or an indication of the instruction set. */
> 
>-#ifdef __FreeBSD__
>-static char sys_dllextent[] = ".b_i386", sys_dllextent2[] = ".pd_freebsd";
>-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
>+#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__FreeBSD__)
> static char sys_dllextent2[] = ".pd_linux";
> # ifdef __x86_64__
> static char sys_dllextent[] = ".l_ia64"; // this should be .l_x86_64 or .l_amd64
>@@ -216,7 +214,7 @@
>              makeout = (t_xxx)GetProcAddress(ntdll, "setup");
>         SetDllDirectory(NULL); /* reset DLL dir to nothing */
>     }
>-#elif defined HAVE_LIBDL
>+#elif defined(HAVE_LIBDL) || defined(__FreeBSD__)
>     dlobj = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
>     if (!dlobj)
>     {

Actions: View

Attachments on bug 206965: 166642