| 1 |
jlec 11/05/06 08:42:26 |
| 2 |
|
| 3 |
Added: 0.2.5-zlib.patch 0.2.5-ldflags.patch |
| 4 |
Log: |
| 5 |
Resepct LDFLAGS, do not link static, unbundle zlib, #298094, #337658, #366197 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha31/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-biology/maqview/files/0.2.5-zlib.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/maqview/files/0.2.5-zlib.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/maqview/files/0.2.5-zlib.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 0.2.5-zlib.patch |
| 16 |
=================================================================== |
| 17 |
Makefile.am | 6 +++--- |
| 18 |
zrio.c | 2 +- |
| 19 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/Makefile.am b/Makefile.am |
| 22 |
index dad515a..9617eb7 100644 |
| 23 |
--- a/Makefile.am |
| 24 |
+++ b/Makefile.am |
| 25 |
@@ -1,8 +1,8 @@ |
| 26 |
bin_PROGRAMS = zrio maqindex maqview maqindex_socks |
| 27 |
-zlib_src = adler32.c compress.c crc32.c deflate.c gzio.c inffast.c inflate.c \ |
| 28 |
- infback.c inftrees.c trees.c uncompr.c zutil.c |
| 29 |
-generic_src = btree.c maqmap_index.c zrio.c stdhashc.h stdhashc.cc cns_cache.c const.c $(zlib_src) |
| 30 |
+generic_src = btree.c maqmap_index.c zrio.c stdhashc.h stdhashc.cc cns_cache.c const.c |
| 31 |
+LIBS = -lz |
| 32 |
zrio_SOURCES = zrio_main.c $(generic_src) |
| 33 |
+zrio_LDADD = -lz |
| 34 |
maqindex_SOURCES = maqmap_index_main.c $(generic_src) |
| 35 |
maqview_SOURCES = read_cache.c view_goto.c view_panel.c gl_gui.c MainFrame.c \ |
| 36 |
$(generic_src) |
| 37 |
diff --git a/zrio.c b/zrio.c |
| 38 |
index ffed00a..fe744df 100644 |
| 39 |
--- a/zrio.c |
| 40 |
+++ b/zrio.c |
| 41 |
@@ -506,7 +506,7 @@ int build_index(int in, int64_t span, struct access **built, void (*notify)(void |
| 42 |
totin += strm.avail_in; |
| 43 |
totout += strm.avail_out; |
| 44 |
tmp = strm.avail_out; |
| 45 |
- ret = inflate_zr(&strm, Z_BLOCK); /* return at end of block */ |
| 46 |
+ ret = inflate(&strm, Z_BLOCK); /* return at end of block */ |
| 47 |
totin -= strm.avail_in; |
| 48 |
totout -= strm.avail_out; |
| 49 |
if(notify) notify(obj, window + WINSIZE - tmp, tmp - strm.avail_out, totout); |
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
1.1 sci-biology/maqview/files/0.2.5-ldflags.patch |
| 54 |
|
| 55 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/maqview/files/0.2.5-ldflags.patch?rev=1.1&view=markup |
| 56 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/maqview/files/0.2.5-ldflags.patch?rev=1.1&content-type=text/plain |
| 57 |
|
| 58 |
Index: 0.2.5-ldflags.patch |
| 59 |
=================================================================== |
| 60 |
configure.ac | 18 +++--------------- |
| 61 |
1 files changed, 3 insertions(+), 15 deletions(-) |
| 62 |
|
| 63 |
diff --git a/configure.ac b/configure.ac |
| 64 |
index 90e612b..5a00d15 100644 |
| 65 |
--- a/configure.ac |
| 66 |
+++ b/configure.ac |
| 67 |
@@ -9,17 +9,10 @@ AC_PROG_INSTALL |
| 68 |
AC_STDC_HEADERS |
| 69 |
|
| 70 |
is_static=0 |
| 71 |
-case ${prefix} in |
| 72 |
- NONE);; |
| 73 |
- *) is_static=1 |
| 74 |
- AC_MSG_WARN([Library libglut will be statically linked.]) |
| 75 |
- LDFLAGS="-L${prefix}/lib" |
| 76 |
- CPPFLAGS="-I${prefix}/include";; |
| 77 |
-esac |
| 78 |
|
| 79 |
# set CFLAGS and LDFLAGS |
| 80 |
|
| 81 |
-true_CFLAGS="-g -O2 -Wall -W -DMAQ_LONGREADS" |
| 82 |
+true_CFLAGS="-DMAQ_LONGREADS" |
| 83 |
case "${host_os}" in |
| 84 |
darwin*) |
| 85 |
GLLIBS="-framework OpenGL -framework GLUT" |
| 86 |
@@ -30,17 +23,12 @@ case "${host_os}" in |
| 87 |
i?86) CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64";; |
| 88 |
esac |
| 89 |
AC_CHECK_LIB([glut], [glutMouseWheelFunc], [CPPFLAGS="$CPPFLAGS -DHAVE_FREEGLUT"]) |
| 90 |
- AC_ARG_ENABLE(static, [ --enable-static statically link GLUT (Linux Only)], |
| 91 |
- [is_static=1]) |
| 92 |
- case $is_static in |
| 93 |
- 1) GLLIBS="-Wl,-Bstatic -lglut -Wl,-Bdynamic -lGL -lGLU -lm";; |
| 94 |
- 0) GLLIBS="-lGL -lglut -lm";; |
| 95 |
- esac |
| 96 |
+ GLLIBS="-lGL -lglut -lm -lGLU" |
| 97 |
AC_SUBST([GLLIBS]);; |
| 98 |
# *) AC_MSG_ERROR([OS is not supported]);; |
| 99 |
esac |
| 100 |
AM_CONDITIONAL([HAVE_GL], [test "$isgl" = 1]) |
| 101 |
-CFLAGS=$true_CFLAGS |
| 102 |
+CFLAGS="${CFLAGS} $true_CFLAGS" |
| 103 |
|
| 104 |
AC_CONFIG_FILES([Makefile]) |
| 105 |
AC_OUTPUT |
Archives