Lines 1-72
Link Here
|
1 |
--- make/configure.py.orig 2017-02-25 20:56:19 UTC |
1 |
--- make/configure.py.orig 2018-01-13 05:30:25 UTC |
2 |
+++ make/configure.py |
2 |
+++ make/configure.py |
3 |
@@ -590,6 +590,9 @@ class ArchAction( Action ): |
3 |
@@ -1515,7 +1515,7 @@ try: |
4 |
pass |
|
|
5 |
elif host.match( '*-*-solaris*' ): |
6 |
pass |
7 |
+ elif host.match( '*-*-freebsd.*' ): |
8 |
+ self.mode['i386'] = 'i386-portsbuild-freebsd%s' % (host.release) |
9 |
+ self.mode['amd64'] = 'amd64-portsbuild-freebsd%s' % (host.release) |
10 |
else: |
11 |
self.msg_pass = 'WARNING' |
12 |
|
13 |
@@ -1294,13 +1297,13 @@ def createCLI(): |
14 |
h = IfHost( 'enable assembly code in non-contrib modules', 'NOMATCH*-*-darwin*', 'NOMATCH*-*-linux*', none=optparse.SUPPRESS_HELP ).value |
15 |
grp.add_option( '--enable-asm', default=False, action='store_true', help=h ) |
16 |
|
17 |
- h = IfHost( 'disable GTK GUI', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value |
18 |
+ h = IfHost( 'disable GTK GUI', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value |
19 |
grp.add_option( '--disable-gtk', default=False, action='store_true', help=h ) |
20 |
- h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value |
21 |
+ h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value |
22 |
grp.add_option( '--disable-gtk-update-checks', default=False, action='store_true', help=h ) |
23 |
h = IfHost( 'enable GTK GUI (mingw)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value |
24 |
grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', help=h ) |
25 |
- h = IfHost( 'disable gstreamer (live preview)', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value |
26 |
+ h = IfHost( 'disable gstreamer (live preview)', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value |
27 |
grp.add_option( '--disable-gst', default=False, action='store_true', help=h ) |
28 |
h = IfHost( 'enable use of Intel Quick Sync Video hardware acceleration', '*-*-*', none=optparse.SUPPRESS_HELP ).value |
29 |
grp.add_option( '--enable-qsv', default=False, action='store_true', help=h ) |
30 |
@@ -1352,7 +1355,7 @@ def createCLI(): |
31 |
h = IfHost( 'Build and use local pkg-config', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value |
32 |
grp.add_option( '--enable-local-pkgconfig', default=False, action='store_true', help=h ) |
33 |
|
34 |
- h = IfHost( 'Build extra contribs for flatpak packaging', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value |
35 |
+ h = IfHost( 'Build extra contribs for flatpak packaging', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value |
36 |
grp.add_option( '--flatpak', default=False, action='store_true', help=h ) |
37 |
cli.add_option_group( grp ) |
38 |
|
39 |
@@ -1517,7 +1520,7 @@ try: |
40 |
class Tools: |
4 |
class Tools: |
41 |
ar = ToolProbe( 'AR.exe', 'ar' ) |
5 |
ar = ToolProbe( 'AR.exe', 'ar' ) |
42 |
cp = ToolProbe( 'CP.exe', 'cp' ) |
6 |
cp = ToolProbe( 'CP.exe', 'cp' ) |
43 |
- gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( 'gcc-4', '*-*-cygwin*' )) |
7 |
- gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( 'gcc-4', '*-*-cygwin*' )) |
44 |
+ gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( os.environ['CC'], '*-*-freebsd*' )) |
8 |
+ gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( os.environ['CC'], '*-*-freebsd*' ), IfHost( 'gcc-4', '*-*-cygwin*' )) |
45 |
|
9 |
|
46 |
if host.match( '*-*-darwin*' ): |
10 |
if host.match( '*-*-darwin*' ): |
47 |
gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake' ) |
11 |
gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake' ) |
48 |
@@ -1924,10 +1927,15 @@ int main() |
|
|
49 |
doc.add( 'GCC.sysroot', '' ) |
50 |
doc.add( 'GCC.minver', '' ) |
51 |
|
52 |
+ if build.match( '*-*-freebsd*' ): |
53 |
+ doc.add( 'HAS.pthread', 1 ) |
54 |
+ |
55 |
if build.match( 'i?86-*' ): |
56 |
doc.add( 'LIBHB.GCC.D', 'ARCH_X86_32', append=True ) |
57 |
elif build.match( 'x86_64-*' ): |
58 |
doc.add( 'LIBHB.GCC.D', 'ARCH_X86_64', append=True ) |
59 |
+ elif build.match( 'amd64-*' ): |
60 |
+ doc.add( 'LIBHB.GCC.D', 'ARCH_X86_64', append=True ) |
61 |
|
62 |
if options.enable_asm and ( not Tools.yasm.fail or options.enable_local_yasm ): |
63 |
asm = '' |
64 |
@@ -1940,7 +1948,7 @@ int main() |
65 |
else: |
66 |
doc.add( 'LIBHB.YASM.f', 'elf32' ) |
67 |
doc.add( 'LIBHB.YASM.m', 'x86' ) |
68 |
- elif build.match( 'x86_64-*' ): |
69 |
+ elif build.match( 'x86_64-*' ) or build.match( 'amd64-*' ): |
70 |
asm = 'x86' |
71 |
doc.add( 'LIBHB.GCC.D', 'HAVE_MMX ARCH_X86_64', append=True ) |
72 |
if build.match( '*-*-darwin*' ): |