commit: 83d72770bcd85405144b4a6ad2b427abc11fe62c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 07:33:03 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 07:34:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d72770
app-editors/{vim-core,vim,gvim}: disable CP932 for musl builds
Closes: https://bugs.gentoo.org/908961
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-editors/gvim/gvim-9.0.2167.ebuild | 5 +++++
app-editors/gvim/gvim-9999.ebuild | 5 +++++
app-editors/vim-core/vim-core-9.0.2167.ebuild | 5 +++++
app-editors/vim-core/vim-core-9999.ebuild | 5 +++++
app-editors/vim/vim-9.0.2167.ebuild | 5 +++++
app-editors/vim/vim-9999.ebuild | 5 +++++
6 files changed, 30 insertions(+)
diff --git a/app-editors/gvim/gvim-9.0.2167.ebuild
b/app-editors/gvim/gvim-9.0.2167.ebuild
index f347bfc28ae4..547c5a78bdce 100644
--- a/app-editors/gvim/gvim-9.0.2167.ebuild
+++ b/app-editors/gvim/gvim-9.0.2167.ebuild
@@ -165,6 +165,11 @@ src_prepare() {
sed -i -e \
'/# define FEAT_CSCOPE/d' src/feature.h || die
"couldn't disable cscope"
fi
+
+ # bug 908961
+ if use elibc_musl ; then
+ sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
+ fi
}
src_configure() {
diff --git a/app-editors/gvim/gvim-9999.ebuild
b/app-editors/gvim/gvim-9999.ebuild
index 575b259aa039..9f2b67d6fdc0 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -164,6 +164,11 @@ src_prepare() {
sed -i -e \
'/# define FEAT_CSCOPE/d' src/feature.h || die
"couldn't disable cscope"
fi
+
+ # bug 908961
+ if use elibc_musl ; then
+ sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
+ fi
}
src_configure() {
diff --git a/app-editors/vim-core/vim-core-9.0.2167.ebuild
b/app-editors/vim-core/vim-core-9.0.2167.ebuild
index edd3e7679185..cca287f37b6e 100644
--- a/app-editors/vim-core/vim-core-9.0.2167.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.2167.ebuild
@@ -108,6 +108,11 @@ src_prepare() {
# Remove src/auto/configure file.
rm -v src/auto/configure || die "rm configure failed"
+
+ # bug 908961
+ if use elibc_musl ; then
+ sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
+ fi
}
src_configure() {
diff --git a/app-editors/vim-core/vim-core-9999.ebuild
b/app-editors/vim-core/vim-core-9999.ebuild
index 90c03717c01c..acfd3ab4aab3 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -108,6 +108,11 @@ src_prepare() {
# Remove src/auto/configure file.
rm -v src/auto/configure || die "rm configure failed"
+
+ # bug 908961
+ if use elibc_musl ; then
+ sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
+ fi
}
src_configure() {
diff --git a/app-editors/vim/vim-9.0.2167.ebuild
b/app-editors/vim/vim-9.0.2167.ebuild
index 2b51783e44cb..89f0524b4be8 100644
--- a/app-editors/vim/vim-9.0.2167.ebuild
+++ b/app-editors/vim/vim-9.0.2167.ebuild
@@ -153,6 +153,11 @@ src_prepare() {
# (4) Run ./configure (with wrong args) to remake auto/config.mk
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed
failed"
rm src/auto/configure || die "rm failed"
+
+ # bug 908961
+ if use elibc_musl ; then
+ sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
+ fi
}
src_configure() {
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 0a89c95fd2c9..d3ce80bac470 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -153,6 +153,11 @@ src_prepare() {
# (4) Run ./configure (with wrong args) to remake auto/config.mk
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed
failed"
rm src/auto/configure || die "rm failed"
+
+ # bug 908961
+ if use elibc_musl ; then
+ sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
+ fi
}
src_configure() {