[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

["Sam James" <sam@gentoo.org>]

commit:     60e32e133500d456ec9752a4926633350ae77641
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 22 23:21:20 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 23:23:17 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60e32e13

app-office/libreoffice: respect CFLAGS more

I noticed that chunks of the build were using -O2 -mtune=generic, so
fix that. There's some precedence for other distros overriding this anyway
per commit messages.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/libreoffice-25.2-cflags.patch            | 211 +++++++++++++++++++++
 app-office/libreoffice/libreoffice-25.2.1.1.ebuild |   1 +
 app-office/libreoffice/libreoffice-9999.ebuild     |   1 +
 3 files changed, 213 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-25.2-cflags.patch b/app-office/libreoffice/files/libreoffice-25.2-cflags.patch
new file mode 100644
index 000000000000..1f81775e2f2f
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-25.2-cflags.patch
@@ -0,0 +1,211 @@
+Some parts of the build will use e.g. -O2 -mtune=generic otherwise.
+--- a/solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk
++++ b/solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk
+@@ -9,7 +9,7 @@
+ 
+ # please make generic modifications to unxgcc.mk or android.mk
+ gb_CPUDEFS += -DARM32
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/unxgcc.mk
+ include $(GBUILDDIR)/platform/android.mk
+--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
++++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+@@ -9,7 +9,7 @@
+ 
+ # please make generic modifications to unxgcc.mk or android.mk
+ gb_CPUDEFS += -DARM32
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/unxgcc.mk
+ include $(GBUILDDIR)/platform/android.mk
+--- a/solenv/gbuild/platform/ANDROID_INTEL_GCC.mk
++++ b/solenv/gbuild/platform/ANDROID_INTEL_GCC.mk
+@@ -9,7 +9,7 @@
+ 
+ # please make generic modifications to unxgcc.mk or android.mk
+ gb_CPUDEFS += -DX86
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/unxgcc.mk
+ include $(GBUILDDIR)/platform/android.mk
+--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
++++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+@@ -73,7 +73,7 @@ ifeq ($(HAVE_EXTERNAL_DWARF),TRUE)
+ gb_DEBUGINFO_FLAGS += -gsplit-dwarf -gpubnames
+ endif
+ 
+-gb_COMPILEROPTFLAGS := -O3
++gb_COMPILEROPTFLAGS :=
+ 
+ # We need at least code elimination, otherwise linking OOMs even with 64GB.
+ # So we "fake" -Og support to mean -O1 for Emscripten and always enable it for debug in configure.
+--- a/solenv/gbuild/platform/LINUX_ARM_GCC.mk
++++ b/solenv/gbuild/platform/LINUX_ARM_GCC.mk
+@@ -9,7 +9,7 @@
+ 
+ #please make generic modifications to unxgcc.mk or linux.mk
+ gb_CPUDEFS += -DARM32
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+ 
+--- a/solenv/gbuild/platform/LINUX_AXP_GCC.mk
++++ b/solenv/gbuild/platform/LINUX_AXP_GCC.mk
+@@ -8,7 +8,7 @@
+ #
+ 
+ #please make generic modifications to unxgcc.mk or linux.mk
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ gb_LinkTarget_LDFLAGS += -Wl,--no-relax
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+--- a/solenv/gbuild/platform/LINUX_INTEL_GCC.mk
++++ b/solenv/gbuild/platform/LINUX_INTEL_GCC.mk
+@@ -9,7 +9,7 @@
+ 
+ #please make generic modifications to unxgcc.mk or linux.mk
+ gb_CPUDEFS := -DX86
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+ 
+--- a/solenv/gbuild/platform/LINUX_M68K_GCC.mk
++++ b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
+@@ -8,7 +8,7 @@
+ #
+ 
+ #please make generic modifications to unxgcc.mk or linux.mk
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+ 
+--- a/solenv/gbuild/platform/LINUX_MIPS64_GCC.mk
++++ b/solenv/gbuild/platform/LINUX_MIPS64_GCC.mk
+@@ -9,7 +9,7 @@
+ 
+ #please make generic modifications to unxgcc.mk or linux.mk
+ gb_CPUDEFS += -DMIPS64
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+ 
+--- a/solenv/gbuild/platform/LINUX_MIPS_GCC.mk
++++ b/solenv/gbuild/platform/LINUX_MIPS_GCC.mk
+@@ -9,7 +9,7 @@
+ 
+ #please make generic modifications to unxgcc.mk or linux.mk
+ gb_CPUDEFS += -DMIPS
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+ 
+--- a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
++++ b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
+@@ -10,8 +10,7 @@
+ #please make generic modifications to unxgcc.mk or linux.mk
+ gb_CPUDEFS += -DPPC
+ 
+-gb_COMPILEROPTFLAGS := -O2 \
+-		       $(if $(filter powerpc64le-unknown-linux-gnu,$(HOST_PLATFORM)),-mtune=powerpc64le)
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+ 
+--- a/solenv/gbuild/platform/LINUX_RISCV64_GCC.mk
++++ b/solenv/gbuild/platform/LINUX_RISCV64_GCC.mk
+@@ -8,7 +8,7 @@
+ #
+ 
+ #please make generic modifications to unxgcc.mk or linux.mk
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+ 
+--- a/solenv/gbuild/platform/LINUX_SPARC64_GCC.mk
++++ b/solenv/gbuild/platform/LINUX_SPARC64_GCC.mk
+@@ -8,7 +8,7 @@
+ #
+ 
+ #please make generic modifications to unxgcc.mk or linux.mk
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+ 
+--- a/solenv/gbuild/platform/LINUX_SPARC_GCC.mk
++++ b/solenv/gbuild/platform/LINUX_SPARC_GCC.mk
+@@ -8,7 +8,7 @@
+ #
+ 
+ #please make generic modifications to unxgcc.mk or linux.mk
+-gb_COMPILEROPTFLAGS := -Os
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+ 
+--- a/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
++++ b/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
+@@ -9,7 +9,7 @@
+ 
+ #please make generic modifications to unxgcc.mk or linux.mk
+ 
+-gb_COMPILEROPTFLAGS := -O2 -mtune=generic
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+ 
+--- a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
++++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
+@@ -10,7 +10,7 @@
+ #please make generic modifications to unxgcc.mk
+ 
+ gb_CPUDEFS := -DX86
+-gb_COMPILEROPTFLAGS := -O -g
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/unxgcc.mk
+ 
+--- a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
++++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
+@@ -9,7 +9,7 @@
+ 
+ #please make generic modifications to unxgcc.mk
+ 
+-gb_COMPILEROPTFLAGS := -O -g
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/unxgcc.mk
+ 
+--- a/solenv/gbuild/platform/com_GCC_defs.mk
++++ b/solenv/gbuild/platform/com_GCC_defs.mk
+@@ -38,7 +38,7 @@ endif
+ gb_COMPILER_SETUP :=
+ 
+ ifeq ($(strip $(gb_COMPILEROPTFLAGS)),)
+-gb_COMPILEROPTFLAGS := -O2
++gb_COMPILEROPTFLAGS :=
+ endif
+ 
+ gb_COMPILEROPTFLAGS += $(if $(ENABLE_HARDENING_FLAGS),$(HARDENING_OPT_CFLAGS))
+--- a/solenv/gbuild/platform/iOS.mk
++++ b/solenv/gbuild/platform/iOS.mk
+@@ -24,7 +24,7 @@ ifeq ($(CXX),)
+ $(error You must set CXX in the environment. See README.cross for example.)
+ endif
+ 
+-gb_COMPILEROPTFLAGS := -O2
++gb_COMPILEROPTFLAGS :=
+ 
+ include $(GBUILDDIR)/platform/com_GCC_defs.mk
+ 

diff --git a/app-office/libreoffice/libreoffice-25.2.1.1.ebuild b/app-office/libreoffice/libreoffice-25.2.1.1.ebuild
index 93fdf81500f1..51e15b633a78 100644
--- a/app-office/libreoffice/libreoffice-25.2.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-25.2.1.1.ebuild
@@ -294,6 +294,7 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-24.2-qtdetect.patch"
+	"${FILESDIR}/${PN}-25.2-cflags.patch"
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-25.2-unused-qt6network.patch"

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 881254aa0372..f99706c20250 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -294,6 +294,7 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-24.2-qtdetect.patch"
+	"${FILESDIR}/${PN}-25.2-cflags.patch"
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-25.2-unused-qt6network.patch"