The Samba-Bugzilla – Attachment 16215 Details for
Bug 14482
compilation of heimdal tree fails if libbsd is not installed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for v4-11-test
tmp411.diff.txt (text/plain), 2.34 KB, created by
Stefan Metzmacher
on 2020-09-09 12:11:28 UTC
(
hide
)
Description:
Patch for v4-11-test
Filename:
MIME Type:
Creator:
Stefan Metzmacher
Created:
2020-09-09 12:11:28 UTC
Size:
2.34 KB
patch
obsolete
>From f272c392b6a9a55b279e18799f6e0fdb4dcd1378 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 8 Sep 2020 10:13:20 +0000 >Subject: [PATCH] lib/replace: move lib/replace/closefrom.c from > ROKEN_HOSTCC_SOURCE to REPLACE_HOSTCC_SOURCE >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This is where it really belongs and we avoid the strange interaction >with source4/heimdal_build/config.h. This a follow up for commit >f31333d40e6fa38daa32a3ebb32d5a317c06fc62. > >This fixes a build problem if libbsd-dev is not installed. > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=14482 > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >Reviewed-by: Alexander Bokovoy <ab@samba.org> >Reviewed-by: Andreas Schneider <asn@samba.org> >Reviewed-by: Björn Jacke <bjacke@samba.org> > >Autobuild-User(master): Stefan Metzmacher <metze@samba.org> >Autobuild-Date(master): Tue Sep 8 13:59:58 UTC 2020 on sn-devel-184 > >(cherry picked from commit 0022cd94587b805a525b0b9ef71ff0f15780424a) >--- > lib/replace/wscript | 3 +++ > source4/heimdal_build/wscript_build | 7 +------ > 2 files changed, 4 insertions(+), 6 deletions(-) > >diff --git a/lib/replace/wscript b/lib/replace/wscript >index d5651f1bdc0e..1c3566d9974a 100644 >--- a/lib/replace/wscript >+++ b/lib/replace/wscript >@@ -864,6 +864,9 @@ def build(bld): > if bld.CONFIG_SET('HAVE_LIBRT'): extra_libs += ' rt' > if bld.CONFIG_SET('REPLACE_REQUIRES_LIBSOCKET_LIBNSL'): extra_libs += ' socket nsl' > >+ if not bld.CONFIG_SET('HAVE_CLOSEFROM'): >+ REPLACE_HOSTCC_SOURCE += ' closefrom.c' >+ > bld.SAMBA_SUBSYSTEM('LIBREPLACE_HOSTCC', > REPLACE_HOSTCC_SOURCE, > use_hostcc=True, >diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build >index 27adbc06dc6f..4cc20c8bf607 100644 >--- a/source4/heimdal_build/wscript_build >+++ b/source4/heimdal_build/wscript_build >@@ -410,12 +410,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'): > ../heimdal_build/replace.c > ''' > >- if not bld.CONFIG_SET('HAVE_CLOSEFROM'): >- ROKEN_HOSTCC_SOURCE = ROKEN_COMMON_SOURCE + ''' >- ../../lib/replace/closefrom.c >- ''' >- else: >- ROKEN_HOSTCC_SOURCE = ROKEN_COMMON_SOURCE >+ ROKEN_HOSTCC_SOURCE = ROKEN_COMMON_SOURCE > > ROKEN_SOURCE = ROKEN_COMMON_SOURCE + ''' > lib/roken/resolve.c >-- >2.17.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
bjacke
:
review+
ab
:
review+
Actions:
View
Attachments on
bug 14482
:
16213
|
16214
| 16215