[gentoo-commits] repo/gentoo:master commit in: dev-libs/liboil/, dev-libs/liboil/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/liboil/, dev-libs/liboil/files/

[Sam James]

commit:     4c58466ac10bda0e1b928e932568735c9f88bd02
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 05:51:10 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  1 05:52:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c58466a

dev-libs/liboil: fix Modern C issue in configure, filter LTO

* Fix modern C issue in configure
* Filter LTO as we already strip-flags etc and it's looong dead & archived
  upstream.

Closes: https://bugs.gentoo.org/906533
Closes: https://bugs.gentoo.org/931004
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../liboil/files/liboil-0.3.17-c99-configure.patch  | 21 +++++++++++++++++++++
 ...oil-0.3.17-r4.ebuild => liboil-0.3.17-r5.ebuild} |  7 ++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/dev-libs/liboil/files/liboil-0.3.17-c99-configure.patch b/dev-libs/liboil/files/liboil-0.3.17-c99-configure.patch
new file mode 100644
index 000000000000..7feba8a24d99
--- /dev/null
+++ b/dev-libs/liboil/files/liboil-0.3.17-c99-configure.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/906533
+--- a/m4/as-unaligned-access.m4
++++ b/m4/as-unaligned-access.m4
+@@ -19,6 +19,7 @@ AC_DEFUN([AS_UNALIGNED_ACCESS], [
+   fi
+   if test x"$as_cv_unaligned_access" = x ; then
+     AC_TRY_RUN([
++#include <string.h>
+ int main(int argc, char **argv)
+ {
+   char array[] = "ABCDEFGH";
+--- a/configure
++++ b/configure
+@@ -12022,6 +12022,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <string.h>
+ int main(int argc, char **argv)
+ {
+   char array[] = "ABCDEFGH";

diff --git a/dev-libs/liboil/liboil-0.3.17-r4.ebuild b/dev-libs/liboil/liboil-0.3.17-r5.ebuild
similarity index 92%
rename from dev-libs/liboil/liboil-0.3.17-r4.ebuild
rename to dev-libs/liboil/liboil-0.3.17-r5.ebuild
index ca36144b8ac9..cc494faf3d93 100644
--- a/dev-libs/liboil/liboil-0.3.17-r4.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r5.ebuild
@@ -21,7 +21,10 @@ BDEPEND="
 	dev-build/gtk-doc-am
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-amd64-cpuid.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-amd64-cpuid.patch
+	"${FILESDIR}"/${P}-c99-configure.patch
+)
 
 src_prepare() {
 	[[ ${CHOST} == *x32 ]] && PATCHES+=( "${FILESDIR}"/${PN}-0.3.17-x32.patch )
@@ -43,6 +46,8 @@ src_configure() {
 	strip-flags
 	filter-flags -O?
 	append-flags -O2
+	# bug #931004
+	filter-lto
 
 	# For use with Clang, which is the only compiler on OSX, bug #576646
 	[[ ${CHOST} == *-darwin* ]] && append-flags -fheinous-gnu-extensions