blob: 772d27ebd09366793f25fd3f6d475df38e77a342 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
diff '--color=auto' -ur shapeit4-4.2.2/makefile shapeit4-4.2.2-1/makefile
--- shapeit4-4.2.2/makefile 2021-09-07 13:08:23.000000000 +0100
+++ shapeit4-4.2.2-1/makefile 2022-05-23 10:02:02.950631934 +0100
@@ -2,22 +2,13 @@
CXX=g++ -std=c++11
#HTSLIB LIBRARY [SPECIFY YOUR OWN PATHS]
-HTSLIB_INC=$(HOME)/Tools/htslib-1.11
-HTSLIB_LIB=$(HOME)/Tools/htslib-1.11/libhts.a
+HTSLIB_INC=/usr/include/htslib
+HTSLIB_LIB=/usr/lib/libhts.a
#BOOST IOSTREAM & PROGRAM_OPTION LIBRARIES [SPECIFY YOUR OWN PATHS]
-BOOST_INC=/usr/include
-BOOST_LIB_IO=/usr/lib/x86_64-linux-gnu/libboost_iostreams.a
-BOOST_LIB_PO=/usr/lib/x86_64-linux-gnu/libboost_program_options.a
-
-#HTSLIB LIBRARY [SPECIFY YOUR OWN PATHS]
-#HTSLIB_INC=/software/UHTS/Analysis/samtools/1.4/include
-#HTSLIB_LIB=/software/UHTS/Analysis/samtools/1.4/lib64/libhts.a
-
-#BOOST IOSTREAM & PROGRAM_OPTION LIBRARIES [SPECIFY YOUR OWN PATHS]
-#BOOST_INC=/software/include
-#BOOST_LIB_IO=/software/lib64/libboost_iostreams.a
-#BOOST_LIB_PO=/software/lib64/libboost_program_options.a
+BOOST_INC=/usr/include/boost
+BOOST_LIB_IO=/usr/lib/libboost_iostreams.a
+BOOST_LIB_PO=/usr/lib/libboost_program_options.a
#COMPILER & LINKER FLAGS
@@ -32,9 +23,8 @@
LDFLAG=-O3
-
#DYNAMIC LIBRARIES
-DYN_LIBS=-lz -lbz2 -lm -lpthread -llzma -lcurl -lssl -lcrypto
+DYN_LIBS=-lz -lbz2 -lm -lpthread -llzma -lcurl -lssl -lcrypto -ldl
#SHAPEIT SOURCES & BINARY
BFILE=bin/shapeit4.2
Binary files shapeit4-4.2.2/tools/bingraphsample/bin/bingraphsample and shapeit4-4.2.2-1/tools/bingraphsample/bin/bingraphsample differ
diff '--color=auto' -ur shapeit4-4.2.2/tools/bingraphsample/makefile shapeit4-4.2.2-1/tools/bingraphsample/makefile
--- shapeit4-4.2.2/tools/bingraphsample/makefile 2021-09-07 13:08:23.000000000 +0100
+++ shapeit4-4.2.2-1/tools/bingraphsample/makefile 2022-05-23 10:08:28.457309881 +0100
@@ -2,22 +2,13 @@
CXX=g++ -std=c++11
#HTSLIB LIBRARY [SPECIFY YOUR OWN PATHS]
-HTSLIB_INC=$(HOME)/Tools/htslib-1.9
-HTSLIB_LIB=$(HOME)/Tools/htslib-1.9/libhts.a
+HTSLIB_INC=/usr/include/htslib
+HTSLIB_LIB=/usr/lib/libhts.a
#BOOST IOSTREAM & PROGRAM_OPTION LIBRARIES [SPECIFY YOUR OWN PATHS]
-BOOST_INC=/usr/include
-BOOST_LIB_IO=/usr/lib/x86_64-linux-gnu/libboost_iostreams.a
-BOOST_LIB_PO=/usr/lib/x86_64-linux-gnu/libboost_program_options.a
-
-#HTSLIB LIBRARY [SPECIFY YOUR OWN PATHS]
-#HTSLIB_INC=/software/UHTS/Analysis/samtools/1.4/include
-#HTSLIB_LIB=/software/UHTS/Analysis/samtools/1.4/lib64/libhts.a
-
-#BOOST IOSTREAM & PROGRAM_OPTION LIBRARIES [SPECIFY YOUR OWN PATHS]
-#BOOST_INC=/software/include
-#BOOST_LIB_IO=/software/lib64/libboost_iostreams.a
-#BOOST_LIB_PO=/software/lib64/libboost_program_options.a
+BOOST_INC=/usr/include/boost
+BOOST_LIB_IO=/usr/lib/libboost_iostreams.a
+BOOST_LIB_PO=/usr/lib/libboost_program_options.a
#COMPILER & LINKER FLAGS
#Best performance is achieved with this. Use it if running on the same plateform you're compiling, it's definitely worth it!
@@ -29,7 +20,7 @@
LDFLAG=-O3
#DYNAMIC LIBRARIES
-DYN_LIBS=-lz -lbz2 -lm -lpthread -llzma
+DYN_LIBS=-lz -lbz2 -lm -lpthread -llzma -ldl
#SHAPEIT SOURCES & BINARY
BFILE=bin/bingraphsample
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/genotype_managment.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/genotype_managment.o differ
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/genotype_set.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/genotype_set.o differ
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/genotype_sweep.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/genotype_sweep.o differ
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/graph_reader.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/graph_reader.o differ
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/haplotype_writer.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/haplotype_writer.o differ
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/main.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/main.o differ
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/sampler_finalise.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/sampler_finalise.o differ
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/sampler_initialise.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/sampler_initialise.o differ
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/sampler_management.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/sampler_management.o differ
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/sampler_parameters.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/sampler_parameters.o differ
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/variant_map.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/variant_map.o differ
Binary files shapeit4-4.2.2/tools/bingraphsample/obj/variant.o and shapeit4-4.2.2-1/tools/bingraphsample/obj/variant.o differ
|