Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bob
conda
Commits
d8f3234e
Commit
d8f3234e
authored
Mar 13, 2017
by
André Anjos
💬
Browse files
[toolchain] Fix ARCH rule on activation
parent
32f5bd02
Pipeline
#7763
passed with stage
in 4 minutes and 5 seconds
Changes
46
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
dependencies/ccache/meta.yaml
View file @
d8f3234e
...
...
@@ -17,7 +17,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
zlib 1.2.8
-
xz 5.2.2
-
gcc 4.8.5
# [linux]
...
...
dependencies/cyvlfeat/meta.yaml
View file @
d8f3234e
...
...
@@ -13,7 +13,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
gcc 4.8.5
# [linux]
-
libgcc 4.8.5
# [linux]
-
python
...
...
dependencies/dlib/meta.yaml
View file @
d8f3234e
...
...
@@ -20,7 +20,7 @@ build:
requirements
:
build
:
-
python
-
toolchain 2.3.
0
-
toolchain 2.3.
2
-
cmake
-
mkl
# [not win]
-
numpy x.x
...
...
@@ -30,7 +30,7 @@ requirements:
-
sqlite 3.13.*
# [not win]
run
:
-
python
-
python
-
mkl
# [not win]
-
numpy x.x
-
boost 1.61.*
...
...
dependencies/eigen/meta.yaml
View file @
d8f3234e
...
...
@@ -18,7 +18,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
cmake
-
python
# [win]
-
gcc 4.8.5
# [linux]
...
...
dependencies/ffmpeg/meta.yaml
View file @
d8f3234e
...
...
@@ -15,7 +15,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
pkg-config
-
libtool
-
yasm
...
...
dependencies/giflib/meta.yaml
View file @
d8f3234e
...
...
@@ -15,7 +15,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
gcc 4.8.5
# [linux]
-
libgcc 4.8.5
# [linux]
...
...
dependencies/libblitz/meta.yaml
View file @
d8f3234e
...
...
@@ -15,7 +15,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
gcc 4.8.5
# [linux]
-
libgcc 4.8.5
# [linux]
run
:
...
...
dependencies/libmatio/meta.yaml
View file @
d8f3234e
...
...
@@ -14,7 +14,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
hdf5 1.8.17|1.8.17.*
-
zlib 1.2.8
-
gcc 4.8.5
# [linux]
...
...
dependencies/libsvm/meta.yaml
View file @
d8f3234e
...
...
@@ -22,7 +22,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
python
# [win]
-
gcc 4.8.5
# [linux]
-
libgcc 4.8.5
# [linux]
...
...
dependencies/menpo/meta.yaml
View file @
d8f3234e
...
...
@@ -17,7 +17,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
gcc 4.8.5
# [linux]
-
libgcc 4.8.5
# [linux]
-
python
...
...
dependencies/opencv/meta.yaml
View file @
d8f3234e
...
...
@@ -19,7 +19,7 @@ build:
requirements
:
build
:
-
python
-
toolchain 2.3.
1
-
toolchain 2.3.
2
# For sha256 comparisons of opencv_contrib
-
openssl 1.0.*
# [unix]
# For downloading opencv_contrib
...
...
dependencies/pyedflib/meta.yaml
View file @
d8f3234e
...
...
@@ -14,7 +14,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
gcc 4.8.5
# [linux]
-
libgcc 4.8.5
# [linux]
-
python
...
...
dependencies/sox/meta.yaml
View file @
d8f3234e
...
...
@@ -16,7 +16,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
libpng 1.6.27
-
zlib 1.2.8
-
xz 5.2.2
...
...
dependencies/toolchain/activate.sh
View file @
d8f3234e
...
...
@@ -29,13 +29,11 @@ else
exit
1
fi
if
[
-z
"
${
ARCH
}
"
]
;
then
ARCH
=
64
if
[
-n
"
${
CONDA_BUILD
}
"
]
;
then
export
CFLAGS
=
"
${
CFLAGS
}
-m
${
ARCH
}
"
export
CXXFLAGS
=
"
${
CXXFLAGS
}
-m
${
ARCH
}
"
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"
...
...
dependencies/toolchain/meta.yaml
View file @
d8f3234e
package
:
name
:
toolchain
version
:
2.3.
1
version
:
2.3.
2
build
:
number
:
0
...
...
dependencies/vlfeat/meta.yaml
View file @
d8f3234e
...
...
@@ -24,14 +24,14 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
python
# [win]
test
:
requires
:
-
python
# [win]
commands
:
commands
:
-
sift -h
-
mser -h
-
aib -h
...
...
dependencies/x264/meta.yaml
View file @
d8f3234e
...
...
@@ -17,7 +17,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
yasm
test
:
...
...
dependencies/yasm/meta.yaml
View file @
d8f3234e
...
...
@@ -19,7 +19,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
python
# [unix]
test
:
...
...
recipes/bob.ap/meta.yaml
View file @
d8f3234e
...
...
@@ -15,7 +15,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
python
-
setuptools
-
bob.extension
...
...
recipes/bob.blitz/meta.yaml
View file @
d8f3234e
...
...
@@ -15,7 +15,7 @@ build:
requirements
:
build
:
-
toolchain 2.3.
1
-
toolchain 2.3.
2
-
python
-
setuptools
-
bob.extension
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment