Skip to content

Commit c319254

Browse files
nicolasnoblenicolasnoble
committed
Adding zlib patch for binutils on macos...
1 parent d56b30e commit c319254

File tree

3 files changed

+144
-0
lines changed

3 files changed

+144
-0
lines changed

‎tools/macos-mips/mipsel-none-elf-binutils.rb‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ class MipselNoneElfBinutils < Formula
77

88
depends_on "texinfo" => :build
99

10+
patch :DATA
11+
1012
def install
1113
system "./configure", "--target=mipsel-none-elf",
1214
"--disable-multilib",
@@ -20,3 +22,47 @@ def install
2022
assert_match "f()", shell_output("#{bin}/mipsel-none-elf-c++filt _Z1fv")
2123
end
2224
end
25+
26+
__END__
27+
diff --git a/zlib/zutil.h b/zlib/zutil.h
28+
index 0bd2dbcba..bb513cb4b 100644
29+
--- a/zlib/zutil.h
30+
+++ b/zlib/zutil.h
31+
@@ -137,17 +137,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
32+
# endif
33+
#endif
34+
35+
-#if defined(MACOS) || defined(TARGET_OS_MAC)
36+
+#if defined(MACOS)
37+
# define OS_CODE 7
38+
-# ifndef Z_SOLO
39+
-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
40+
-# include <unix.h> /* for fdopen */
41+
-# else
42+
-# ifndef fdopen
43+
-# define fdopen(fd,mode) NULL /* No fdopen() */
44+
-# endif
45+
-# endif
46+
-# endif
47+
#endif
48+
49+
#ifdef __acorn
50+
@@ -170,18 +161,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
51+
# define OS_CODE 19
52+
#endif
53+
54+
-#if defined(_BEOS_) || defined(RISCOS)
55+
-# define fdopen(fd,mode) NULL /* No fdopen() */
56+
-#endif
57+
-
58+
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
59+
-# if defined(_WIN32_WCE)
60+
-# define fdopen(fd,mode) NULL /* No fdopen() */
61+
-# else
62+
-# define fdopen(fd,type) _fdopen(fd,type)
63+
-# endif
64+
-#endif
65+
-
66+
#if defined(__BORLANDC__) && !defined(MSDOS)
67+
#pragma warn -8004
68+
#pragma warn -8008

‎tools/macos-mips/zlib.patch‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
From 4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9 Mon Sep 17 00:00:00 2001
2+
From: Mark Adler <[email protected]>
3+
Date: Tue, 12 Dec 2023 22:19:05 -0600
4+
Subject: [PATCH] Remove fdopen #defines in zutil.h.
5+
6+
fdopen() is not used by zlib anymore. The #defines are vestigial.
7+
---
8+
zutil.h | 23 +----------------------
9+
1 file changed, 1 insertion(+), 22 deletions(-)
10+
11+
diff --git a/zutil.h b/zutil.h
12+
index 0bd2dbcba..bb513cb4b 100644
13+
--- a/zutil.h
14+
+++ b/zutil.h
15+
@@ -137,17 +137,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
16+
# endif
17+
#endif
18+
19+
-#if defined(MACOS) || defined(TARGET_OS_MAC)
20+
+#if defined(MACOS)
21+
# define OS_CODE 7
22+
-# ifndef Z_SOLO
23+
-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
24+
-# include <unix.h> /* for fdopen */
25+
-# else
26+
-# ifndef fdopen
27+
-# define fdopen(fd,mode) NULL /* No fdopen() */
28+
-# endif
29+
-# endif
30+
-# endif
31+
#endif
32+
33+
#ifdef __acorn
34+
@@ -170,18 +161,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
35+
# define OS_CODE 19
36+
#endif
37+
38+
-#if defined(_BEOS_) || defined(RISCOS)
39+
-# define fdopen(fd,mode) NULL /* No fdopen() */
40+
-#endif
41+
-
42+
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
43+
-# if defined(_WIN32_WCE)
44+
-# define fdopen(fd,mode) NULL /* No fdopen() */
45+
-# else
46+
-# define fdopen(fd,type) _fdopen(fd,type)
47+
-# endif
48+
-#endif
49+
-
50+
#if defined(__BORLANDC__) && !defined(MSDOS)
51+
#pragma warn -8004
52+
#pragma warn -8008

‎tools/vscode-extension/scripts/mipsel-none-elf-binutils.rb‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ class MipselNoneElfBinutils < Formula
77

88
depends_on "texinfo" => :build
99

10+
patch :DATA
11+
1012
def install
1113
system "./configure", "--target=mipsel-none-elf",
1214
"--disable-multilib",
@@ -20,3 +22,47 @@ def install
2022
assert_match "f()", shell_output("#{bin}/mipsel-none-elf-c++filt _Z1fv")
2123
end
2224
end
25+
26+
__END__
27+
diff --git a/zlib/zutil.h b/zlib/zutil.h
28+
index 0bd2dbcba..bb513cb4b 100644
29+
--- a/zlib/zutil.h
30+
+++ b/zlib/zutil.h
31+
@@ -137,17 +137,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
32+
# endif
33+
#endif
34+
35+
-#if defined(MACOS) || defined(TARGET_OS_MAC)
36+
+#if defined(MACOS)
37+
# define OS_CODE 7
38+
-# ifndef Z_SOLO
39+
-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
40+
-# include <unix.h> /* for fdopen */
41+
-# else
42+
-# ifndef fdopen
43+
-# define fdopen(fd,mode) NULL /* No fdopen() */
44+
-# endif
45+
-# endif
46+
-# endif
47+
#endif
48+
49+
#ifdef __acorn
50+
@@ -170,18 +161,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
51+
# define OS_CODE 19
52+
#endif
53+
54+
-#if defined(_BEOS_) || defined(RISCOS)
55+
-# define fdopen(fd,mode) NULL /* No fdopen() */
56+
-#endif
57+
-
58+
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
59+
-# if defined(_WIN32_WCE)
60+
-# define fdopen(fd,mode) NULL /* No fdopen() */
61+
-# else
62+
-# define fdopen(fd,type) _fdopen(fd,type)
63+
-# endif
64+
-#endif
65+
-
66+
#if defined(__BORLANDC__) && !defined(MSDOS)
67+
#pragma warn -8004
68+
#pragma warn -8008

0 commit comments

Comments
 (0)