From 6cbf38f7981c5374b0f20fd8235ab82c3ab61e74 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 21 Sep 2022 08:22:38 +0200 Subject: rename function to local namespace pattern: get_gcc_version_from_config -> _get_gcc_version_from_config --- core/linux-lts/PKGBUILD | 4 ++-- core/linux/PKGBUILD | 4 ++-- extra/linux-galileo-gen2/PKGBUILD | 4 ++-- extra/linux-olpc-xo1/PKGBUILD | 4 ++-- extra/linux-pae/PKGBUILD | 4 ++-- extra/linux-zen/PKGBUILD | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/linux-lts/PKGBUILD b/core/linux-lts/PKGBUILD index e0a471e2..208b66b7 100644 --- a/core/linux-lts/PKGBUILD +++ b/core/linux-lts/PKGBUILD @@ -12,11 +12,11 @@ eval "$( sed ' \,/tools/objtool" ,d \,arch/x86/Makefile,a install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile_32.cpu - /}/ i depends+=(gcc-libs=$(get_gcc_version_from_config)) + /}/ i depends+=(gcc-libs=$(_get_gcc_version_from_config)) ' )" -get_gcc_version_from_config() { +_get_gcc_version_from_config() { sed ' s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/ t diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index bb2a47bf..6eea3bd4 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -29,11 +29,11 @@ eval "$( a \ install -t "${builddir}/arch/x86" -m644 arch/x86/Makefile_32.cpu } - /}/ i depends+=(gcc-libs=$(get_gcc_version_from_config)) + /}/ i depends+=(gcc-libs=$(_get_gcc_version_from_config)) ' )" -get_gcc_version_from_config() { +_get_gcc_version_from_config() { sed ' s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/ t diff --git a/extra/linux-galileo-gen2/PKGBUILD b/extra/linux-galileo-gen2/PKGBUILD index 034247a1..0cb05e97 100644 --- a/extra/linux-galileo-gen2/PKGBUILD +++ b/extra/linux-galileo-gen2/PKGBUILD @@ -93,7 +93,7 @@ _package() { rm "$modulesdir"/{source,build} } -get_gcc_version_from_config() { +_get_gcc_version_from_config() { sed ' s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/ t @@ -172,7 +172,7 @@ _package-headers() { echo "Adding symlink..." mkdir -p "$pkgdir/usr/src" ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase" - depends+=(gcc-libs=$(get_gcc_version_from_config)) + depends+=(gcc-libs=$(_get_gcc_version_from_config)) } _package-docs() { diff --git a/extra/linux-olpc-xo1/PKGBUILD b/extra/linux-olpc-xo1/PKGBUILD index dd1d38d6..e3ecde3d 100644 --- a/extra/linux-olpc-xo1/PKGBUILD +++ b/extra/linux-olpc-xo1/PKGBUILD @@ -164,10 +164,10 @@ _package-headers() { echo "Adding symlink..." mkdir -p "$pkgdir/usr/src" ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase" - depends+=(gcc-libs=$(get_gcc_version_from_config)) + depends+=(gcc-libs=$(_get_gcc_version_from_config)) } -get_gcc_version_from_config() { +_get_gcc_version_from_config() { sed ' s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/ t diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD index 85a8962e..ac8af227 100644 --- a/extra/linux-pae/PKGBUILD +++ b/extra/linux-pae/PKGBUILD @@ -195,10 +195,10 @@ _package-headers() { esac /usr/bin/strip ${_strip} "${_binary}" done < <(find "${_builddir}/scripts" -type f -perm -u+w -print0 2>/dev/null) - depends+=(gcc-libs=$(get_gcc_version_from_config)) + depends+=(gcc-libs=$(_get_gcc_version_from_config)) } -get_gcc_version_from_config() { +_get_gcc_version_from_config() { sed ' s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/ t diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD index 89064177..41ef2d72 100644 --- a/extra/linux-zen/PKGBUILD +++ b/extra/linux-zen/PKGBUILD @@ -15,11 +15,11 @@ eval "$( a \ install -t "${builddir}/arch/x86" -m644 arch/x86/Makefile_32.cpu } - /}/ i depends+=(gcc-libs=$(get_gcc_version_from_config)) + /}/ i depends+=(gcc-libs=$(_get_gcc_version_from_config)) ' )" -get_gcc_version_from_config() { +_get_gcc_version_from_config() { sed ' s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/ t -- cgit v1.2.3-54-g00ecf