patch

mapnik-3.0.22-scons.patch (text/plain), 1.47 KB, created by Thomas Beutin on 2019-07-24 14:56:12 UTC

--- A/SConstruct	2019-07-24 14:04:36.525805913 +0000
+++ B/SConstruct	2019-07-24 14:06:28.971059296 +0000
@@ -317,7 +317,7 @@
     ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)),
 
     # Install Variables
-    ('PREFIX', 'The install path "prefix"', '/usr/local'),
+    ('PREFIX', 'The install path "prefix"', '/usr'),
     ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT),
     ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
     ('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''),
@@ -1405,6 +1405,8 @@
             except OSError as e:
                 pass
 
+    OPTIONAL_LIBSHEADERS = []
+
     # libxml2 should be optional but is currently not
     # https://github.com/mapnik/mapnik/issues/913
     if env.get('XMLPARSER') and env['XMLPARSER'] == 'libxml2':
@@ -1427,8 +1429,6 @@
         else:
             env['SKIPPED_DEPS'].extend(['dlfcn'])
 
-    OPTIONAL_LIBSHEADERS = []
-
     if env['JPEG']:
         OPTIONAL_LIBSHEADERS.append(['jpeg', ['stdio.h', 'jpeglib.h'], False,'C','-DHAVE_JPEG'])
         inc_path = env['%s_INCLUDES' % 'JPEG']