mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00
Code Issues Releases Activity

Upgrade Samba supplimentary ports to the new build system. Effectively they are dependent now from Python 3.4+ for the build, unless NO_PYTHON is specified,

Browse Source 
in which case ports still can be build with Python 2.7.

That should address legacy Python dependencies for some non-Samba ports as well.
This commit is contained in:
Timur I. Bakeyev 2019-06-19 22:44:25 +00:00
parent 77b718fdac
commit 29295bfeff
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=504597
31 changed files with 186 additions and 470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
databases/tdb/Makefile
View File

@ -1,9 +1,9 @@
# $FreeBSD$
PORTNAME= tdb
PORTVERSION= 1.3.16
PORTVERSION= 1.4.0
PORTREVISION= 0
PORTEPOCH= 1
PORTEPOCH= 0
CATEGORIES= databases
MASTER_SITES= SAMBA
@ -14,6 +14,8 @@ LICENSE= GPLv3
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
CONFLICTS_INSTALL= tdb1-*
#FLAVORS= default nopython debug
#nopython_PKGNAMESUFFIX= -nopython
#debug_PKGNAMESUFFIX= -debug
@ -21,7 +23,7 @@ IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with
#debug_CONFLICTS= tdb tdb-nopython
#default_CONFLICTS= tdb-nopython tdb-debug
USES= compiler pkgconfig waf
USES= compiler gettext-runtime pkgconfig waf
USE_LDCONFIG= yes
WAF_CMD= buildtools/bin/waf
CONFIGURE_LOG= bin/config.log
@ -33,9 +35,13 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
--disable-rpath \
--without-gettext
OPTIONS_DEFINE= MANPAGES
OPTIONS_DEFINE= MANPAGES DEBUG
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
DEBUG_CONFIGURE_ON= --verbose --enable-debug
DEBUG_MAKE_ARGS= --verbose
DEBUG_FLAGS= -g -ggdb3 -O0 -DTDB_TRACE=1
.include <bsd.port.options.mk>
TDB_BINS= bin/tdbbackup \
@ -49,42 +55,15 @@ PLIST_FILES+= include/tdb.h \
lib/libtdb.so.1 \
${PKGCONFIGDIR}/tdb.pc
.if defined(SAMBA4_DEBUG)
CFLAGS+= -DTDB_TRACE=1
.endif
.if defined(NO_PYTHON)
USES+= python:2.7,build
USES+= python:2.7+,build,test
CONFIGURE_ARGS+= --disable-python
.else
USES+= python:2.7
USES+= python:3.4+
PLIST_FILES+= ${PYTHON_SITELIBDIR}/tdb.so \
${PYTHON_SITELIBDIR}/_tdb_text.py
# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
# This is not officially supported, use at your own risk
.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
SAMBA4_PYTHON3_VERSION= ${WITH_SAMBA4_PYTHON3}
SAMBA4_PYTHON3= python${SAMBA4_PYTHON3_VERSION}
SAMBA4_PYTHON3_VER= ${SAMBA4_PYTHON3_VERSION:C/\.//}
.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
.error unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
.endif
BUILD_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
RUN_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
# cpython-36m
SAMBA4_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
PLIST_FILES+= ${SAMBA4_PYTHON3_SITELIBDIR}/tdb.${SAMBA4_PYTHON3_SO_ABI}.so \
${SAMBA4_PYTHON3_SITELIBDIR}/_tdb_text.py
.endif
.endif
.include <bsd.port.pre.mk>
@ -134,9 +113,6 @@ post-install:
.endfor
.if !defined(NO_PYTHON)
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb.so
.if defined(SAMBA4_PYTHON3)
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/tdb.${SAMBA4_PYTHON3_SO_ABI}.so
.endif
.endif
.include <bsd.port.post.mk>

6
databases/tdb/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1531611906
SHA256 (tdb-1.3.16.tar.gz) = 6a3fc2616567f23993984ada3cea97d953a27669ffd1bfbbe961f26e0cf96cc5
SIZE (tdb-1.3.16.tar.gz) = 504330
TIMESTAMP = 1560369252
SHA256 (tdb-1.4.0.tar.gz) = c1a0729c5400fb495465fa4bd953ae290db43c28dacd0506aef50dc482132d35
SIZE (tdb-1.4.0.tar.gz) = 696994

52
databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py
View File

@ -1,52 +0,0 @@
--- buildtools/wafsamba/samba_autoconf.py.orig 2016-10-07 04:45:35 UTC
+++ buildtools/wafsamba/samba_autoconf.py
@@ -548,7 +548,7 @@ def library_flags(self, libs):
@conf
-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
'''check if a set of libraries exist as system libraries
returns the sublist of libs that do exist as a syslib or []
@@ -568,11 +568,29 @@ int foo()
ret.append(lib)
continue
+ if msg is None:
+ msg = 'Checking for library %s' % lib
+
(ccflags, ldflags, cpppath) = library_flags(conf, lib)
+
if shlib:
- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(features='c cshlib',
+ fragment=fragment,
+ lib=lib,
+ uselib_store=lib,
+ ccflags=ccflags,
+ ldflags=ldflags,
+ uselib=lib.upper(),
+ mandatory=False,
+ msg=msg)
else:
- res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(lib=lib,
+ uselib_store=lib,
+ ccflags=ccflags,
+ ldflags=ldflags,
+ uselib=lib.upper(),
+ mandatory=False,
+ msg=msg)
if not res:
if mandatory:
@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
- if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
+ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
@conf

40
databases/tdb/files/patch-buildtools__wafsamba__samba_python.py
View File

@ -1,40 +0,0 @@
--- buildtools/wafsamba/samba_python.py.orig 2018-01-13 09:07:51 UTC
+++ buildtools/wafsamba/samba_python.py
@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
def _check_python_headers(conf, mandatory):
try:
+ from python import _get_python_variables
Configure.ConfigurationError
conf.check_python_headers(mandatory=mandatory)
+ conf.env['PYTHON_SO_ABI'] = _get_python_variables(
+ conf.env['PYTHON'],
+ ["get_config_var('SOABI') or ''"],
+ ['from distutils.sysconfig import get_config_var']
+ )[0]
except Configure.ConfigurationError:
if mandatory:
raise
if conf.env['PYTHON_VERSION'] > '3':
- abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
- conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
+ '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
+ while environment variable is PYTHON3_SO_ABI_FLAG'''
+ override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
+ if override_PYTHON_SO_ABI_FLAG is not None:
+ conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
+ if not conf.env['PYTHON_SO_ABI_FLAG']:
+ if conf.env['PYTHON_SO_ABI']:
+ conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
+ else:
+ abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
+ conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
else:
conf.env['PYTHON_SO_ABI_FLAG'] = ''
+
conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))

36
databases/tdb/files/patch-buildtools_wafsamba_samba__autoconf.py Normal file
View File

@ -0,0 +1,36 @@
--- buildtools/wafsamba/samba_autoconf.py.orig 2019-02-26 06:44:21 UTC
+++ buildtools/wafsamba/samba_autoconf.py
@@ -573,7 +573,7 @@ def library_flags(self, libs):
@conf
-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
'''check if a set of libraries exist as system libraries
returns the sublist of libs that do exist as a syslib or []
@@ -593,11 +593,14 @@ int foo()
ret.append(lib)
continue
+ if msg is None:
+ msg = 'Checking for library %s' % lib
+
(ccflags, ldflags, cpppath) = library_flags(conf, lib)
if shlib:
- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg)
else:
- res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg)
if not res:
if mandatory:
@@ -925,6 +928,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
- if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
+ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
-

2
devel/talloc/files/patch-buildtools__wafsamba__samba_install.py → databases/tdb/files/patch-buildtools_wafsamba_samba__install.py
View File

@ -1,4 +1,4 @@
--- buildtools/wafsamba/samba_install.py.orig 2015-12-10 11:01:40 UTC
--- buildtools/wafsamba/samba_install.py.orig 2019-02-14 11:21:38 UTC
+++ buildtools/wafsamba/samba_install.py
@@ -118,7 +118,7 @@ def install_library(self):
inst_name = bld.make_libname(t.target)

4
devel/tevent/files/patch-buildtools__wafsamba__wscript → databases/tdb/files/patch-buildtools_wafsamba_wscript
View File

@ -1,6 +1,6 @@
--- buildtools/wafsamba/wscript.orig 2017-04-28 11:57:26 UTC
--- buildtools/wafsamba/wscript.orig 2019-02-26 06:44:21 UTC
+++ buildtools/wafsamba/wscript
@@ -76,10 +76,10 @@ def set_options(opt):
@@ -82,10 +82,10 @@ def options(opt):
opt.add_option('--with-libiconv',
help='additional directory to search for libiconv',

8
databases/tdb/files/patch-lib__replace__wscript → databases/tdb/files/patch-lib_replace_wscript
View File

@ -1,11 +1,11 @@
--- lib/replace/wscript.orig 2017-08-24 11:27:53 UTC
--- lib/replace/wscript.orig 2019-02-26 06:44:21 UTC
+++ lib/replace/wscript
@@ -81,7 +81,7 @@ def configure(conf):
conf.CHECK_HEADERS('sys/atomic.h')
@@ -119,7 +119,7 @@ def configure(conf):
conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')
conf.CHECK_HEADERS('libgen.h')
- if conf.CHECK_CFLAGS('-Wno-format-truncation'):
+ if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
# Check for process set name support
if conf.CHECK_CFLAGS('-Wno-unused-function'):

4
databases/tdb/files/patch-wscript
View File

@ -1,6 +1,6 @@
--- wscript.orig 2017-08-24 11:29:08 UTC
--- wscript.orig 2019-02-26 07:02:52 UTC
+++ wscript
@@ -115,7 +115,7 @@ def build(bld):
@@ -121,7 +121,7 @@ def build(bld):
COMMON_SRC = bld.SUBDIR('common', COMMON_FILES)
if bld.env.standalone_tdb:

44
devel/talloc/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= talloc
PORTVERSION= 2.1.14
PORTVERSION= 2.2.0
PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= SAMBA
@ -13,6 +13,8 @@ LICENSE= LGPL3
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
CONFLICTS_INSTALL= talloc1-*
#FLAVORS= default nopython
#nopython_PKGNAMESUFFIX= -nopython
#nopython_CONFLICTS= talloc
@ -30,9 +32,13 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
--disable-rpath \
--without-gettext
OPTIONS_DEFINE= MANPAGES
OPTIONS_DEFINE= MANPAGES DEBUG
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
DEBUG_CONFIGURE_ON= --verbose --enable-debug
DEBUG_MAKE_ARGS= --verbose
DEBUG_FLAGS= -g -ggdb3 -O0
.include <bsd.port.options.mk>
PLIST_FILES+= include/talloc.h \
@ -41,42 +47,16 @@ PLIST_FILES+= include/talloc.h \
${PKGCONFIGDIR}/talloc.pc
.if defined(NO_PYTHON)
USES+= python:2.7,build
USES+= python:2.7+,build,test
CONFIGURE_ARGS+= --disable-python
.else
USES+= python:2.7
USES+= python:3.4+
PLIST_FILES+= include/pytalloc.h \
lib/libpytalloc-util.so \
lib/libpytalloc-util.so.2 \
${PYTHON_SITELIBDIR}/talloc.so \
${PKGCONFIGDIR}/pytalloc-util.pc
# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
# This is not officially supported, use at your own risk
.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
SAMBA4_PYTHON3_VERSION= ${WITH_SAMBA4_PYTHON3}
SAMBA4_PYTHON3= python${SAMBA4_PYTHON3_VERSION}
SAMBA4_PYTHON3_VER= ${SAMBA4_PYTHON3_VERSION:C/\.//}
.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
.error unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
.endif
BUILD_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
RUN_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
# cpython-36m
SAMBA4_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
PLIST_FILES+= lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so \
lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so.2 \
${SAMBA4_PYTHON3_SITELIBDIR}/talloc.${SAMBA4_PYTHON3_SO_ABI}.so \
${PKGCONFIGDIR}/pytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.pc
.endif
.endif
.include <bsd.port.pre.mk>
@ -122,10 +102,6 @@ post-install:
.if !defined(NO_PYTHON)
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.so
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc.so
.if defined(SAMBA4_PYTHON3)
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/talloc.${SAMBA4_PYTHON3_SO_ABI}.so
.endif
.endif
.include <bsd.port.post.mk>

6
devel/talloc/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1531611950
SHA256 (talloc-2.1.14.tar.gz) = b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367ce
SIZE (talloc-2.1.14.tar.gz) = 444589
TIMESTAMP = 1558143287
SHA256 (talloc-2.2.0.tar.gz) = 5c6f6a45ef96b3fd0b28942673a68d0c6af5dcca9d676a2e4d57ce7e86c22ebc
SIZE (talloc-2.2.0.tar.gz) = 633467

52
devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py
View File

@ -1,52 +0,0 @@
--- buildtools/wafsamba/samba_autoconf.py.orig 2016-10-07 04:45:35 UTC
+++ buildtools/wafsamba/samba_autoconf.py
@@ -548,7 +548,7 @@ def library_flags(self, libs):
@conf
-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
'''check if a set of libraries exist as system libraries
returns the sublist of libs that do exist as a syslib or []
@@ -568,11 +568,29 @@ int foo()
ret.append(lib)
continue
+ if msg is None:
+ msg = 'Checking for library %s' % lib
+
(ccflags, ldflags, cpppath) = library_flags(conf, lib)
+
if shlib:
- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(features='c cshlib',
+ fragment=fragment,
+ lib=lib,
+ uselib_store=lib,
+ ccflags=ccflags,
+ ldflags=ldflags,
+ uselib=lib.upper(),
+ mandatory=False,
+ msg=msg)
else:
- res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(lib=lib,
+ uselib_store=lib,
+ ccflags=ccflags,
+ ldflags=ldflags,
+ uselib=lib.upper(),
+ mandatory=False,
+ msg=msg)
if not res:
if mandatory:
@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
- if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
+ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
@conf

40
devel/talloc/files/patch-buildtools__wafsamba__samba_python.py
View File

@ -1,40 +0,0 @@
--- buildtools/wafsamba/samba_python.py.orig 2018-01-13 09:07:51 UTC
+++ buildtools/wafsamba/samba_python.py
@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
def _check_python_headers(conf, mandatory):
try:
+ from python import _get_python_variables
Configure.ConfigurationError
conf.check_python_headers(mandatory=mandatory)
+ conf.env['PYTHON_SO_ABI'] = _get_python_variables(
+ conf.env['PYTHON'],
+ ["get_config_var('SOABI') or ''"],
+ ['from distutils.sysconfig import get_config_var']
+ )[0]
except Configure.ConfigurationError:
if mandatory:
raise
if conf.env['PYTHON_VERSION'] > '3':
- abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
- conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
+ '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
+ while environment variable is PYTHON3_SO_ABI_FLAG'''
+ override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
+ if override_PYTHON_SO_ABI_FLAG is not None:
+ conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
+ if not conf.env['PYTHON_SO_ABI_FLAG']:
+ if conf.env['PYTHON_SO_ABI']:
+ conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
+ else:
+ abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
+ conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
else:
conf.env['PYTHON_SO_ABI_FLAG'] = ''
+
conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))

36
devel/talloc/files/patch-buildtools_wafsamba_samba__autoconf.py Normal file
View File

@ -0,0 +1,36 @@
--- buildtools/wafsamba/samba_autoconf.py.orig 2019-03-21 10:12:32 UTC
+++ buildtools/wafsamba/samba_autoconf.py
@@ -573,7 +573,7 @@ def library_flags(self, libs):
@conf
-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
'''check if a set of libraries exist as system libraries
returns the sublist of libs that do exist as a syslib or []
@@ -593,11 +593,14 @@ int foo()
ret.append(lib)
continue
+ if msg is None:
+ msg = 'Checking for library %s' % lib
+
(ccflags, ldflags, cpppath) = library_flags(conf, lib)
if shlib:
- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg)
else:
- res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg)
if not res:
if mandatory:
@@ -925,6 +928,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
- if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
+ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
-

6
databases/tdb/files/patch-buildtools__wafsamba__samba_install.py → devel/talloc/files/patch-buildtools_wafsamba_samba__install.py
View File

@ -1,6 +1,6 @@
--- buildtools/wafsamba/samba_install.py.orig 2015-12-10 11:01:40 UTC
--- buildtools/wafsamba/samba_install.py.orig 2019-03-21 10:12:32 UTC
+++ buildtools/wafsamba/samba_install.py
@@ -118,7 +118,7 @@ def install_library(self):
@@ -115,7 +115,7 @@ def install_library(self):
inst_name = bld.make_libname(t.target)
elif self.vnum:
vnum_base = self.vnum.split('.')[0]
@ -8,4 +8,4 @@
+ install_name = bld.make_libname(target_name, version=vnum_base)
install_link = bld.make_libname(target_name, version=vnum_base)
inst_name = bld.make_libname(t.target)
if not self.private_library:
if not self.private_library or not t.env.SONAME_ST:

4
devel/talloc/files/patch-buildtools__wafsamba__wscript → devel/talloc/files/patch-buildtools_wafsamba_wscript
View File

@ -1,6 +1,6 @@
--- buildtools/wafsamba/wscript.orig 2017-04-28 11:57:26 UTC
--- buildtools/wafsamba/wscript.orig 2019-03-21 10:12:32 UTC
+++ buildtools/wafsamba/wscript
@@ -76,10 +76,10 @@ def set_options(opt):
@@ -82,10 +82,10 @@ def options(opt):
opt.add_option('--with-libiconv',
help='additional directory to search for libiconv',

8
devel/tevent/files/patch-lib__replace__wscript → devel/talloc/files/patch-lib_replace_wscript
View File

@ -1,11 +1,11 @@
--- lib/replace/wscript.orig 2017-07-02 20:22:14 UTC
--- lib/replace/wscript.orig 2019-03-21 10:12:32 UTC
+++ lib/replace/wscript
@@ -81,7 +81,7 @@ def configure(conf):
conf.CHECK_HEADERS('sys/atomic.h')
@@ -119,7 +119,7 @@ def configure(conf):
conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')
conf.CHECK_HEADERS('libgen.h')
- if conf.CHECK_CFLAGS('-Wno-format-truncation'):
+ if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
# Check for process set name support
if conf.CHECK_CFLAGS('-Wno-unused-function'):

6
devel/talloc/files/patch-talloc.c
View File

@ -1,6 +1,6 @@
--- talloc.c.orig 2018-01-13 09:07:51 UTC
--- talloc.c.orig 2019-03-21 10:12:32 UTC
+++ talloc.c
@@ -387,6 +387,9 @@ void talloc_lib_init(void) __attribute__
@@ -396,6 +396,9 @@ void talloc_lib_init(void) __attribute__
void talloc_lib_init(void)
{
uint32_t random_value;
@ -10,7 +10,7 @@
#if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM)
uint8_t *p;
/*
@@ -420,6 +423,7 @@ void talloc_lib_init(void)
@@ -429,6 +432,7 @@ void talloc_lib_init(void)
*/
random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF);
}

11
devel/talloc/files/patch-third_party__waf__wafadmin__Tools__cc.py
View File

@ -1,11 +0,0 @@
--- third_party/waf/wafadmin/Tools/cc.py.orig 2015-11-06 13:25:52 UTC
+++ third_party/waf/wafadmin/Tools/cc.py
@@ -88,7 +88,7 @@ def c_hook(self, node):
raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
return task
-cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
+cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
cls.scan = ccroot.scan
cls.vars.append('CCDEPS')

4
devel/talloc/files/patch-wscript
View File

@ -1,6 +1,6 @@
--- wscript.orig 2018-01-13 09:07:51 UTC
--- wscript.orig 2019-03-21 10:12:32 UTC
+++ wscript
@@ -46,13 +46,14 @@ def configure(conf):
@@ -45,13 +45,14 @@ def configure(conf):
conf.env.TALLOC_COMPAT1 = False
if conf.env.standalone_talloc:
conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1

8
devel/talloc/files/talloc.3
View File

@ -1,7 +1,7 @@
'\" t
.\" Title: talloc
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 2015-04-10
.\" Manual: System Administration tools
.\" Source: Samba 4.0
@ -131,8 +131,6 @@ From the 2\&.0 version of talloc, as a special case, talloc_free() is refused on
.PP
To help you find problems in your code caused by this behaviour, if you do try and free a pointer with more than one parent then the talloc logging function will be called to give output like this:
.PP
.sp
.if n \{\
.RS 4
.\}
@ -163,8 +161,6 @@ is NULL, then the function is a no\-op, and simply returns NULL\&.
.PP
After creating a reference you can free it in one of the following ways:
.PP
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
@ -365,8 +361,6 @@ It is possible to produce loops in the parent/child relationship if you are not
.PP
Note that if you try and call talloc_steal() on a pointer that has more than one parent then the result is ambiguous\&. Talloc will choose to remove the parent that is currently indicated by talloc_parent() and replace it with the chosen parent\&. You will also get a message like this via the talloc logging functions:
.PP
.sp
.if n \{\
.RS 4
.\}

59
devel/tevent/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tevent
PORTVERSION= 0.9.37
PORTVERSION= 0.10.0
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= devel
@ -14,15 +14,17 @@ LICENSE= LGPL3
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
BUILD_DEPENDS= talloc>=2.1.11:devel/talloc
RUN_DEPENDS= talloc>=2.1.11:devel/talloc
BUILD_DEPENDS= talloc>=2.2.0:devel/talloc
RUN_DEPENDS= talloc>=2.2.0:devel/talloc
CONFLICTS_INSTALL= tevent1-*
#FLAVORS= default nopython
#nopython_PKGNAMESUFFIX= -nopython
#nopython_CONFLICTS= tevent
#default_CONFLICTS= tevent-nopython
USES= compiler pkgconfig waf
USES= compiler gettext-runtime pkgconfig waf
USE_LDCONFIG= yes
WAF_CMD= buildtools/bin/waf
CONFIGURE_LOG= bin/config.log
@ -36,9 +38,13 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
--disable-rpath \
--without-gettext
OPTIONS_DEFINE= MANPAGES
OPTIONS_DEFINE= MANPAGES DEBUG
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
DEBUG_CONFIGURE_ON= --verbose --enable-debug
DEBUG_MAKE_ARGS= --verbose
DEBUG_FLAGS= -g -ggdb3 -O0
.include <bsd.port.options.mk>
PLIST_FILES+= include/tevent.h \
@ -47,41 +53,13 @@ PLIST_FILES+= include/tevent.h \
${PKGCONFIGDIR}/tevent.pc
.if defined(NO_PYTHON)
USES+= python:2.7,build
USES+= python:2.7+,build,test
CONFIGURE_ARGS+= --disable-python
.else
USES+= python:2.7
USES+= python:3.4+
PLIST_FILES+= ${PYTHON_SITELIBDIR}/_tevent.so \
${PYTHON_SITELIBDIR}/tevent.py \
${PYTHON_SITELIBDIR}/tevent.pyc \
${PYTHON_SITELIBDIR}/tevent.pyo
# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
# This is not officially supported, use at your own risk
.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
SAMBA4_PYTHON3_VERSION= ${WITH_SAMBA4_PYTHON3}
SAMBA4_PYTHON3= python${SAMBA4_PYTHON3_VERSION}
SAMBA4_PYTHON3_VER= ${SAMBA4_PYTHON3_VERSION:C/\.//}
.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
.error unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
.endif
BUILD_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
RUN_DEPENDS+= ${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
# cpython-36m
SAMBA4_PYTHON3_SO_ABI!= [ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
CONFIGURE_ENV+= PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
PLIST_FILES+= ${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so \
${SAMBA4_PYTHON3_SITELIBDIR}/tevent.py \
${SAMBA4_PYTHON3_SITELIBDIR}/tevent.pyc \
${SAMBA4_PYTHON3_SITELIBDIR}/tevent.pyo
.endif
${PYTHON_SITELIBDIR}/tevent.py
.endif
.include <bsd.port.pre.mk>
@ -112,19 +90,10 @@ pre-configure:
${FALSE}; \
fi
.if !defined(NO_PYTHON)
post-build:
${PYTHON_CMD} -m py_compile ${BUILD_WRKSRC}/tevent.py
${PYTHON_CMD} -O -m py_compile ${BUILD_WRKSRC}/tevent.py
.endif
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
.if !defined(NO_PYTHON)
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent.so
.if defined(SAMBA4_PYTHON3)
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so
.endif
.endif
.include <bsd.port.post.mk>

6
devel/tevent/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1531613973
SHA256 (tevent-0.9.37.tar.gz) = 168345ed65eac03785cf77b95238e7dc66cbb473a42811693a6b0916e5dae7e0
SIZE (tevent-0.9.37.tar.gz) = 603859
TIMESTAMP = 1560369699
SHA256 (tevent-0.10.0.tar.gz) = 33f39612cd6d1ae6a737245784581494846f5bb07827983d2f41f942446aa4e6
SIZE (tevent-0.10.0.tar.gz) = 794845

52
devel/tevent/files/patch-buildtools__wafsamba__samba_autoconf.py
View File

@ -1,52 +0,0 @@
--- buildtools/wafsamba/samba_autoconf.py.orig 2016-10-07 04:45:35 UTC
+++ buildtools/wafsamba/samba_autoconf.py
@@ -548,7 +548,7 @@ def library_flags(self, libs):
@conf
-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
'''check if a set of libraries exist as system libraries
returns the sublist of libs that do exist as a syslib or []
@@ -568,11 +568,29 @@ int foo()
ret.append(lib)
continue
+ if msg is None:
+ msg = 'Checking for library %s' % lib
+
(ccflags, ldflags, cpppath) = library_flags(conf, lib)
+
if shlib:
- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(features='c cshlib',
+ fragment=fragment,
+ lib=lib,
+ uselib_store=lib,
+ ccflags=ccflags,
+ ldflags=ldflags,
+ uselib=lib.upper(),
+ mandatory=False,
+ msg=msg)
else:
- res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(lib=lib,
+ uselib_store=lib,
+ ccflags=ccflags,
+ ldflags=ldflags,
+ uselib=lib.upper(),
+ mandatory=False,
+ msg=msg)
if not res:
if mandatory:
@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
- if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
+ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
@conf

40
devel/tevent/files/patch-buildtools__wafsamba__samba_python.py
View File

@ -1,40 +0,0 @@
--- buildtools/wafsamba/samba_python.py.orig 2018-01-13 09:07:51 UTC
+++ buildtools/wafsamba/samba_python.py
@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
def _check_python_headers(conf, mandatory):
try:
+ from python import _get_python_variables
Configure.ConfigurationError
conf.check_python_headers(mandatory=mandatory)
+ conf.env['PYTHON_SO_ABI'] = _get_python_variables(
+ conf.env['PYTHON'],
+ ["get_config_var('SOABI') or ''"],
+ ['from distutils.sysconfig import get_config_var']
+ )[0]
except Configure.ConfigurationError:
if mandatory:
raise
if conf.env['PYTHON_VERSION'] > '3':
- abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
- conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
+ '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
+ while environment variable is PYTHON3_SO_ABI_FLAG'''
+ override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
+ if override_PYTHON_SO_ABI_FLAG is not None:
+ conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
+ if not conf.env['PYTHON_SO_ABI_FLAG']:
+ if conf.env['PYTHON_SO_ABI']:
+ conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
+ else:
+ abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
+ conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
else:
conf.env['PYTHON_SO_ABI_FLAG'] = ''
+
conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))

36
devel/tevent/files/patch-buildtools_wafsamba_samba__autoconf.py Normal file
View File

@ -0,0 +1,36 @@
--- buildtools/wafsamba/samba_autoconf.py.orig 2019-03-21 10:12:32 UTC
+++ buildtools/wafsamba/samba_autoconf.py
@@ -573,7 +573,7 @@ def library_flags(self, libs):
@conf
-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
'''check if a set of libraries exist as system libraries
returns the sublist of libs that do exist as a syslib or []
@@ -593,11 +593,14 @@ int foo()
ret.append(lib)
continue
+ if msg is None:
+ msg = 'Checking for library %s' % lib
+
(ccflags, ldflags, cpppath) = library_flags(conf, lib)
if shlib:
- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg)
else:
- res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
+ res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg)
if not res:
if mandatory:
@@ -925,6 +928,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
- if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
+ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
-

6
devel/tevent/files/patch-buildtools__wafsamba__samba_install.py → devel/tevent/files/patch-buildtools_wafsamba_samba__install.py
View File

@ -1,6 +1,6 @@
--- buildtools/wafsamba/samba_install.py.orig 2015-12-10 11:01:40 UTC
--- buildtools/wafsamba/samba_install.py.orig 2019-03-21 10:12:32 UTC
+++ buildtools/wafsamba/samba_install.py
@@ -118,7 +118,7 @@ def install_library(self):
@@ -115,7 +115,7 @@ def install_library(self):
inst_name = bld.make_libname(t.target)
elif self.vnum:
vnum_base = self.vnum.split('.')[0]
@ -8,4 +8,4 @@
+ install_name = bld.make_libname(target_name, version=vnum_base)
install_link = bld.make_libname(target_name, version=vnum_base)
inst_name = bld.make_libname(t.target)
if not self.private_library:
if not self.private_library or not t.env.SONAME_ST:

4
databases/tdb/files/patch-buildtools__wafsamba__wscript → devel/tevent/files/patch-buildtools_wafsamba_wscript
View File

@ -1,6 +1,6 @@
--- buildtools/wafsamba/wscript.orig 2017-04-28 11:57:26 UTC
--- buildtools/wafsamba/wscript.orig 2019-03-21 10:12:32 UTC
+++ buildtools/wafsamba/wscript
@@ -76,10 +76,10 @@ def set_options(opt):
@@ -82,10 +82,10 @@ def options(opt):
opt.add_option('--with-libiconv',
help='additional directory to search for libiconv',

8
devel/talloc/files/patch-lib__replace__wscript → devel/tevent/files/patch-lib_replace_wscript
View File

@ -1,11 +1,11 @@
--- lib/replace/wscript.orig 2017-07-02 20:22:14 UTC
--- lib/replace/wscript.orig 2019-03-21 10:12:32 UTC
+++ lib/replace/wscript
@@ -81,7 +81,7 @@ def configure(conf):
conf.CHECK_HEADERS('sys/atomic.h')
@@ -119,7 +119,7 @@ def configure(conf):
conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')
conf.CHECK_HEADERS('libgen.h')
- if conf.CHECK_CFLAGS('-Wno-format-truncation'):
+ if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
# Check for process set name support
if conf.CHECK_CFLAGS('-Wno-unused-function'):

11
devel/tevent/files/patch-third_party__waf__wafadmin__Tools__cc.py
View File

@ -1,11 +0,0 @@
--- third_party/waf/wafadmin/Tools/cc.py.orig 2015-11-06 13:25:52 UTC
+++ third_party/waf/wafadmin/Tools/cc.py
@@ -88,7 +88,7 @@ def c_hook(self, node):
raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self))
return task
-cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
+cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False)
cls.scan = ccroot.scan
cls.vars.append('CCDEPS')

9
devel/tevent/files/patch-wscript
View File

@ -9,12 +9,3 @@
private_library = False
else:
private_library = True
@@ -120,7 +120,7 @@ def build(bld):
cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION)
- bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py', flat=False)
+ bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py*', flat=False)
# install out various python scripts for use by make test
bld.SAMBA_SCRIPT('tevent_python',