Remove old mason
This commit is contained in:
@@ -1,24 +0,0 @@
|
||||
language: cpp
|
||||
|
||||
sudo: false
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- os: osx
|
||||
compiler: clang
|
||||
- os: linux
|
||||
compiler: clang
|
||||
|
||||
env:
|
||||
global:
|
||||
- secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
|
||||
- secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
|
||||
|
||||
before_install:
|
||||
|
||||
script:
|
||||
- ./mason build ${MASON_NAME} ${MASON_VERSION}
|
||||
- ./mason link ${MASON_NAME} ${MASON_VERSION}
|
||||
|
||||
after_success:
|
||||
- ./mason publish ${MASON_NAME} ${MASON_VERSION}
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
diff --git a/configure b/configure
|
||||
index eee34f8..808c020 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -16149,7 +16149,7 @@ fi
|
||||
$as_echo "$dummy_cv_ansi" >&6; }
|
||||
|
||||
if test x"$dummy_cv_ansi" = xyes; then
|
||||
- WARNFLAGS="$WARNFLAGS -ansi"
|
||||
+ WARNFLAGS="$WARNFLAGS"
|
||||
else
|
||||
:
|
||||
fi
|
||||
diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in
|
||||
index ab63929..1bb2fae 100644
|
||||
--- a/include/geos/platform.h.in
|
||||
+++ b/include/geos/platform.h.in
|
||||
@@ -84,7 +84,7 @@ extern "C"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_ISNAN)
|
||||
-# define ISNAN(x) (isnan(x))
|
||||
+# define ISNAN(x) (std::isnan(x))
|
||||
#else
|
||||
# if defined(_MSC_VER)
|
||||
# define ISNAN(x) _isnan(x)
|
||||
-43
@@ -1,43 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
MASON_NAME=geos
|
||||
MASON_VERSION=3.4.2
|
||||
MASON_LIB_FILE=lib/libgeos.a
|
||||
|
||||
. ${MASON_DIR}/mason.sh
|
||||
|
||||
function mason_load_source {
|
||||
mason_download \
|
||||
http://download.osgeo.org/geos/${MASON_NAME}-${MASON_VERSION}.tar.bz2 \
|
||||
b248842dee2afa6e944693c21571a2999dfafc5a
|
||||
|
||||
mason_extract_tar_bz2
|
||||
|
||||
export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}-${MASON_VERSION}
|
||||
}
|
||||
|
||||
function mason_compile {
|
||||
mason_step "Loading patch 'https://github.com/mapbox/mason/blob/${MASON_SLUG}/patch.diff'..."
|
||||
curl --retry 3 -s -f -# -L \
|
||||
https://raw.githubusercontent.com/mapbox/mason/${MASON_SLUG}/patch.diff \
|
||||
-O || (mason_error "Could not find patch for ${MASON_SLUG}" && exit 1)
|
||||
patch -N -p1 < ./patch.diff
|
||||
|
||||
# note: we put ${STDLIB_CXXFLAGS} into CXX instead of LDFLAGS due to libtool oddity:
|
||||
# http://stackoverflow.com/questions/16248360/autotools-libtool-link-library-with-libstdc-despite-stdlib-libc-option-pass
|
||||
if [[ $(uname -s) == 'Darwin' ]]; then
|
||||
CXX="${CXX} -stdlib=libc++ -std=c++11"
|
||||
fi
|
||||
./configure \
|
||||
--prefix=${MASON_PREFIX} \
|
||||
${MASON_HOST_ARG} \
|
||||
--disable-shared --enable-static \
|
||||
--disable-dependency-tracking
|
||||
make -j${MASON_CONCURRENCY} install
|
||||
}
|
||||
|
||||
function mason_clean {
|
||||
make clean
|
||||
}
|
||||
|
||||
mason_run "$@"
|
||||
@@ -1,30 +0,0 @@
|
||||
language: generic
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- os: osx
|
||||
osx_image: xcode7.3
|
||||
compiler: clang
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env: CXX=clang++-3.5 CC=clang-3.5
|
||||
sudo: false
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-precise-3.5
|
||||
packages:
|
||||
- clang-3.5
|
||||
|
||||
env:
|
||||
global:
|
||||
- secure: "clCFM3prHnDocZ8lXlimPxAogvFirD1Zx8cMcFJ/XpkTA/0pCgnhpArM4y/NzLHR57pNZTSCr3p6XZI1c1iTG4Zm8x0sK2A4aTFRahypXNy/e+LzAbtd1y1+dEEDwlJvNNGxizQX4frhOgSNQFDFnWLtmF3stlft5YWyc2kI+FI="
|
||||
- secure: "jKJErCng8Sk8YJ0IN2FX3lhv7G1LeudMfFBAXViZaXn8w/gWPs+SlfXQmIJ5SruU7U2GQKnAhzbjwXjVAgAh8OAblzny0DDm5Lh5WmwkgAP8JH1LpsBwCYx2S/v8qyR4DX1RVhHS8mQu298180ZDVgGccw+hd8xrE/S5TEQcNfQ="
|
||||
|
||||
script:
|
||||
- ./mason build ${MASON_NAME} ${MASON_VERSION}
|
||||
- ./mason link ${MASON_NAME} ${MASON_VERSION}
|
||||
|
||||
after_success:
|
||||
- ./mason publish ${MASON_NAME} ${MASON_VERSION}
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
diff --git a/configure b/configure
|
||||
index eee34f8..808c020 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -17611,7 +17611,7 @@
|
||||
$as_echo "$dummy_cv_ansi" >&6; }
|
||||
|
||||
if test yes = "$dummy_cv_ansi"; then
|
||||
- WARNFLAGS="$WARNFLAGS -ansi"
|
||||
+ WARNFLAGS="$WARNFLAGS"
|
||||
else
|
||||
:
|
||||
fi
|
||||
diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in
|
||||
index ab63929..1bb2fae 100644
|
||||
--- a/include/geos/platform.h.in
|
||||
+++ b/include/geos/platform.h.in
|
||||
@@ -84,7 +84,7 @@ extern "C"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_ISNAN)
|
||||
-# define ISNAN(x) (isnan(x))
|
||||
+# define ISNAN(x) (std::isnan(x))
|
||||
#else
|
||||
# if defined(_MSC_VER)
|
||||
# define ISNAN(x) _isnan(x)
|
||||
-42
@@ -1,42 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
MASON_NAME=geos
|
||||
MASON_VERSION=3.5.0
|
||||
MASON_LIB_FILE=lib/libgeos.a
|
||||
|
||||
. ${MASON_DIR}/mason.sh
|
||||
|
||||
function mason_load_source {
|
||||
mason_download \
|
||||
http://download.osgeo.org/geos/${MASON_NAME}-${MASON_VERSION}.tar.bz2 \
|
||||
a641469449fc32b829fb885cb0ea5fdd3333ce62
|
||||
|
||||
mason_extract_tar_bz2
|
||||
|
||||
export MASON_BUILD_PATH=${MASON_ROOT}/.build/${MASON_NAME}-${MASON_VERSION}
|
||||
}
|
||||
|
||||
function mason_compile {
|
||||
if [ "$MASON_PLATFORM" == "linux" ]; then
|
||||
mason_step "Loading patch ${MASON_DIR}/scripts/${MASON_NAME}/${MASON_VERSION}/patch.diff"
|
||||
patch -N -p1 < ${MASON_DIR}/scripts/${MASON_NAME}/${MASON_VERSION}/patch.diff
|
||||
fi
|
||||
|
||||
# note: we put ${STDLIB_CXXFLAGS} into CXX instead of LDFLAGS due to libtool oddity:
|
||||
# http://stackoverflow.com/questions/16248360/autotools-libtool-link-library-with-libstdc-despite-stdlib-libc-option-pass
|
||||
if [[ $(uname -s) == 'Darwin' ]]; then
|
||||
CXX="${CXX} -stdlib=libc++ -std=c++11"
|
||||
fi
|
||||
./configure \
|
||||
--prefix=${MASON_PREFIX} \
|
||||
${MASON_HOST_ARG} \
|
||||
--disable-shared --enable-static \
|
||||
--disable-dependency-tracking
|
||||
make -j${MASON_CONCURRENCY} install
|
||||
}
|
||||
|
||||
function mason_clean {
|
||||
make clean
|
||||
}
|
||||
|
||||
mason_run "$@"
|
||||
Reference in New Issue
Block a user