sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20

--- a/SConstruct
+++ b/SConstruct
@@ -503,16 +503,7 @@ for opt in pickle_store:
         #print 'missing opt', opt
         preconfigured = False
 
-# if custom arguments are supplied make sure to accept them
-if opts.args:
-    # since we have custom arguments update environment with all opts to
-    # make sure to absorb the custom ones
-    opts.Update(env)
-    # now since we've got custom arguments we'll disregard any
-    # pickled environment and force another configuration
-    preconfigured = False
-
-elif preconfigured:
+if preconfigured:
     if not HELP_REQUESTED:
         color_print(4,'Using previous successful configuration...')
         color_print(4,'Re-configure by running "python scons/scons.py configure".')