Lines 1-37
Link Here
|
1 |
--- wscript.orig 2014-03-11 08:50:10 UTC |
1 |
--- wscript.orig 2020-05-27 21:25:57.844452000 -0400 |
2 |
+++ wscript |
2 |
+++ wscript 2020-05-27 21:33:26.550831000 -0400 |
3 |
@@ -87,14 +87,8 @@ def configure(ctx): |
3 |
@@ -160,10 +160,10 @@ |
4 |
for (lib, uselib) in req_libs: |
|
|
5 |
ctx.check_cxx(lib = lib, uselib_store = uselib) |
6 |
|
4 |
|
7 |
- # Check required functions |
5 |
def configure_linux(ctx): |
8 |
- req_funcs = [('memset', 'string.h', []) ,('sqrt', 'math.h', ['m'])] |
6 |
# Check required headers |
9 |
- for func, header, uselib in req_funcs: |
7 |
- req_headers = ['stdlib.h', 'string.h', 'stdint.h', 'stdio.h', 'dlfcn.h', |
10 |
- ctx.check_cxx(function_name = func, header_name = header, |
8 |
- 'unistd.h', 'jpeglib.h', 'math.h', 'string.h'] |
11 |
- uselib = uselib, mandatory = True) |
9 |
- for header in req_headers: |
12 |
- |
10 |
- ctx.check_cc(header_name = header, auto_add_header_name = True, mandatory = True) |
13 |
# Check for a supported version of libpng |
11 |
+ #req_headers = ['stdlib.h', 'string.h', 'stdint.h', 'stdio.h', 'dlfcn.h', |
14 |
- supp_png_pkgs = (('libpng12', '1.2'), ('libpng15', '1.5'),) |
12 |
+ # 'unistd.h', 'jpeglib.h', 'math.h', 'string.h'] |
15 |
+ supp_png_pkgs = (('libpng12', '1.2'), ('libpng16', '1.6'),) |
13 |
+ #for header in req_headers: |
16 |
have_png = False |
14 |
+ # ctx.check_cc(header_name = header, auto_add_header_name = True, mandatory = True) |
17 |
for (pkg, atleast) in supp_png_pkgs: |
|
|
18 |
try: |
19 |
@@ -123,7 +117,7 @@ def configure(ctx): |
20 |
ctx.check_cfg(package = pkg, uselib_store = uselib, |
21 |
args = '--cflags --libs', mandatory = mandatory) |
22 |
|
15 |
|
23 |
- ctx.env.append_unique('CXXFLAGS', '-Werror -Wall -Wextra -Wnon-virtual-dtor'.split(' ')) |
16 |
# Check for required libs |
24 |
+ ctx.env.append_unique('CXXFLAGS', '-Wall -Wextra -Wnon-virtual-dtor'.split(' ')) |
17 |
req_libs = [('m', 'm'), ('jpeg', 'jpeg')] |
25 |
|
|
|
26 |
# Prepend -O# and -g flags so that they can be overriden by the |
27 |
# CFLAGS environment variable |
28 |
@@ -132,6 +126,9 @@ def configure(ctx): |
29 |
if Options.options.debug: |
30 |
ctx.env.prepend_value('CXXFLAGS', '-g') |
31 |
|
32 |
+ # Fix manpages path for FreeBSD |
33 |
+ ctx.env.MANDIR = '%s/man' % ctx.env.PREFIX |
34 |
+ |
35 |
ctx.env.HAVE_EXTRAS = False |
36 |
if Options.options.extras_path is not None: |
37 |
ctx.env.HAVE_EXTRAS = True |