Merge pull request #2 from MaximeBouton/windows

Build on Mac and Windows

Author: MaximeBouton

.travis.yml

@@ -27,7 +27,10 @@ env:
     - TARGET=x86_64-linux-musl
     - TARGET=aarch64-linux-musl
     - TARGET=arm-linux-musleabihf
+    - TARGET=x86_64-apple-darwin14
     - TARGET=x86_64-unknown-freebsd11.1
+    - TARGET=i686-w64-mingw32
+    - TARGET=x86_64-w64-mingw32
 sudo: required
 
 jobs:

README.md

@@ -1,4 +1,4 @@
-# LibSpatialIndexBuilder builder
+# LibSpatialIndexBuilder
 
 This repository builds binary artifacts for the LibSpatialIndexBuilder project.
 This repository has a default .travis.yml file that can be used to build

build_tarballs.jl

@@ -2,39 +2,43 @@
 # `julia build_tarballs.jl --help` to see a usage message.
 using BinaryBuilder
 
-name = "LibSpatialIndexBuilder"
-version = v"1.8.5"
+version = v"1.8.5" # also change in raw script string
 
 # Collection of sources required to build LibSpatialIndexBuilder
 sources = [
-    "http://download.osgeo.org/libspatialindex/spatialindex-src-1.8.5.tar.bz2" =>
+    "http://download.osgeo.org/libspatialindex/spatialindex-src-$version.tar.bz2" =>
     "31ec0a9305c3bd6b4ad60a5261cba5402366dd7d1969a8846099717778e9a50a",
-
+    "./patches"
 ]
 
 # Bash recipe for building across all platforms
 script = raw"""
 cd $WORKSPACE/srcdir
+
 cd spatialindex-src-1.8.5/
+
+patch < ${WORKSPACE}/srcdir/makefile.patch
+rm Makefile.am.orig
+
+if [ $target = "x86_64-w64-mingw32" ] || [ $target = "i686-w64-mingw32" ]; then
+  patch < ${WORKSPACE}/srcdir/header-check.patch
+fi
+
+aclocal
+autoconf
+automake --add-missing --foreign
+
+# Show options in the log
+./configure --help
+
 ./configure --prefix=$prefix --host=$target
 make
 make install
 """
 
 # These are the platforms we will build for by default, unless further
 # platforms are passed in on the command line
-platforms = [
-    Linux(:i686, libc=:glibc),
-    Linux(:x86_64, libc=:glibc),
-    Linux(:aarch64, libc=:glibc),
-    Linux(:armv7l, libc=:glibc, call_abi=:eabihf),
-    Linux(:powerpc64le, libc=:glibc),
-    Linux(:i686, libc=:musl),
-    Linux(:x86_64, libc=:musl),
-    Linux(:aarch64, libc=:musl),
-    Linux(:armv7l, libc=:musl, call_abi=:eabihf),
-    FreeBSD(:x86_64)
-]
+platforms = supported_platforms()
 
 # The products that we will ensure are always built
 products(prefix) = [
@@ -43,10 +47,8 @@ products(prefix) = [
 ]
 
 # Dependencies that must be installed before this package can be built
-dependencies = [
-    
-]
+dependencies = []
 
 # Build the tarballs, and possibly a `build.jl` as well.
-build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies)
+build_tarballs(ARGS, "SpatialIndex", version, sources, script, platforms, products, dependencies)
 

patches/header-check.patch

@@ -0,0 +1,24 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Luke Potgieter <fried.roadkill+ght@gmail.com>
+Date: Thu, 24 Aug 2017 10:53:39 +0200
+Subject: [PATCH 1/1] Remove explicit header check - mingw does not ship with
+ this header.
+
+
+diff --git a/configure.ac b/configure.ac
+index 1111111..2222222 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,7 +38,7 @@ AC_CHECK_HEADERS(pthread.h, [
+ LIBS="$LIBS -lpthread"
+ #endif])
+ 
+-AC_CHECK_HEADERS(sys/resource.h,, [AC_MSG_ERROR([cannot find sys/resource.h, bailing out])])
++#AC_CHECK_HEADERS(sys/resource.h,, [AC_MSG_ERROR([cannot find sys/resource.h, bailing out])])
+ AC_CHECK_HEADERS(sys/time.h,, [AC_MSG_ERROR([cannot find sys/time.h, bailing out])])
+ AC_CHECK_HEADERS(stdint.h,, [AC_MSG_ERROR([cannot find stdint.h, bailing out])])
+ AC_CHECK_HEADERS(features.h)

patches/makefile.patch

@@ -0,0 +1,18 @@
+--- Makefile.am.orig
++++ Makefile.am
+@@ -18,8 +18,13 @@
+        libspatialindex.la \
+        src/capi/libsidxc.la
+
+-libspatialindex_la_LDFLAGS = -version-info 4:1:0 -no-undefined -lstdc++
+-libspatialindex_c_la_LDFLAGS = -version-info 4:1:0 -no-undefined -lstdc++
++# Dummy file to force C++ linking, see this page for more details:
++# https://www.gnu.org/software/automake/manual/html_node/Libtool-Convenience-Libraries.html
++nodist_EXTRA_libspatialindex_la_SOURCES = dummy.cxx
++nodist_EXTRA_libspatialindex_c_la_SOURCES = dummy.cxx
++
++libspatialindex_la_LDFLAGS = -version-info 4:1:0 -no-undefined
++libspatialindex_c_la_LDFLAGS = -version-info 4:1:0 -no-undefined
+
+ EXTRA_DIST = INSTALL.WIN \
+              spatialindex.sln \