Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

aalib: fix build with clang 16 #262818

Merged
merged 1 commit into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions pkgs/development/libraries/aalib/clang.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
diff -ur a/configure b/configure
--- a/configure 2001-04-26 10:44:54.000000000 -0400
+++ b/configure 2023-10-21 23:19:52.941161475 -0400
@@ -1005,7 +1005,7 @@
#line 1006 "configure"
#include "confdefs.h"

-main(){return(0);}
+int main(){return(0);}
EOF
if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
diff -ur a/src/aafire.c b/src/aafire.c
--- a/src/aafire.c 2001-04-26 11:30:03.000000000 -0400
+++ b/src/aafire.c 2023-10-21 23:46:54.478750904 -0400
@@ -1,3 +1,4 @@
+#include <stdlib.h>
#include <stdio.h>
#include "aalib.h"

diff -ur a/src/aainfo.c b/src/aainfo.c
--- a/src/aainfo.c 2001-04-26 10:37:31.000000000 -0400
+++ b/src/aainfo.c 2023-10-21 23:31:54.141133353 -0400
@@ -1,4 +1,4 @@
-
+#include <stdlib.h>
#include "aalib.h"
#include "aaint.h"
int main(int argc, char **argv)
diff -ur a/src/aakbdreg.c b/src/aakbdreg.c
--- a/src/aakbdreg.c 2023-10-21 23:19:00.787207960 -0400
+++ b/src/aakbdreg.c 2023-10-21 23:23:49.667253541 -0400
@@ -1,4 +1,5 @@
#include <malloc.h>
+#include <string.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff -ur a/src/aamoureg.c b/src/aamoureg.c
--- a/src/aamoureg.c 2023-10-21 23:19:00.787725591 -0400
+++ b/src/aamoureg.c 2023-10-21 23:26:51.821477807 -0400
@@ -1,4 +1,5 @@
#include <malloc.h>
+#include <string.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff -ur a/src/aaregist.c b/src/aaregist.c
--- a/src/aaregist.c 2023-10-21 23:19:00.788130179 -0400
+++ b/src/aaregist.c 2023-10-21 23:19:38.929729034 -0400
@@ -1,4 +1,5 @@
#include <malloc.h>
+#include <string.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff -ur a/src/aasavefont.c b/src/aasavefont.c
--- a/src/aasavefont.c 2001-04-26 10:37:31.000000000 -0400
+++ b/src/aasavefont.c 2023-10-21 23:51:09.216521714 -0400
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+#include <stdio.h>
#include "aalib.h"
int main(int argc, char **argv)
{
diff -ur a/src/aatest.c b/src/aatest.c
--- a/src/aatest.c 2001-04-26 10:37:31.000000000 -0400
+++ b/src/aatest.c 2023-10-21 23:43:16.758422704 -0400
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+#include <string.h>
#include "aalib.h"
int main(int argc, char **argv)
{
6 changes: 3 additions & 3 deletions pkgs/development/libraries/aalib/darwin.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ index def65fe..f4f8efb 100644
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff --git a/src/aalib.c b/src/aalib.c
index 11fecc8..e3063b4 100644
--- a/src/aalib.c
Expand All @@ -40,9 +40,9 @@ index 0380828..bb55fe3 100644
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff --git a/src/aarec.c b/src/aarec.c
index 70f4ebc..ee43e8a 100644
--- a/src/aarec.c
Expand All @@ -61,9 +61,9 @@ index 54abec0..765155e 100644
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "aalib.h"
#include "aaint.h"
diff --git a/src/aax.c b/src/aax.c
index adcbd82..36e3294 100644
--- a/src/aax.c
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/libraries/aalib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" "info" ];
setOutputFlags = false; # Doesn't support all the flags

patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];
patches = [ ./clang.patch ] # Fix implicit `int` on `main` error with newer versions of clang
++ lib.optionals stdenv.isDarwin [ ./darwin.patch ];

# The fuloong2f is not supported by aalib still
preConfigure = ''
Expand Down