Unverified Commit 2de7ca01 authored by Atemu's avatar Atemu Committed by GitHub
Browse files

Merge pull request #315733 from NixOS/backport-315569-to-release-24.05

[Backport release-24.05] coan: fix compile error in configure.ac
parents a38ef549 6b1f4a8f
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
{ lib, stdenv, fetchurl, perl }:
{ lib, stdenv, fetchurl, autoreconfHook, perl }:

stdenv.mkDerivation rec {
  version = "6.0.1";
@@ -9,9 +9,14 @@ stdenv.mkDerivation rec {
    sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
  };

  nativeBuildInputs = [ perl ];
  patches = [
    # fix compile error in configure.ac
    ./fix-big-endian-config-check.diff
  ];

  CXXFLAGS = "-std=c++11";
  nativeBuildInputs = [ autoreconfHook perl ];

  configureFlags = [ "CXXFLAGS=-std=c++11" ];

  enableParallelBuilding = true;

+22 −0
Original line number Diff line number Diff line
diff --git a/configure.ac b/configure.ac
index 23ba6f0..13e6647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.59)
 AM_INIT_AUTOMAKE(1.13 no-define)
 AC_CHECK_HEADERS(strings.h)
 AC_MSG_CHECKING(for big-endian host)
-AC_TRY_RUN([main () {
+AC_TRY_RUN([int main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
   union
   {
@@ -12,7 +12,7 @@ AC_TRY_RUN([main () {
     char c[sizeof (long)];
   } u;
   u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
+  return u.c[sizeof (long) - 1] == 1;
 }], BIG_ENDIAN=no, BIG_ENDIAN=yes)
 AC_MSG_RESULT([$BIG_ENDIAN])
 AM_CONDITIONAL([IS_BIG_ENDIAN],[test "$BIG_ENDIAN" = "yes"])