Created
September 22, 2018 00:13
-
-
Save rvalieris/d42b5ce0c4d4197ddca942b0539af6a2 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From ce9d3edd1b0f3397cf6558a650d1a0ee2edbb823 Mon Sep 17 00:00:00 2001 | |
| From: rvalieris <rvalieris@users.noreply.github.com> | |
| Date: Fri, 21 Sep 2018 21:16:05 -0300 | |
| Subject: [PATCH] uncomment sysroot change | |
| --- | |
| recipe/build.sh | 30 ++++++++++++++++-------------- | |
| 1 file changed, 16 insertions(+), 14 deletions(-) | |
| diff --git a/recipe/build.sh b/recipe/build.sh | |
| index 1e35f0d..c65f7ea 100644 | |
| --- a/recipe/build.sh | |
| +++ b/recipe/build.sh | |
| @@ -19,20 +19,22 @@ if [[ ${HOST} =~ .*linux.* ]]; then | |
| # elif [[ ${HOST} =~ .*darwin.* ]]; then | |
| # _config_args+=(-Dlddlflags=" -bundle -undefined dynamic_lookup ${LDFLAGS}") | |
| fi | |
| -# # -Dsysroot prevents Configure rummaging around in /usr and | |
| -# # linking to system libraries (like GDBM, which is GPL). An | |
| -# # alternative is to pass -Dusecrosscompile but that prevents | |
| -# # all Configure/run checks which we also do not want. | |
| -# if [[ -n ${CONDA_BUILD_SYSROOT} ]]; then | |
| -# _config_args+=("-Dsysroot=${CONDA_BUILD_SYSROOT}") | |
| -# else | |
| -# if [[ -n ${HOST} ]] && [[ -n ${CC} ]]; then | |
| -# _config_args+=("-Dsysroot=$(dirname $(dirname ${CC}))/$(${CC} -dumpmachine)/sysroot") | |
| -# else | |
| -# _config_args+=("-Dsysroot=/usr") | |
| -# fi | |
| -# fi | |
| - | |
| +# -Dsysroot prevents Configure rummaging around in /usr and | |
| +# linking to system libraries (like GDBM, which is GPL). An | |
| +# alternative is to pass -Dusecrosscompile but that prevents | |
| +# all Configure/run checks which we also do not want. | |
| +# remove this if after the gcc7 migration | |
| +if [[ "$PKG_BUILDNUM" == "1000" ]]; then | |
| + if [[ -n ${CONDA_BUILD_SYSROOT} ]]; then | |
| + _config_args+=("-Dsysroot=${CONDA_BUILD_SYSROOT}") | |
| + else | |
| + if [[ -n ${HOST} ]] && [[ -n ${CC} ]]; then | |
| + _config_args+=("-Dsysroot=$(dirname $(dirname ${CC}))/$(${CC} -dumpmachine)/sysroot") | |
| + else | |
| + _config_args+=("-Dsysroot=/usr") | |
| + fi | |
| + fi | |
| +fi | |
| ./Configure -de "${_config_args[@]}" | |
| make | |
| -- | |
| 2.18.0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment