> On Oct 23, 2016, at 10:21 AM, vi...@macports.org wrote:
>
> Revision
> 154177
> Author
> vi...@macports.org
> Date
> 2016-10-23 17:21:28 +0200 (Sun, 23 Oct 2016)
> Log Message
>
> py-spatialite: get rid of obsolete API “amalgamation”
> Modified: trunk/dports/python/py-spatialite/files/patch-setup_py.diff (154176
> => 154177)
>
> --- trunk/dports/python/py-spatialite/files/patch-setup_py.diff
> 2016-10-23 15:20:25 UTC (rev 154176)
> +++ trunk/dports/python/py-spatialite/files/patch-setup_py.diff
> 2016-10-23 15:21:28 UTC (rev 154177)
>
> @@ -1,10 +1,46 @@
>
> ---- setup.py.old 2013-11-30 11:54:05.000000000 +0100
> -+++ setup.py 2013-11-30 11:53:34.000000000 +0100
> -@@ -170,6 +170,7 @@
> - include_dirs.extend(self.strip_includes(self.compiler.linker_exe))
> - include_dirs.extend(self.strip_includes(self.compiler.preprocessor))
> - self.compiler.include_dirs.extend(self.uniq(include_dirs))
> -+ self.compiler.include_dirs.append('%%PREFIX%%/include')
>
> +--- setup.py.old 2016-10-23 12:59:11.000000000 +0200
> ++++ setup.py 2016-10-23 13:00:43.000000000 +0200
> +@@ -65,7 +65,7 @@
> + if rc != 0:
> + print "Is sphinx installed? If not, try 'sudo easy_install
> sphinx'."
>
>
>
> - if self.with_proj4:
> - self.check_header(ext,"proj_api.h")
>
> +-AMALGAMATION_ROOT = "amalgamation/libspatialite-amalgamation-3.0.1"
> ++#AMALGAMATION_ROOT = "amalgamation/libspatialite-amalgamation-3.0.1"
> +
> + TRUTHY = ("yes", "true", "t", "1")
> +
> +@@ -162,7 +162,7 @@
> +
> + def build_extension(self,ext):
> + # Load includes from module directories first!
> +- include_dirs = []
> ++ include_dirs = ["%%PREFIX%%/include"]
> + include_dirs.extend(self.strip_includes(self.compiler.compiler))
> + include_dirs.extend(self.strip_includes(self.compiler.compiler_so))
> + include_dirs.extend(self.strip_includes(self.compiler.compiler_cxx))
> +@@ -258,12 +258,12 @@
> + "src/prepare_protocol.c",
> + "src/statement.c",
> + "src/util.c",
> +- "src/row.c",
> +- os.path.join(AMALGAMATION_ROOT, "sqlite3.c"),
> +- os.path.join(AMALGAMATION_ROOT, "spatialite.c")
> ++ "src/row.c"#,
> ++ #os.path.join(AMALGAMATION_ROOT, "sqlite3.c"),
> ++ #os.path.join(AMALGAMATION_ROOT, "spatialite.c")
> + ],
> + include_dirs = [
> +- os.path.join(AMALGAMATION_ROOT,"headers")
> ++ "/opt/local/include"
"/opt/local" here should probably be "%%PREFIX%%" instead as above.
_______________________________________________
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
