diff options
| author | Erich Eckner <git@eckner.net> | 2019-07-05 14:06:35 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-07-05 14:06:35 +0200 |
| commit | b2b095fcddbef5a555655f2a689d27d40cbf4d42 (patch) | |
| tree | c5b9386ea9b19628aaca12f4728d2b68b6db3be6 | |
| parent | 682e73f7bce5e053668a771ae573cb66af4caacf (diff) | |
| download | packages-b2b095fcddbef5a555655f2a689d27d40cbf4d42.tar.xz | |
core/gcc: fix cet for i686/pentium4 and remove obsolete doxygen patch for i486
| -rw-r--r-- | core/gcc/PKGBUILD | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 95e0af60..b2d6ed81 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -51,27 +51,6 @@ eval "$( # i486-specific -# disable doxygen documentation -makedepends=(${makedepends[@]//doxygen/}) -makedepends_i686+=('doxygen') - -if [ "${CARCH}" = "i486" ]; then - eval "$( - declare -f build | \ - sed ' - /make.*doc-man-doxygen/d - ' - )" - - eval "$( - declare -f package_gcc | \ - sed ' - /make.*doc-man-doxygen/d - /make.*doc-install-man/d - ' - )" -fi - # no ADA makedepends=(${makedepends[@]//gcc-ada/}) makedepends_i686+=('gcc-ada') @@ -116,6 +95,16 @@ if [ "${CARCH}" = "i486" ]; then ' )" +else + + # force enable CET (Control Flow instructions endbr32/enbr64) + eval "$( + declare -f build | \ + sed ' + s/--enable-cet=auto/--enable-cet/ + ' + )" + fi makedepends_pentium4=("${makedepends_i686[@]}") |