Skip to content

Commit 51e8380

Browse files
committed
Migrate zlib to zlib-ng
1 parent 5ec6127 commit 51e8380

File tree

2 files changed

+129
-2
lines changed

2 files changed

+129
-2
lines changed

recipes/bwa-mem2/meta.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ source:
1111
- Makefile.patch # [ not aarch64 and not arm64 ]
1212
- safestr-makefile.patch # [ not aarch64 and not arm64 ]
1313
- sse2neon.patch # [ aarch64 or arm64 ]
14+
- zlib_to_zlib-ng.patch
1415

1516
build:
16-
number: 8
17+
number: 11
1718
run_exports:
1819
- {{ pin_subpackage("bwa-mem2", max_pin="x") }}
1920

@@ -25,7 +26,7 @@ requirements:
2526
- {{ compiler('cxx') }}
2627
- git
2728
host:
28-
- zlib
29+
- zlib-ng
2930

3031
test:
3132
commands:
Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
diff --git a/src/bntseq.cpp b/src/bntseq.cpp
2+
index 13aceb4..b1dca18 100644
3+
--- a/src/bntseq.cpp
4+
+++ b/src/bntseq.cpp
5+
@@ -31,7 +31,7 @@
6+
#include <stdio.h>
7+
#include <stdlib.h>
8+
#include <string.h>
9+
-#include <zlib.h>
10+
+#include <zlib-ng.h>
11+
#include <unistd.h>
12+
#include <errno.h>
13+
#include <limits.h>
14+
diff --git a/src/bntseq.h b/src/bntseq.h
15+
index b241a3a..a50fcb2 100644
16+
--- a/src/bntseq.h
17+
+++ b/src/bntseq.h
18+
@@ -31,7 +31,7 @@
19+
#include <assert.h>
20+
#include <stdint.h>
21+
#include <stdio.h>
22+
-#include <zlib.h>
23+
+#include <zlib-ng.h>
24+
25+
#ifndef BWA_UBYTE
26+
#define BWA_UBYTE
27+
diff --git a/src/bwa.cpp b/src/bwa.cpp
28+
index b764381..260fabb 100644
29+
--- a/src/bwa.cpp
30+
+++ b/src/bwa.cpp
31+
@@ -30,7 +30,7 @@ Authors: Vasimuddin Md <[email protected]>; Sanchit Misra <sanchit.misra@i
32+
33+
#include <string.h>
34+
#include <stdio.h>
35+
-#include <zlib.h>
36+
+#include <zlib-ng.h>
37+
#include <assert.h>
38+
#include "bntseq.h"
39+
#include "bwa.h"
40+
diff --git a/src/bwa.h b/src/bwa.h
41+
index 877f00c..97b2220 100644
42+
--- a/src/bwa.h
43+
+++ b/src/bwa.h
44+
@@ -32,7 +32,7 @@ Authors: Vasimuddin Md <[email protected]>; Sanchit Misra <sanchit.misra@i
45+
#define BWA_H_
46+
47+
#include <stdint.h>
48+
-#include <zlib.h>
49+
+#include <zlib-ng.h>
50+
#include "bntseq.h"
51+
#include "bwt.h"
52+
#include "macro.h"
53+
diff --git a/src/bwtindex.cpp b/src/bwtindex.cpp
54+
index 4a48b20..8d94050 100644
55+
--- a/src/bwtindex.cpp
56+
+++ b/src/bwtindex.cpp
57+
@@ -33,7 +33,7 @@
58+
#include <string.h>
59+
#include <unistd.h>
60+
#include <time.h>
61+
-#include <zlib.h>
62+
+#include <zlib-ng.h>
63+
#include "bntseq.h"
64+
#include "bwa.h"
65+
#include "bwt.h"
66+
diff --git a/src/fastmap.h b/src/fastmap.h
67+
index e94022f..c1ee9d5 100644
68+
--- a/src/fastmap.h
69+
+++ b/src/fastmap.h
70+
@@ -32,7 +32,7 @@ Authors: Vasimuddin Md <[email protected]>; Sanchit Misra <sanchit.misra@i
71+
#define FASTMAP_HPP
72+
73+
#include <ctype.h>
74+
-#include <zlib.h>
75+
+#include <zlib-ng.h>
76+
#include <stdio.h>
77+
#include <unistd.h>
78+
#include <stdlib.h>
79+
diff --git a/src/ksw.cpp b/src/ksw.cpp
80+
index 4b93b8a..03397bd 100644
81+
--- a/src/ksw.cpp
82+
+++ b/src/ksw.cpp
83+
@@ -684,7 +684,7 @@ int ksw_global(int qlen, const uint8_t *query, int tlen, const uint8_t *target,
84+
85+
#include <unistd.h>
86+
#include <stdio.h>
87+
-#include <zlib.h>
88+
+#include <zlib-ng.h>
89+
#include "kseq.h"
90+
KSEQ_INIT(gzFile, err_gzread)
91+
92+
diff --git a/src/utils.cpp b/src/utils.cpp
93+
index d90d4f7..54c2940 100644
94+
--- a/src/utils.cpp
95+
+++ b/src/utils.cpp
96+
@@ -30,7 +30,7 @@
97+
#include <stdarg.h>
98+
#include <stdlib.h>
99+
#include <string.h>
100+
-#include <zlib.h>
101+
+#include <zlib-ng.h>
102+
#include <errno.h>
103+
#ifdef FSYNC_ON_FLUSH
104+
#include <sys/types.h>
105+
@@ -77,7 +77,7 @@ gzFile err_xzopen_core(const char *func, const char *fn, const char *mode)
106+
gzFile fp;
107+
if (strcmp(fn, "-") == 0) {
108+
fp = gzdopen(fileno((strstr(mode, "r"))? stdin : stdout), mode);
109+
- /* According to zlib.h, this is the only reason gzdopen can fail */
110+
+ /* According to zlib-ng.h, this is the only reason gzdopen can fail */
111+
if (!fp) err_fatal(func, "Out of memory");
112+
return fp;
113+
}
114+
diff --git a/src/utils.h b/src/utils.h
115+
index d26209d..55049d5 100644
116+
--- a/src/utils.h
117+
+++ b/src/utils.h
118+
@@ -30,7 +30,7 @@
119+
120+
#include <stdint.h>
121+
#include <stdio.h>
122+
-#include <zlib.h>
123+
+#include <zlib-ng.h>
124+
125+
#ifdef __GNUC__
126+
// Tell GCC to validate printf format string and args

0 commit comments

Comments
 (0)