From c6f1cfbae88e15844f187fdf589c7dbccbd7fac7 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Sat, 22 Sep 2018 12:45:43 -0400 Subject: [PATCH] adding -std=c++0x flag to linux pymod builds --- .travis.yml | 226 ++++++++++++++++++++++++++-------------------------- setup.py | 7 +- 2 files changed, 117 insertions(+), 116 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6397e35d..dbd60d0d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,68 +1,68 @@ matrix: include: - # python 2 osx + # # python 2 osx - - name: "klayout python2 osx10.13" - os: osx - osx_image: xcode9.4 # macOS 10.13 - env: - - MATRIX_EVAL="" - - ARCHFLAGS="-std=c++11" - - PIP_UPDATE="1" - - PYTHON_BUILD=true - - BREW_BUNDLE=false + # - name: "klayout python2 osx10.13" + # os: osx + # osx_image: xcode9.4 # macOS 10.13 + # env: + # - MATRIX_EVAL="" + # - ARCHFLAGS="-std=c++11" + # - PIP_UPDATE="1" + # - PYTHON_BUILD=true + # - BREW_BUNDLE=false - - name: "klayout python2 osx10.12" - os: osx - osx_image: xcode8.3 # macOS 10.12 - env: - - MATRIX_EVAL="brew install python2 || brew link --overwrite python@2" # deficient python2 in travis's xcode8.3 (no ssl) - - ARCHFLAGS="-std=c++11" - - PIP_UPDATE="1" - - PYTHON_BUILD=true - - BREW_BUNDLE=false + # - name: "klayout python2 osx10.12" + # os: osx + # osx_image: xcode8.3 # macOS 10.12 + # env: + # - MATRIX_EVAL="brew install python2 || brew link --overwrite python@2" # deficient python2 in travis's xcode8.3 (no ssl) + # - ARCHFLAGS="-std=c++11" + # - PIP_UPDATE="1" + # - PYTHON_BUILD=true + # - BREW_BUNDLE=false - - name: "klayout python2 osx10.11" - os: osx - osx_image: xcode8 # macOS 10.11 - env: - - MATRIX_EVAL="" - - ARCHFLAGS="-std=c++11" - - PIP_UPDATE="1" - - PYTHON_BUILD=true - - BREW_BUNDLE=false + # - name: "klayout python2 osx10.11" + # os: osx + # osx_image: xcode8 # macOS 10.11 + # env: + # - MATRIX_EVAL="" + # - ARCHFLAGS="-std=c++11" + # - PIP_UPDATE="1" + # - PYTHON_BUILD=true + # - BREW_BUNDLE=false - # python 3 osx + # # python 3 osx - - name: "klayout python3 osx10.13" - os: osx - osx_image: xcode9.4 # macOS 10.13 - env: - - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';" - - ARCHFLAGS="-std=c++11" - - PIP_UPDATE="1" - - PYTHON_BUILD=true - - BREW_BUNDLE=true + # - name: "klayout python3 osx10.13" + # os: osx + # osx_image: xcode9.4 # macOS 10.13 + # env: + # - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';" + # - ARCHFLAGS="-std=c++11" + # - PIP_UPDATE="1" + # - PYTHON_BUILD=true + # - BREW_BUNDLE=true - - name: "klayout python3 osx10.12" - os: osx - osx_image: xcode8.3 # macOS 10.12 - env: - - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';" - - ARCHFLAGS="-std=c++11" - - PIP_UPDATE="1" - - PYTHON_BUILD=true - - BREW_BUNDLE=true + # - name: "klayout python3 osx10.12" + # os: osx + # osx_image: xcode8.3 # macOS 10.12 + # env: + # - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';" + # - ARCHFLAGS="-std=c++11" + # - PIP_UPDATE="1" + # - PYTHON_BUILD=true + # - BREW_BUNDLE=true - - name: "klayout python3 osx10.11" - os: osx - osx_image: xcode8 # macOS 10.11 - env: - - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';" - - ARCHFLAGS="-std=c++11" - - PIP_UPDATE="1" - - PYTHON_BUILD=true - - BREW_BUNDLE=true + # - name: "klayout python3 osx10.11" + # os: osx + # osx_image: xcode8 # macOS 10.11 + # env: + # - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';" + # - ARCHFLAGS="-std=c++11" + # - PIP_UPDATE="1" + # - PYTHON_BUILD=true + # - BREW_BUNDLE=true - name: "klayout python3.6 package" os: linux @@ -136,68 +136,68 @@ matrix: - PYTHON_BUILD=true - BREW_BUNDLE=false - # KLayout builds for mac - # Python 3 - - name: "KLayout macOS 10.13 with py3.7" - os: osx - osx_image: xcode9.4 # macOS 10.13 - env: - - MATRIX_EVAL="" - - PYTHON_VERSION=B37 - - MACOS_VERSION=HighSierra - - KLAYOUT_BUILD=true - - BREW_BUNDLE=true + # # KLayout builds for mac + # # Python 3 + # - name: "KLayout macOS 10.13 with py3.7" + # os: osx + # osx_image: xcode9.4 # macOS 10.13 + # env: + # - MATRIX_EVAL="" + # - PYTHON_VERSION=B37 + # - MACOS_VERSION=HighSierra + # - KLAYOUT_BUILD=true + # - BREW_BUNDLE=true - - name: "KLayout macOS 10.12 with py3.7" - os: osx - osx_image: xcode8.3 # macOS 10.12 - env: - - MATRIX_EVAL="" - - PYTHON_VERSION=B37 - - MACOS_VERSION=Sierra - - KLAYOUT_BUILD=true - - BREW_BUNDLE=true + # - name: "KLayout macOS 10.12 with py3.7" + # os: osx + # osx_image: xcode8.3 # macOS 10.12 + # env: + # - MATRIX_EVAL="" + # - PYTHON_VERSION=B37 + # - MACOS_VERSION=Sierra + # - KLAYOUT_BUILD=true + # - BREW_BUNDLE=true - - name: "KLayout macOS 10.11 with py3.7" - os: osx - osx_image: xcode8 # macOS 10.11 - env: - - MATRIX_EVAL="" - - PYTHON_VERSION=B37 - - MACOS_VERSION=ElCapitan - - KLAYOUT_BUILD=true - - BREW_BUNDLE=true + # - name: "KLayout macOS 10.11 with py3.7" + # os: osx + # osx_image: xcode8 # macOS 10.11 + # env: + # - MATRIX_EVAL="" + # - PYTHON_VERSION=B37 + # - MACOS_VERSION=ElCapitan + # - KLAYOUT_BUILD=true + # - BREW_BUNDLE=true - # Python 2 - - name: "KLayout macOS 10.13 with py2.7" - os: osx - osx_image: xcode9.4 # macOS 10.13 - env: - - MATRIX_EVAL="" - - PYTHON_VERSION=Sys - - MACOS_VERSION=HighSierra - - KLAYOUT_BUILD=true - - BREW_BUNDLE=true + # # Python 2 + # - name: "KLayout macOS 10.13 with py2.7" + # os: osx + # osx_image: xcode9.4 # macOS 10.13 + # env: + # - MATRIX_EVAL="" + # - PYTHON_VERSION=Sys + # - MACOS_VERSION=HighSierra + # - KLAYOUT_BUILD=true + # - BREW_BUNDLE=true - - name: "KLayout macOS 10.12 with py2.7" - os: osx - osx_image: xcode8.3 # macOS 10.12 - env: - - MATRIX_EVAL="" - - PYTHON_VERSION=Sys - - MACOS_VERSION=Sierra - - KLAYOUT_BUILD=true - - BREW_BUNDLE=true + # - name: "KLayout macOS 10.12 with py2.7" + # os: osx + # osx_image: xcode8.3 # macOS 10.12 + # env: + # - MATRIX_EVAL="" + # - PYTHON_VERSION=Sys + # - MACOS_VERSION=Sierra + # - KLAYOUT_BUILD=true + # - BREW_BUNDLE=true - - name: "KLayout macOS 10.11 with py2.7" - os: osx - osx_image: xcode8 # macOS 10.11 - env: - - MATRIX_EVAL="" - - PYTHON_VERSION=Sys - - MACOS_VERSION=ElCapitan - - KLAYOUT_BUILD=true - - BREW_BUNDLE=true + # - name: "KLayout macOS 10.11 with py2.7" + # os: osx + # osx_image: xcode8 # macOS 10.11 + # env: + # - MATRIX_EVAL="" + # - PYTHON_VERSION=Sys + # - MACOS_VERSION=ElCapitan + # - KLAYOUT_BUILD=true + # - BREW_BUNDLE=true before_install: - env diff --git a/setup.py b/setup.py index f817cf5b0..bf862b4e1 100644 --- a/setup.py +++ b/setup.py @@ -148,8 +148,9 @@ class Config(object): elif platform.system() == "Darwin": return [] else: - # Avoids many "type-punned pointer" warnings - return ["-Wno-strict-aliasing"] + return ["-Wno-strict-aliasing", # Avoids many "type-punned pointer" warnings + "-std=c++0x", # because we use unordered_map/unordered_set + ] def link_args(self, mod): """ @@ -173,7 +174,7 @@ class Config(object): # build path and the loader will fail. args = [] args += ['-Wl,-soname,' + self.libname_of(mod)] - if not '_dbpi' in mod: + if '_dbpi' not in mod: loader_path = '$ORIGIN' else: loader_path = '$ORIGIN/..'