From 7da9e9c074689f1758149897d3075696d4f8aa12 Mon Sep 17 00:00:00 2001 From: Sebastian Moser Date: Thu, 11 Apr 2024 12:20:08 +0200 Subject: [PATCH] fixed talloc patch --- overlays/patches/talloc-satic.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/overlays/patches/talloc-satic.patch b/overlays/patches/talloc-satic.patch index 5b73b0e..b19ee56 100644 --- a/overlays/patches/talloc-satic.patch +++ b/overlays/patches/talloc-satic.patch @@ -1,10 +1,10 @@ diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript -index dcc8a65..3e42d43 100644 +index 30cb366..56b939a 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript -@@ -305,7 +305,15 @@ def configure(conf): +@@ -303,6 +303,15 @@ def configure(conf): conf.CHECK_CC_ENV() - + conf.load('compiler_c') + + # This seems to be the only way to not include the -Wl,-Bdynamic in the linker gcc cmdline @@ -14,7 +14,7 @@ index dcc8a65..3e42d43 100644 + # but the conf.load("compiler_c") overwrites that + # on the alpine static build it is no problem to have both -Wl,-Bdynamic and -Wl,-Bstatic + # but on nix it is a problem -+ conf.env.SHLB_MARKER = "" - ++ conf.env.SHLIB_MARKER = "" + conf.CHECK_STANDARD_LIBPATH() - +