1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
$NetBSD: patch-scripts_mk__util.py,v 1.7 2022/05/13 10:41:38 jperkin Exp $
Try to at least be slightly more portable.
--- scripts/mk_util.py.orig 2018-11-19 20:21:17.000000000 +0000
+++ scripts/mk_util.py
@@ -803,7 +803,8 @@ def extract_c_includes(fname):
# We should generate and error for any occurrence of #include that does not match the previous pattern.
non_std_inc_pat = re.compile(".*#include.*")
- f = open(fname, 'r')
+ py3args = { 'encoding': 'UTF-8' } if sys.version_info.major >= 3 else {}
+ f = open(fname, 'r', **py3args)
linenum = 1
for line in f:
m1 = std_inc_pat.match(line)
@@ -2001,7 +2002,7 @@ class JavaDLLComponent(Component):
out.write('\t$(SLINK) $(SLINK_OUT_FLAG)libz3java$(SO_EXT) $(SLINK_FLAGS) %s$(OBJ_EXT) libz3$(LIB_EXT)\n' %
os.path.join('api', 'java', 'Native'))
else:
- out.write('\t$(SLINK) $(SLINK_OUT_FLAG)libz3java$(SO_EXT) $(SLINK_FLAGS) %s$(OBJ_EXT) libz3$(SO_EXT)\n' %
+ out.write('\t$(SLINK) $(SLINK_OUT_FLAG)libz3java$(SO_EXT) $(SLINK_FLAGS) $(JAVA_LINK_EXTRA_FLAGS) %s$(OBJ_EXT) libz3$(SO_EXT)\n' %
os.path.join('api', 'java', 'Native'))
out.write('%s.jar: libz3java$(SO_EXT) ' % self.package_name)
deps = ''
@@ -2694,7 +2695,8 @@ def mk_config():
check_ar()
CXX = find_cxx_compiler()
CC = find_c_compiler()
- SLIBEXTRAFLAGS = ''
+ SLIBEXTRAFLAGS = LDFLAGS
+ JAVALIBEXTRAFLAGS = LDFLAGS
EXE_EXT = ''
LIB_EXT = '.a'
if GPROF:
@@ -2778,7 +2780,8 @@ def mk_config():
EXE_EXT = '.exe'
LIB_EXT = '.lib'
else:
- raise MKException('Unsupported platform: %s' % sysname)
+ SO_EXT = '.so'
+ SLIBFLAGS = '-shared'
if is64():
if not sysname.startswith('CYGWIN') and not sysname.startswith('MSYS') and not sysname.startswith('MINGW'):
CXXFLAGS = '%s -fPIC' % CXXFLAGS
@@ -2822,6 +2825,7 @@ def mk_config():
config.write('SLINK_FLAGS=%s\n' % SLIBFLAGS)
config.write('SLINK_EXTRA_FLAGS=%s\n' % SLIBEXTRAFLAGS)
config.write('SLINK_OUT_FLAG=-o \n')
+ config.write('JAVA_LINK_EXTRA_FLAGS=%s\n' % JAVALIBEXTRAFLAGS)
config.write('OS_DEFINES=%s\n' % OS_DEFINES)
if is_verbose():
print('Host platform: %s' % sysname)
|
