Browse code

cleanup CFLAGS and LIBS for libnetcdf

Steffen Neumann authored on 18/12/2016 21:34:55
Showing 2 changed files

... ...
@@ -9,3 +9,29 @@ The devel branch is tested on multiple architectures by the BioC build farm:
9 9
 
10 10
 http://bioconductor.org/checkResults/devel/bioc-LATEST/mzR/
11 11
 
12
+# Supported compilers
13
+
14
+We are not shipping the full set of boost headers due to 
15
+size restrictions. This *might* cause compilation failure 
16
+due to missing files. We have tested several OS and compiler 
17
+build environments successfully, please report any compilation failures
18
+at https://github.com/sneumann/mzR/issues
19
+and we'll add the missing files. 
20
+
21
+mzR-2.9.1 with boost-1.59.0 has been tested on the following compilers:
22
+
23
+On the BioC build farm (http://bioconductor.org/checkResults/devel/bioc-LATEST/mzR/)
24
+* malbec2 (Ubuntu 16.04.1, gcc-5.4.0)
25
+* tokay2 (Windows Server 2012 R2, MinGW-W64-4.9.3)
26
+* Failling oaxaca (Apple clang 3.5svn / 600.0.57)
27
+
28
+Also on:
29
+* Debian stretch/sid (gcc-5.4.0)
30
+* Ubuntu 16.04 (clang 3.8.0)
31
+* Ubuntu 16.04 (gcc-5.4.0)
32
+* Ubuntu 14.04 (gcc-4.8.2)
33
+* Ubuntu 12.04 (gcc-4.6.3)
34
+
35
+
36
+
37
+
... ...
@@ -111,6 +111,7 @@ ARCH_OBJS=./boost/libs/thread/src/pthread/once.o \
111 111
 endif
112 112
 
113 113
 NC_CFLAGS=`nc-config --cflags || /bin/true`
114
+NC_LIBS=`nc-config --libs || echo " -lnetcdf "`
114 115
 
115 116
 MZROBJECTS=cramp.o ramp_base64.o ramp.o RcppRamp.o RcppRampModule.o rnetCDF.o RcppPwiz.o RcppPwizModule.o RcppIdent.o RcppIdentModule.o
116 117
 
... ...
@@ -124,21 +125,13 @@ OBJECTS= $(MZROBJECTS) $(PWIZOBJECTS) $(ARCH_OBJS) rampR.o R_init_mzR.o
124 125
 ##  http://www.gamedev.net/topic/555511-is-there-a-way-to-only-disable-boost-debug-checks/
125 126
 ##
126 127
 
128
+PWIZ_CPPFLAGS=-I./boost_aux/ -I./boost/ -I. -D_LARGEFILE_SOURCE -DHAVE_PWIZ_MZML_LIB -D_NODEBUG -DWITHOUT_MZ5  
127 129
 PWIZ_LDFLAGS=-lpthread 
128 130
 
129
-## Unix:
130
-
131
-#PWIZ_CPPFLAGS=-I./boost_aux/ -I./boost -I. -DHAVE_PWIZ_MZML_LIB -D_NODEBUG -DWITHOUT_MZ5  $(DEPFLAGS)
132
-
133
-
134
-PWIZ_CPPFLAGS=-I./boost_aux/ -I./boost/ -I. -DHAVE_PWIZ_MZML_LIB -D_NODEBUG -DWITHOUT_MZ5  
135
-
136
-
137 131
 ## Use the R_HOME indirection to support installations of multiple R version
138
-PKG_CPPFLAGS=-D_LARGEFILE_SOURCE $(PWIZ_CPPFLAGS) $(NC_CFLAGS)  $(ARCH_CPPFLAGS)
132
+PKG_CPPFLAGS=$(PWIZ_CPPFLAGS) $(NC_CFLAGS)  $(ARCH_CPPFLAGS)
139 133
 
140
-#PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ` $(PWIZ_LDFLAGS) `nc-config --libs || echo "-lnetcdf"` 
141
-PKG_LIBS=-lnetcdf $(ARCH_LIBS)
134
+PKG_LIBS=$(NC_LIBS)  $(ARCH_LIBS) 
142 135
 
143 136
 all: clean $(SHLIB)
144 137