diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39354 -> 39357 bytes | |||
| -rw-r--r-- | eclass/ruby-fakegem.eclass | 12 | ||||
| -rw-r--r-- | eclass/texlive-module.eclass | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex c9949a72f07d..a36e32517c52 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass index eb6257a50cf9..fc78428be714 100644 --- a/eclass/ruby-fakegem.eclass +++ b/eclass/ruby-fakegem.eclass @@ -23,6 +23,8 @@ case ${EAPI} in *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac +# flag-o-matic is only required for ruby31 support. +inherit flag-o-matic inherit ruby-ng # @ECLASS_VARIABLE: RUBY_FAKEGEM_NAME @@ -424,6 +426,16 @@ EOF each_fakegem_configure() { debug-print-function ${FUNCNAME} "$@" + # Ruby 3.1 has a varargs implementation that is not compatible with + # gnu23. Ruby 3.1 is EOL in March 2025 and will be removed shortly + # after that. + case ${RUBY} in + *ruby31) + append-flags -std=gnu17 + filter-flags -std=gnu23 + ;; + esac + tc-export PKG_CONFIG for extension in "${RUBY_FAKEGEM_EXTENSIONS[@]}" ; do CC=$(tc-getCC) ${RUBY} --disable=did_you_mean -C ${extension%/*} ${extension##*/} --with-cflags="${CFLAGS}" --with-ldflags="${LDFLAGS}" ${RUBY_FAKEGEM_EXTENSION_OPTIONS} || die diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass index ebd65e3dd0d8..15dcdea5df20 100644 --- a/eclass/texlive-module.eclass +++ b/eclass/texlive-module.eclass @@ -539,10 +539,10 @@ texlive-module_src_install() { local status # "success-status aware grep", returning exit status 0 instead of 1. - _sgrep() { grep "$@"; return "$(( $? <= 1 ? 0 : $? ))"; } + _tl_sgrep() { grep "$@"; return "$(( $? <= 1 ? 0 : $? ))"; } ebegin "Installing man pages" find texmf-dist/doc/man -type f -name '*.[0-9n]' -print | - _sgrep -v "${grep_expressions[@]}" | + _tl_sgrep -v "${grep_expressions[@]}" | xargs -d '\n' --no-run-if-empty nonfatal doman status=$(pipestatus -v) eend $? || die "error installing man pages (PIPESTATUS: ${status})" |