commit: b5b5949e9412bf536c8311e825d27dea24798caa Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed May 6 12:09:48 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed May 6 12:15:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b5949e
net-fs/samba: Don't build winexe if a mingw compiler has been found Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> net-fs/samba/files/samba-4.13-winexe_option.patch | 67 +++++++++++++++++++++++ net-fs/samba/samba-4.11.9.ebuild | 2 + net-fs/samba/samba-4.12.2.ebuild | 2 + 3 files changed, 71 insertions(+) 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 00000000000..63f8a9ec41d --- /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?= <[email protected]> +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 <[email protected]> +Reviewed-by: Andreas Schneider <[email protected]> + +Autobuild-User(master): Andreas Schneider <[email protected]> +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 + diff --git a/net-fs/samba/samba-4.11.9.ebuild b/net-fs/samba/samba-4.11.9.ebuild index 3b297505873..3fe07a3d430 100644 --- a/net-fs/samba/samba-4.11.9.ebuild +++ b/net-fs/samba/samba-4.11.9.ebuild @@ -132,6 +132,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" "${FILESDIR}/${PN}-4.9.2-timespec.patch" + "${FILESDIR}/${PN}-4.13-winexe_option.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" @@ -192,6 +193,7 @@ multilib_src_configure() { --disable-rpath-install --nopyc --nopyo + --without-winexe $(multilib_native_use_with acl acl-support) $(multilib_native_usex addc '' '--without-ad-dc') $(multilib_native_use_with addns dnsupdate) diff --git a/net-fs/samba/samba-4.12.2.ebuild b/net-fs/samba/samba-4.12.2.ebuild index c74d0e143b9..445bae6f796 100644 --- a/net-fs/samba/samba-4.12.2.ebuild +++ b/net-fs/samba/samba-4.12.2.ebuild @@ -134,6 +134,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" "${FILESDIR}/${PN}-4.9.2-timespec.patch" + "${FILESDIR}/${PN}-4.13-winexe_option.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" @@ -194,6 +195,7 @@ multilib_src_configure() { --disable-rpath-install --nopyc --nopyo + --without-winexe $(multilib_native_use_with acl acl-support) $(multilib_native_usex addc '' '--without-ad-dc') $(multilib_native_use_with addns dnsupdate)
