Commit 2d980f60 authored by Amir Mohammadi's avatar Amir Mohammadi

[toolchain] use -g instead of -g0

export ARCH properly
Make it compatible with zsh too
parent f0c56716
Pipeline #7715 failed with stage
in 2 minutes and 3 seconds
......@@ -17,7 +17,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- zlib 1.2.8
- xz 5.2.2
- gcc 4.8.5 # [linux]
......
......@@ -13,7 +13,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- gcc 4.8.5 # [linux]
- libgcc 4.8.5 # [linux]
- python
......
......@@ -18,7 +18,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- cmake
- python # [win]
- gcc 4.8.5 # [linux]
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- pkg-config
- libtool
- yasm
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- gcc 4.8.5 # [linux]
- libgcc 4.8.5 # [linux]
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- gcc 4.8.5 # [linux]
- libgcc 4.8.5 # [linux]
run:
......
......@@ -14,7 +14,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- hdf5 1.8.17|1.8.17.*
- zlib 1.2.8
- gcc 4.8.5 # [linux]
......
......@@ -22,7 +22,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python # [win]
- gcc 4.8.5 # [linux]
- libgcc 4.8.5 # [linux]
......
......@@ -17,7 +17,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- gcc 4.8.5 # [linux]
- libgcc 4.8.5 # [linux]
- python
......
......@@ -19,7 +19,7 @@ build:
requirements:
build:
- python
- toolchain 2.3.0
- toolchain 2.3.1
# For sha256 comparisons of opencv_contrib
- openssl 1.0.* # [unix]
# For downloading opencv_contrib
......
......@@ -14,7 +14,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- gcc 4.8.5 # [linux]
- libgcc 4.8.5 # [linux]
- python
......
......@@ -16,7 +16,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- libpng 1.6.27
- zlib 1.2.8
- xz 5.2.2
......
#!/bin/bash
if [ "$(uname)" == "Darwin" ]
then
if [[ "$(uname)" == "Darwin" ]]; then
# for Mac OSX
export CC=gcc
export CXX=g++
......@@ -18,22 +17,11 @@ then
export CFLAGS="${CFLAGS} -stdlib=libstdc++"
export CXXFLAGS="${CXXFLAGS} -stdlib=libstdc++"
export LDFLAGS="${LDFLAGS} -stdlib=libstdc++"
elif [ "$(uname)" == "Linux" ]
then
elif [[ "$(uname)" == "Linux" ]]; then
# for Linux
export CC=gcc
export CXX=g++
export CFLAGS="${CFLAGS}"
# Boost wants to enable `float128` support on Linux by default.
# However, we don't install `libquadmath` so it will fail to find
# the needed headers and fail to compile things. Adding this flag
# tells Boost not to support `float128` and avoids this search
# process. As it has confused a few people. We have added it here.
# The idea to add this flag was inspired by this Boost ticked.
#
# https://svn.boost.org/trac/boost/ticket/9240
#
export CXXFLAGS="${CXXFLAGS} -DBOOST_MATH_DISABLE_FLOAT128"
export LDFLAGS="${LDFLAGS}"
export LINKFLAGS="${LDFLAGS}"
else
......@@ -41,11 +29,15 @@ else
exit 1
fi
export CFLAGS="${CFLAGS} -m64"
export CXXFLAGS="${CXXFLAGS} -m64"
if [[ -z "${ARCH}"]]; then
ARCH=64
fi
export CFLAGS="${CFLAGS} -m${ARCH}"
export CXXFLAGS="${CXXFLAGS} -m${ARCH}"
export CFLAGS="${CFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0"
export CXXFLAGS="${CXXFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0"
export CFLAGS="${CFLAGS} -O3 -g0 -DNDEBUG -mtune=native"
export CXXFLAGS="${CXXFLAGS} -O3 -g0 -DNDEBUG -mtune=native"
export CFLAGS="${CFLAGS} -O3 -g -DNDEBUG -mtune=native"
export CXXFLAGS="${CXXFLAGS} -O3 -g -DNDEBUG -mtune=native"
#!/bin/bash
if [ "$(uname)" == "Darwin" ];
then
if [[ "$(uname)" == "Darwin" ]]; then
# for Mac OSX
unset CC
unset CXX
......@@ -12,8 +11,7 @@ then
unset CXXFLAGS
unset LDFLAGS
unset LINKFLAGS
elif [ "$(uname)" == "Linux" ]
then
elif [[ "$(uname)" == "Linux" ]]; then
# for Linux
unset CC
unset CXX
......
package:
name: toolchain
version: 2.3.0
version: 2.3.1
build:
number: 0
......@@ -20,7 +20,4 @@ about:
extra:
recipe-maintainers:
- jakirkham
- msarahan
- patricksnape
- pelson
- amohammadi
......@@ -24,7 +24,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python # [win]
test:
......
......@@ -17,7 +17,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- yasm
test:
......
......@@ -19,7 +19,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python # [unix]
test:
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- cmake
......
......@@ -16,7 +16,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.db.base
......
......@@ -36,7 +36,7 @@ test:
- numpy
- sphinx_rtd_theme
- sphinx
- toolchain 2.3.0
- toolchain 2.3.1
- gcc 4.8.5 # [linux]
- libgcc 4.8.5 # [linux]
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- scipy
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -17,7 +17,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- pillow
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- matplotlib
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension >2.0.4
......
......@@ -23,7 +23,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.learn.boosting
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- matplotlib
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -17,7 +17,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension >2.0.4
......
......@@ -17,7 +17,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- numpy
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension >2.0.4
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension >2.0.4
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.core
......
......@@ -20,7 +20,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension
......
......@@ -15,7 +15,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension >2.0.4
......
......@@ -16,7 +16,7 @@ build:
requirements:
build:
- toolchain 2.3.0
- toolchain 2.3.1
- python
- setuptools
- bob.extension ==2.3.9
......@@ -112,7 +112,7 @@ test:
- freetype
- sphinx
- sphinx_rtd_theme
- toolchain 2.3.0
- toolchain 2.3.1
- gcc 4.8.5 # [linux]
- libgcc 4.8.5 # [linux]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment