commit: 504476c3b83167679845363c3c52b29bb3a71a6d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Dec 27 22:42:19 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 27 22:43:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504476c3
media-gfx/imagemagick: fix perl build w/ autoconf-2.72 Bug: https://bugs.gentoo.org/920788 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/imagemagick-7.1.1.24-c99.patch | 47 ++++++++++++++++++++++ media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild | 4 ++ media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild | 1 + 3 files changed, 52 insertions(+) diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch new file mode 100644 index 000000000000..affcb61f1fed --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch @@ -0,0 +1,47 @@ +https://bugs.gentoo.org/920788 + +From f6e90ad1a649c4032b957fa101d30c14de3b7e5d Mon Sep 17 00:00:00 2001 +From: Sam James <s...@gentoo.org> +Date: Wed, 27 Dec 2023 22:37:42 +0000 +Subject: [PATCH] configure.ac: fixup LFS check for autoconf-2.72 + +There are two problems with the check: +1) The 'unknown' case has a problem which is rejected by stricter C compilers +because it has -Wimplicit-int and -Wimplicit-function-declaration warnings. Fix that. + +2) For the 'other' case, we were using the value of ac_cv_sys_file_offset_bits for +-D_FILE_OFFSET_BITS to pass down into the Perl module build, but autoconf-2.72 +drops the use of ac_cv_sys_file_offset_bits in cf09f48841b66fe76f606dd6018bb3a93242a7c9, +so this ends up defining '-D_FILE_OFFSET_BITS=' which then breaks the build. + +I've added a hack for 2) to preserve the old behavior. + +Signed-off-by: Sam James <s...@gentoo.org> +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 57c21edb77..99aa9c21af 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -503,7 +503,8 @@ if test "$enable_largefile" != no; then + unknown) + AC_MSG_CHECKING([for native large file support]) + AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <unistd.h> +- main () { ++ #include <stdlib.h> ++ int main () { + exit(!(sizeof(off_t) == 8)); + }])], + [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64) +@@ -511,6 +512,9 @@ if test "$enable_largefile" != no; then + [AC_MSG_RESULT([no])]) + ;; + *) ++ if test "$ac_cv_sys_file_offset_bits" = ''; then ++ ac_cv_sys_file_offset_bits=64; ++ fi + LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" + ;; + esac diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild index 6949eaa71ea1..102d35e4f68c 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.13.2.ebuild @@ -86,6 +86,10 @@ DEPEND=" " BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${PN}-7.1.1.24-c99.patch" +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild index 904cbdbc135e..099cddd93344 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.1.24.ebuild @@ -89,6 +89,7 @@ DEPEND=" BDEPEND="virtual/pkgconfig" PATCHES=( + "${FILESDIR}/${PN}-7.1.1.24-c99.patch" "${FILESDIR}/${PN}-9999-nocputuning.patch" )
