[med-svn] [plink1.9] 02/02: Refresh patch
Dylan Aïssi
bob.dybian-guest at moszumanska.debian.org
Mon Mar 20 22:31:48 UTC 2017
This is an automated email from the git hooks/post-receive script.
bob.dybian-guest pushed a commit to branch master
in repository plink1.9.
commit fad25bdc0480391016bed72676b4dde33ec5ebd9
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date: Mon Mar 20 23:15:42 2017 +0100
Refresh patch
---
debian/patches/01.Makefile_config.patch | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/debian/patches/01.Makefile_config.patch b/debian/patches/01.Makefile_config.patch
index 960d3ce..a39b30a 100644
--- a/debian/patches/01.Makefile_config.patch
+++ b/debian/patches/01.Makefile_config.patch
@@ -22,7 +22,7 @@ Forwarded: No
-CFLAGS=-Wall -O2
-BLASFLAGS=-L/usr/lib64/atlas -llapack -lcblas -latlas
-LINKFLAGS=-lm -lpthread -ldl
--ZLIB=zlib-1.2.11/libz.so.1.2.11
+-ZLIB=../zlib-1.2.11/libz.so.1.2.11
+CFLAGS+=-Wall -O2
+CXXFLAGS+=-Wall -O2
+LINKFLAGS=-lm -lpthread -ldl $(LDFLAGS)
@@ -32,7 +32,7 @@ Forwarded: No
+ CFLAGS+=-DDYNAMIC_ZLIB
+else
+ BLASFLAGS=-L/usr/lib64/atlas -llapack -lcblas -latlas
-+ ZLIB=-L. zlib-1.2.11/libz.so.1.2.11
++ ZLIB=-L. ../zlib-1.2.11/libz.so.1.2.11
+endif
ifeq ($(SYS), MAC)
@@ -41,8 +41,8 @@ Forwarded: No
endif
BLASFLAGS=-framework Accelerate
LINKFLAGS=-ldl
-- ZLIB=zlib-1.2.11/libz.1.2.11.dylib
-+ ZLIB=-L. zlib-1.2.11/libz.1.2.11.dylib
+- ZLIB=../zlib-1.2.11/libz.1.2.11.dylib
++ ZLIB=-L. ../zlib-1.2.11/libz.1.2.11.dylib
endif
ifeq ($(SYS), WIN)
@@ -50,13 +50,13 @@ Forwarded: No
# NO_LAPACK.
BLASFLAGS=-L. lapack/liblapack.a -L. lapack/librefblas.a
LINKFLAGS=-lm -static-libgcc
-- ZLIB=zlib-1.2.11/libz.a
-+ ZLIB=-L. zlib-1.2.11/libz.a
+- ZLIB=../zlib-1.2.11/libz.a
++ ZLIB=-L. ../zlib-1.2.11/libz.a
endif
ifdef NO_LAPACK
-@@ -62,10 +72,10 @@
- # lead to minor problems when PLINK 2.0 is released.)
+@@ -60,10 +70,10 @@
+ # renaming that binary to "plink107", and this one to "plink1".
plink: $(OBJS)
- g++ $^ $(LINKFLAGS_EXTRA) $(BLASFLAGS) $(LINKFLAGS) -L. $(ZLIB) -o $@
@@ -68,7 +68,7 @@ Forwarded: No
clean:
rm -f $(OBJS) plink plinkw
-@@ -75,7 +85,7 @@
+@@ -73,7 +83,7 @@
# GNU make's built-in rules, except we explicitly use "g++" instead of $(CC).
%.o: %.c
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/plink1.9.git
More information about the debian-med-commit
mailing list