Unverified Commit 01986f44 authored by Janne Heß's avatar Janne Heß Committed by GitHub
Browse files

Merge pull request #253730 from reckenrode/perlPackages.Tk-fix 

perlPackages.Tk: fix build with clang 16
parents 2874e518 42f74914

pkgs/development/perl-modules/tk-configure-implicit-int-fix.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- a/JPEG/jpeg/configure	2013-11-15 18:50:03.000000000 -0500

+++ b/JPEG/jpeg/configure	2023-09-05 23:36:12.675151164 -0400

@@ -623,7 +623,7 @@

 cat > conftest.$ac_ext <<EOF

 #line 625 "configure"

 #include "confdefs.h"

-main(){return(0);}

+int main(){return(0);}

 EOF

 if { (eval echo configure:629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   ac_cv_prog_cc_works=yes

pkgs/top-level/perl-packages.nix

+5 −0
Original line number Diff line number Diff line
@@ -26614,6 +26614,11 @@ with self; { 
      url = "mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.036.tar.gz";

      hash = "sha256-Mqpycaa9/twzMBGbOCXa3dCqS1yTb4StdOq7kyogCl4=";

    };

    patches = [

      # Fix failing configure test due to implicit int return value of main, which results

      # in an error with clang 16.

      ../development/perl-modules/tk-configure-implicit-int-fix.patch

    ];

    makeMakerFlags = [ "X11INC=${pkgs.xorg.libX11.dev}/include" "X11LIB=${pkgs.xorg.libX11.out}/lib" ];

    buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ];

    doCheck = false;            # Expects working X11.