diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2016-06-12 04:40:47 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2016-06-12 04:40:47 +0000 |
| commit | 7ca256f6fda5d29145c11d18c83c5ebad4dcb087 (patch) | |
| tree | 3bbcc82f245b0e2ea20ae063da493391f49fd25e | |
| parent | 2016-06-12 03:41:59 UTC (diff) | |
| parent | mysql-cmake/mysql-multilib eclasses: set STACK_DIRECTION to fix cross-compiles (diff) | |
| download | gentoo-7ca256f6fda5d29145c11d18c83c5ebad4dcb087.tar.gz gentoo-7ca256f6fda5d29145c11d18c83c5ebad4dcb087.tar.bz2 gentoo-7ca256f6fda5d29145c11d18c83c5ebad4dcb087.zip | |
Merge updates from master
| -rw-r--r-- | eclass/mysql-cmake.eclass | 6 | ||||
| -rw-r--r-- | eclass/mysql-multilib-r1.eclass | 3 | ||||
| -rw-r--r-- | eclass/toolchain-funcs.eclass | 15 |
3 files changed, 23 insertions, 1 deletions
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 0f0f5b448fd8..f14c9a7cf67b 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -16,7 +16,7 @@ # the src_prepare, src_configure, src_compile, and src_install # phase hooks. -inherit cmake-utils flag-o-matic multilib prefix eutils +inherit cmake-utils flag-o-matic multilib prefix eutils toolchain-funcs # # HELPER FUNCTIONS: @@ -243,6 +243,10 @@ configure_cmake_standard() { if mysql_version_is_at_least "10.1.2" ; then mycmakeargs+=( $(mysql-cmake_use_plugin cracklib CRACKLIB_PASSWORD_CHECK ) ) fi + + # The build forces this to be defined when cross-compiling. We pass it + # all the time for simplicity and to make sure it is actually correct. + mycmakeargs+=( -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) ) else mycmakeargs+=( $(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE) ) fi diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass index 40ef8f544283..858b9b65d6c4 100644 --- a/eclass/mysql-multilib-r1.eclass +++ b/eclass/mysql-multilib-r1.eclass @@ -401,6 +401,9 @@ multilib_src_configure() { -DWITH_DEFAULT_FEATURE_SET=0 -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" -DENABLE_STATIC_LIBS=$(usex static-libs) + # The build forces this to be defined when cross-compiling. We pass it + # all the time for simplicity and to make sure it is actually correct. + -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) ) if use test ; then diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index cf95d04ad66c..e794559bbcfb 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -221,6 +221,21 @@ tc-is-static-only() { [[ ${host} == *-mint* ]] } +# @FUNCTION: tc-stack-grows-down +# @DESCRIPTION: +# Return shell true if the stack grows down. This is the default behavior +# for the vast majority of systems out there and usually projects shouldn't +# care about such internal details. +tc-stack-grows-down() { + # List the few that grow up. + case ${ARCH} in + hppa|metag) return 1 ;; + esac + + # Assume all others grow down. + return 0 +} + # @FUNCTION: tc-export_build_env # @USAGE: [compiler variables] # @DESCRIPTION: |