1 Author: Simon Ruderich <simon@ruderich.org>
2 Date: Sat, 28 Apr 2012 19:09:02 UTC
3 Description: Fix build system to enable hardening flags
6 ===================================================================
7 --- tabix.orig/Makefile 2012-12-21 16:51:42.000000000 -0800
8 +++ tabix/Makefile 2012-12-21 16:54:56.446027398 -0800
12 +# Use flags when CFLAGS is not already defined in the environment.
13 +CFLAGS?= -g -Wall -O2
14 DFLAGS= -D_FILE_OFFSET_BITS=64 -D_USE_KNETFILE -DBGZF_CACHE
15 LOBJS= bgzf.lo kstring.lo knetfile.lo index.lo bedidx.lo
21 - $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) -c $(CFLAGS) $(DFLAGS) $(INCLUDES) $<
22 + $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DFLAGS) $(INCLUDES) $<
24 all:$(PROG) $(LIBNAME)
27 - $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) -version-info $(LIBVERSION) -rpath /usr/lib $(LOBJS) -o $@ -lc -lz
28 + $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -version-info $(LIBVERSION) -rpath /usr/lib $(LOBJS) -o $@ -lc -lz
30 tabix:$(AOBJS) $(LIBNAME)
31 - $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) -o $@ $(AOBJS) $(LIBNAME) -lm -lz
32 + $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(AOBJS) $(LIBNAME) -lm -lz
35 - $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) -o $@ $(BOBJS) $(LIBNAME) -lz
36 + $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BOBJS) $(LIBNAME) -lz
38 TabixReader.class:TabixReader.java
39 javac -cp .:sam.jar TabixReader.java