summaryrefslogtreecommitdiff
path: root/sysutils/e2fsprogs/files/patch-lib_support_plausible.c
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2020-02-03 00:34:15 +0000
committerMatthias Andree <mandree@FreeBSD.org>2020-02-03 00:34:15 +0000
commit0346c473f7a3a3fbff70ab193f918b9482de4578 (patch)
treed70d7236806b4a488080ac5e82ea35723c4d7256 /sysutils/e2fsprogs/files/patch-lib_support_plausible.c
parentwww/node: build on i386 (diff)
Be more careful about what and how we link.
Only link what we need (--as-needed) to get unnecessary dependencies out of the executables. Be sure to properly link libc dynamically and the rest statically, especially libgcc (-static-libgcc, should fix powerpc* builds => [1]) After two years, drop the "for now" LLD_UNSAFE=yes (r457508 by emaste@). As e2fsprogs dlopen()s libmagic these days, our LIBMAGIC override is useless. Instead patch libmagic.so.1 -> libmagic.so (12.1 calls it libmagic.so.4; patch to lib/support/plausible.c). Refresh files/patch-misc__Makefile.in PR: 242798 [1]
Diffstat (limited to 'sysutils/e2fsprogs/files/patch-lib_support_plausible.c')
-rw-r--r--sysutils/e2fsprogs/files/patch-lib_support_plausible.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/sysutils/e2fsprogs/files/patch-lib_support_plausible.c b/sysutils/e2fsprogs/files/patch-lib_support_plausible.c
new file mode 100644
index 000000000000..3d23b30e9c8f
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-lib_support_plausible.c
@@ -0,0 +1,11 @@
+--- lib/support/plausible.c.orig 2020-01-06 23:10:17 UTC
++++ lib/support/plausible.c
+@@ -62,7 +62,7 @@ static void *magic_handle;
+ static int magic_library_available(void)
+ {
+ if (!magic_handle) {
+- magic_handle = dlopen("libmagic.so.1", RTLD_NOW);
++ magic_handle = dlopen("libmagic.so", RTLD_NOW);
+ if (!magic_handle)
+ return 0;
+