cuong/FFmpegKit56
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
4a8381821293db9faf3463397aebad1f371fc684
FFmpegKit56/Plugins/BuildFFmpeg/patch/libsmbclient/02-cross_compile.patch
cuong mac mini m2 4b968a3347
Some checks failed
/ buid (push) Has been cancelled
Details
first commit
2026-04-16 14:48:09 +07:00

291 lines
10 KiB
Diff
Raw Blame History

--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -320,7 +320,7 @@
@conf
-def CHECK_SIZEOF(conf, vars, headers=None, define=None, critical=True):
+def CHECK_SIZEOF(conf, vars, headers=None, define=None, cflags='', critical=True):
'''check the size of a type'''
for v in TO_LIST(vars):
v_define = define
@@ -333,6 +333,7 @@
define=v_define,
quote=False,
headers=headers,
+ cflags=cflags,
local_include=False,
msg="Checking if size of %s == %d" % (v, size)):
conf.DEFINE(v_define, size)
@@ -843,7 +844,6 @@
for key in conf.env.define_key:
conf.undefine(key, from_env=False)
conf.env.define_key = []
- conf.SAMBA_CROSS_CHECK_COMPLETE()
@conf
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -101,25 +101,24 @@
else:
conf.DEFINE(flag_split[0], flag_split[1])
- if conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1',
- define,
- execute=True,
- msg='Checking for large file support without additional flags'):
+ conf.undefine("SIZEOF_OFF_T")
+ conf.CHECK_SIZEOF("off_t")
+ if int(conf.get_define("SIZEOF_OFF_T")) >= 8:
+ conf.undefine("SIZEOF_OFF_T")
+ conf.DEFINE(define, 1)
return True
- if conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1',
- define,
- execute=True,
- cflags='-D_FILE_OFFSET_BITS=64',
- msg='Checking for -D_FILE_OFFSET_BITS=64'):
+ conf.undefine("SIZEOF_OFF_T")
+ conf.CHECK_SIZEOF("off_t", cflags='-D_FILE_OFFSET_BITS=64')
+ if int(conf.get_define("SIZEOF_OFF_T")) >= 8:
+ conf.undefine("SIZEOF_OFF_T")
conf.DEFINE('_FILE_OFFSET_BITS', 64)
return True
- if conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1',
- define,
- execute=True,
- cflags='-D_LARGE_FILES',
- msg='Checking for -D_LARGE_FILES'):
+ conf.undefine("SIZEOF_OFF_T")
+ conf.CHECK_SIZEOF("off_t", cflags='-D_LARGE_FILES')
+ if int(conf.get_define("SIZEOF_OFF_T")) >= 8:
+ conf.undefine("SIZEOF_OFF_T")
conf.DEFINE('_LARGE_FILES', 1)
return True
return False
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -317,7 +317,7 @@
conf.CHECK_CODE('printf("hello world")',
define='HAVE_SIMPLE_C_PROG',
mandatory=True,
- execute=True,
+ execute=False,
headers='stdio.h',
msg='Checking simple C program')
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -41,6 +41,7 @@
conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
+ conf.CHECK_FUNCS('nl_langinfo', headers='langinfo.h')
conf.CHECK_HEADERS('locale.h ndir.h pwd.h')
conf.CHECK_HEADERS('shadow.h sys/acl.h')
conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h')
@@ -692,7 +693,7 @@
conf.CHECK_CODE('''#define LIBREPLACE_CONFIGURE_TEST_STRPTIME
#include "tests/strptime.c"''',
define='HAVE_WORKING_STRPTIME',
- execute=True,
+ execute=False,
addmain=False,
msg='Checking for working strptime')
@@ -707,7 +708,7 @@
conf.CHECK_CODE('#include "tests/snprintf.c"',
define="HAVE_C99_VSNPRINTF",
- execute=True,
+ execute=False,
addmain=False,
msg="Checking for C99 vsnprintf")
@@ -802,7 +803,7 @@
exit(0);
''',
define='HAVE_SECURE_MKSTEMP',
- execute=True,
+ execute=False,
mandatory=True) # lets see if we get a mandatory failure for this one
# look for a method of finding the list of network interfaces
@@ -814,6 +815,7 @@
#define %s 1
#define NO_CONFIG_H 1
#define AUTOCONF_TEST 1
+ #define __STDC_WANT_LIB_EXT1__ 1
#include "replace.c"
#include "inet_ntop.c"
#include "snprintf.c"
@@ -824,7 +826,7 @@
method,
lib='nsl socket' + bsd_for_strlcpy,
addmain=False,
- execute=True):
+ execute=False):
break
conf.RECURSE('system')
--- a/lib/socket/wscript
+++ b/lib/socket/wscript
@@ -4,4 +4,5 @@
conf.CHECK_HEADERS('linux/sockios.h linux/ethtool.h')
if (conf.CONFIG_SET('HAVE_LINUX_SOCKIOS_H') and \
conf.CONFIG_SET('HAVE_LINUX_ETHTOOL_H')):
- conf.DEFINE('HAVE_ETHTOOL', 1)
+ if conf.CHECK_FUNCS('ethtool_cmd_speed', headers='linux/sockios.h linux/ethtool.h'):
+ conf.DEFINE('HAVE_ETHTOOL', 1)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -51,6 +51,10 @@
/* Max allowable allococation - 256mb - 0x10000000 */
#define MAX_ALLOC_SIZE (1024*1024*256)
+#ifndef YPERR_KEY
+#define YPERR_KEY 5
+#endif
+
static enum protocol_types Protocol = PROTOCOL_COREPLUS;
enum protocol_types get_Protocol(void)
--- a/source3/wscript
+++ b/source3/wscript
@@ -156,7 +156,7 @@
# Check for inotify support (Skip if we are SunOS)
#NOTE: illumos provides sys/inotify.h but is not an exact match for linux
- host_os = sys.platform
+ host_os = os.getenv('HOST', sys.platform)
if host_os.rfind('sunos') == -1:
conf.CHECK_HEADERS('sys/inotify.h')
if conf.env.HAVE_SYS_INOTIFY_H:
@@ -455,8 +455,8 @@
# FIXME: these should be tests for features, but the old build system just
# checks for OSes.
- host_os = sys.platform
- Logs.info("building on %s" % host_os)
+ host_os = os.getenv('HOST', sys.platform)
+ Logs.info("building for %s" % host_os)
# Python doesn't have case switches... :/
# FIXME: original was *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
@@ -1027,7 +1027,7 @@
''',
'USE_SETREUID',
addmain=False,
- execute=True,
+ execute=False,
msg="Checking whether setreuid is available")
if not seteuid:
seteuid = conf.CHECK_CODE('''
@@ -1088,7 +1088,7 @@
''',
'HAVE_FCNTL_LOCK',
addmain=False,
- execute=True,
+ execute=False,
msg='Checking whether fcntl locking is available')
conf.CHECK_CODE('''
--- a/tests/summary.c
+++ b/tests/summary.c
@@ -9,7 +9,7 @@
#endif
#if !(defined(HAVE_IFACE_GETIFADDRS) || defined(HAVE_IFACE_IFCONF) || defined(HAVE_IFACE_IFREQ) || defined(HAVE_IFACE_AIX))
-#warning "WARNING: No automated network interface determination"
+#error "ERROR: No automated network interface determination"
#endif
#if !(defined(USE_SETEUID) || defined(USE_SETREUID) || defined(USE_SETRESUID) || defined(USE_SETUIDX) || defined(HAVE_LINUX_THREAD_CREDENTIALS))
--- a/third_party/popt/poptconfig.c
+++ b/third_party/popt/poptconfig.c
@@ -24,7 +24,7 @@
#if defined(HAVE_GLOB_H)
#include <glob.h>
-#if defined(__LCLINT__)
+#if defined(HAVE_GLOB) && defined(__LCLINT__)
/*@-declundef -exportheader -incondefs -protoparammatch -redecl -type @*/
extern int glob (const char *__pattern, int __flags,
/*@null@*/ int (*__errfunc) (const char *, int),
@@ -104,7 +104,7 @@
if (pat[0] == '@' && pat[1] != '(')
pat++;
-#if defined(HAVE_GLOB_H)
+#if defined(HAVE_GLOB)
if (glob_pattern_p(pat, 0)) {
glob_t _g, *pglob = &_g;
@@ -125,7 +125,7 @@
} else
rc = POPT_ERROR_ERRNO;
} else
-#endif /* HAVE_GLOB_H */
+#endif /* HAVE_GLOB */
{
if (acp)
*acp = 1;
--- a/third_party/popt/poptint.c
+++ b/third_party/popt/poptint.c
@@ -86,7 +86,7 @@
if (istr == NULL)
return NULL;
-#ifdef HAVE_LANGINFO_H
+#ifdef HAVE_NL_LANGINFO
codeset = nl_langinfo ((nl_item)CODESET);
#endif
--- a/third_party/popt/poptint.h
+++ b/third_party/popt/poptint.h
@@ -174,7 +174,7 @@
#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
-#if defined(__LCLINT__)
+#if defined(HAVE_NL_LANGINFO) && defined(__LCLINT__)
/*@-declundef -incondefs @*/
extern char *nl_langinfo (nl_item __item)
/*@*/;
--- a/wscript
+++ b/wscript
@@ -175,7 +175,7 @@
conf.SAMBA_CHECK_PYTHON()
conf.SAMBA_CHECK_PYTHON_HEADERS()
- if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
+ if os.getenv('HOST', sys.platform).find('darwin') > -1 and not conf.env['HAVE_ENVIRON_DECL']:
# Mac OSX needs to have this and it's also needed that the python is compiled with this
# otherwise you face errors about common symbols
if not conf.CHECK_SHLIB_W_PYTHON("Checking if -fno-common is needed"):
@@ -183,7 +183,7 @@
if not conf.CHECK_SHLIB_W_PYTHON("Checking if -undefined dynamic_lookup is not need"):
conf.env.append_value('cshlib_LINKFLAGS', ['-undefined', 'dynamic_lookup'])
- if sys.platform == 'darwin':
+ if os.getenv('HOST', sys.platform).find('darwin') > -1:
conf.ADD_LDFLAGS('-framework CoreFoundation')
conf.RECURSE('dynconfig')
--- a/wscript_configure_embedded_heimdal
+++ b/wscript_configure_embedded_heimdal
@@ -8 +8,10 @@
conf.RECURSE('source4/heimdal_build')
+
+def check_system_heimdal_binary(name):
+ if not conf.find_program(name, var=name.upper()):
+ raise Exception("not conf.find_program(%s, var=%s)" % (name, name.upper()))
+ conf.define('USING_SYSTEM_%s' % name.upper(), 1)
+ return True
+
+check_system_heimdal_binary("compile_et")
+check_system_heimdal_binary("asn1_compile")
Reference in New Issue View Git Blame Copy Permalink