1 |
jlec 10/11/26 13:57:27 |
2 |
|
3 |
Added: 1.07-flags.patch |
4 |
Log: |
5 |
Fixes for #335975, respecting LDFLAGS/CXXFLAGS, supporting lapack, making R support optional |
6 |
|
7 |
(Portage version: 2.2.0_alpha5/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-biology/plink/files/1.07-flags.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/files/1.07-flags.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/files/1.07-flags.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: 1.07-flags.patch |
16 |
=================================================================== |
17 |
diff --git a/Makefile b/Makefile |
18 |
index 172c795..466f09f 100644 |
19 |
--- a/Makefile |
20 |
+++ b/Makefile |
21 |
@@ -26,25 +26,25 @@ WITH_R_PLUGINS = 1 |
22 |
WITH_WEBCHECK = 1 |
23 |
FORCE_32BIT = |
24 |
WITH_ZLIB = 1 |
25 |
-WITH_LAPACK = |
26 |
-FORCE_DYNAMIC = |
27 |
+WITH_LAPACK = 1 |
28 |
+FORCE_DYNAMIC = 1 |
29 |
|
30 |
# Put C++ compiler here; Windows has it's own specific version |
31 |
CXX_UNIX = g++ |
32 |
CXX_WIN = c:\bin\mingw\bin\mingw32-g++.exe |
33 |
|
34 |
# Any other compiler flags here ( -Wall, -g, etc) |
35 |
-CXXFLAGS = |
36 |
+CXXFLAGS ?= -O2 |
37 |
|
38 |
# Misc |
39 |
-LIB_LAPACK = /usr/lib/liblapack.so.3 |
40 |
+LIB_LAPACK = `pkg-config --libs lapack` |
41 |
|
42 |
|
43 |
# -------------------------------------------------------------------- |
44 |
# Do not edit below this line |
45 |
# -------------------------------------------------------------------- |
46 |
|
47 |
-CXXFLAGS += -O3 -I. |
48 |
+CXXFLAGS += -I. |
49 |
OUTPUT = plink |
50 |
|
51 |
# Some system specific flags |
52 |
@@ -151,7 +151,7 @@ OBJ = $(SRC:.cpp=.o) |
53 |
all : $(OUTPUT) |
54 |
|
55 |
$(OUTPUT) : |
56 |
- $(CXX) $(CXXFLAGS) -o $(OUTPUT) $(OBJ) $(LIB) |
57 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) -o $(OUTPUT) $(OBJ) $(LIB) |
58 |
|
59 |
$(OBJ) : $(HDR) |