summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-11-23 01:37:44 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-11-23 01:37:44 +0000
commit9e3dad97a7ffdadcd77d28d0a631abcd46fa7ae2 (patch)
tree842c2a5eed48532c0b6244f791261c1c5e62b9cd
parent2022-11-23 01:17:36 UTC (diff)
parentautotools.eclass: fix autoconf 2.13 minimum bound (diff)
downloadgentoo-9e3dad97a7ffdadcd77d28d0a631abcd46fa7ae2.tar.gz
gentoo-9e3dad97a7ffdadcd77d28d0a631abcd46fa7ae2.tar.bz2
gentoo-9e3dad97a7ffdadcd77d28d0a631abcd46fa7ae2.zip
Merge updates from master
-rw-r--r--dev-util/glslang/glslang-1.3.231-r2.ebuild2
-rw-r--r--dev-util/glslang/glslang-9999.ebuild2
-rw-r--r--eclass/autotools.eclass2
3 files changed, 3 insertions, 3 deletions
diff --git a/dev-util/glslang/glslang-1.3.231-r2.ebuild b/dev-util/glslang/glslang-1.3.231-r2.ebuild
index 1e271526d5c3..519eb9fd2b13 100644
--- a/dev-util/glslang/glslang-1.3.231-r2.ebuild
+++ b/dev-util/glslang/glslang-1.3.231-r2.ebuild
@@ -31,7 +31,7 @@ RESTRICT="test"
multilib_src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_PRECOMPILE_HEADERS=1
+ -DENABLE_PCH=OFF
)
cmake_src_configure
}
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index 7f472c0f455f..c7d6b2354929 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -31,7 +31,7 @@ RESTRICT="test"
multilib_src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_PRECOMPILE_HEADERS=1
+ -DENABLE_PCH=OFF
)
cmake_src_configure
}
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 01053ff51379..e93338ac6b97 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -93,7 +93,7 @@ fi
if [[ -n ${WANT_AUTOCONF} ]] ; then
case ${WANT_AUTOCONF} in
none) _autoconf_atom="" ;; # some packages don't require autoconf at all
- 2.1) _autoconf_atom="~sys-devel/autoconf-2.13-r7" ;;
+ 2.1) _autoconf_atom=">=sys-devel/autoconf-2.13-r7:2.1" ;;
# if you change the "latest" version here, change also autotools_env_setup
latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.71-r5" ;;
*) die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" ;;