mirror of
https://git.freebsd.org/ports.git
synced 2025-04-29 18:16:48 -04:00
2daf87ac19
This is an initial attempt to add Samba to the FreeBSD after major
rewrite of the VFS code in the upstream.
Most of the port development is now carried in:
https://gitlab.com/samba-freebsd
Due to the way how new Samba VFS code is written there is a constrain
that Samba 4.14+ can run only on FreeBSD 13.1+, as it requires support
of the `nodup` option for the `fdesc` file system, as well as it's
presence in the system in general.
https://gitlab.com/samba-freebsd/-/wikis/The-New-VFS
I'd like to thank CyberSecure Pty Ltd. company for their supoort of
the port development and Andrew Walker from iXsystems Inc. for the
patches he created and made available for the Samba4 on TrueNAS.
PR: 263874
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From 5b0d17a5b7849f40f59fb0daedd62e8f5a1b0fba Mon Sep 17 00:00:00 2001
|
|
From: "Timur I. Bakeyev" <timur@FreeBSD.org>
|
|
Date: Sun, 30 May 2021 03:16:37 +0200
|
|
Subject: [PATCH 10/28] Add option --with-pkgconfigdir, to specify alternative
|
|
location.
|
|
|
|
Override name of the config file.
|
|
|
|
Remove code that doesn't allow direct install into /usr
|
|
|
|
Substitution: yes
|
|
|
|
Signed-off-by: Timur I. Bakeyev <timur@FreeBSD.org>
|
|
---
|
|
dynconfig/wscript | 9 ++++-----
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/dynconfig/wscript b/dynconfig/wscript
|
|
index c62afa25399..29cacf1b92c 100644
|
|
--- a/dynconfig/wscript
|
|
+++ b/dynconfig/wscript
|
|
@@ -151,6 +151,8 @@ dynconfig = {
|
|
'PKGCONFIGDIR' : {
|
|
'STD-PATH': '${LIBDIR}/pkgconfig',
|
|
'FHS-PATH': '${LIBDIR}/pkgconfig',
|
|
+ 'OPTION': '--with-pkgconfigdir',
|
|
+ 'HELPTEXT': 'Where to put .pc files',
|
|
},
|
|
'CODEPAGEDIR' : {
|
|
'STD-PATH': '${DATADIR}/codepages',
|
|
@@ -257,8 +259,8 @@ dynconfig = {
|
|
'DELAY': True,
|
|
},
|
|
'CONFIGFILE' : {
|
|
- 'STD-PATH': '${CONFIGDIR}/smb.conf',
|
|
- 'FHS-PATH': '${CONFIGDIR}/smb.conf',
|
|
+ 'STD-PATH': '${CONFIGDIR}/%%SAMBA4_CONFIG%%',
|
|
+ 'FHS-PATH': '${CONFIGDIR}/%%SAMBA4_CONFIG%%',
|
|
'DELAY': True,
|
|
},
|
|
'LMHOSTSFILE' : {
|
|
@@ -317,9 +319,6 @@ def configure(conf):
|
|
flavor = 'FHS-PATH'
|
|
else:
|
|
flavor = 'STD-PATH'
|
|
- if conf.env.PREFIX == '/usr' or conf.env.PREFIX == '/usr/local':
|
|
- Logs.error("Don't install directly under /usr or /usr/local without using the FHS option (--enable-fhs)")
|
|
- raise Errors.WafError("ERROR: invalid --prefix=%s value" % (conf.env.PREFIX))
|
|
|
|
explicit_set ={}
|
|
|
|
--
|
|
2.37.1
|
|
|