summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-05-06 14:09:48 +0200
committerLars Wendler <polynomial-c@gentoo.org>2020-05-06 14:15:05 +0200
commitb5b5949e9412bf536c8311e825d27dea24798caa (patch)
tree22cd1593e557e122be5d15e2b48e8c0ec0661b48 /net-fs/samba/files
parentdev-perl/Business-FedEx-DirectConnect: -r bump for EAPI7 (diff)
downloadgentoo-b5b5949e9412bf536c8311e825d27dea24798caa.tar.gz
gentoo-b5b5949e9412bf536c8311e825d27dea24798caa.tar.bz2
gentoo-b5b5949e9412bf536c8311e825d27dea24798caa.zip
net-fs/samba: Don't build winexe if a mingw compiler has been found
Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-fs/samba/files')
-rw-r--r--net-fs/samba/files/samba-4.13-winexe_option.patch67
1 files changed, 67 insertions, 0 deletions
diff --git a/net-fs/samba/files/samba-4.13-winexe_option.patch b/net-fs/samba/files/samba-4.13-winexe_option.patch
new file mode 100644
index 000000000000..63f8a9ec41df
--- /dev/null
+++ b/net-fs/samba/files/samba-4.13-winexe_option.patch
@@ -0,0 +1,67 @@
+From 54c21a99e6ca54bdb963c70d322f6778b57a384f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
+Date: Wed, 4 Mar 2020 18:51:01 +0100
+Subject: [PATCH] winexe: add configure option to control whether to build it
+ (default: auto)
+
+Guenther
+
+Signed-off-by: Guenther Deschner <gd@samba.org>
+Reviewed-by: Andreas Schneider <asn@samba.org>
+
+Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
+Autobuild-Date(master): Mon Mar 9 16:27:21 UTC 2020 on sn-devel-184
+---
+ examples/winexe/wscript_build | 3 ++-
+ source3/wscript | 17 +++++++++++++++++
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/examples/winexe/wscript_build b/examples/winexe/wscript_build
+index 43c09717e3d..559ed3fc706 100644
+--- a/examples/winexe/wscript_build
++++ b/examples/winexe/wscript_build
+@@ -106,4 +106,5 @@ if winexesvc_binaries != '':
+ LOADPARM_CTX
+ libsmb
+ msrpc3
+- ''')
++ ''',
++ enabled=bld.env.build_winexe)
+diff --git a/source3/wscript b/source3/wscript
+index 85466b493fa..6d5bd22ca49 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -63,6 +63,7 @@ def options(opt):
+ opt.samba_add_onoff_option('cluster-support', default=False)
+
+ opt.samba_add_onoff_option('regedit', default=None)
++ opt.samba_add_onoff_option('winexe', default=None)
+
+ opt.samba_add_onoff_option('fake-kaserver',
+ help=("Include AFS fake-kaserver support"), default=False)
+@@ -1782,6 +1783,22 @@ main() {
+ if conf.CHECK_HEADERS('ftw.h') and conf.CHECK_FUNCS('nftw'):
+ conf.env.build_mvxattr = True
+
++ conf.env.build_winexe = False
++ if not Options.options.with_winexe == False:
++ if conf.CONFIG_SET('HAVE_WINEXE_CC_WIN32') or conf.CONFIG_SET('HAVE_WINEXE_CC_WIN64'):
++ conf.env.build_winexe = True
++
++ if conf.env.build_winexe:
++ Logs.info("building winexe")
++ else:
++ if Options.options.with_winexe == False:
++ Logs.info("not building winexe (--without-winexe)")
++ elif Options.options.with_winexe == True:
++ Logs.error("mingw not available, cannot build winexe")
++ conf.fatal("mingw not available, but --with-winexe was specified")
++ else:
++ Logs.info("mingw not available, not building winexe")
++
+ conf.CHECK_FUNCS_IN('DES_pcbc_encrypt', 'crypto')
+ if Options.options.with_fake_kaserver == True:
+ conf.CHECK_HEADERS('afs/param.h afs/stds.h', together=True)
+--
+2.26.2
+