Browse code

Remove the Rhdf5lib paths from the linking step

In the past, when Rhdf5lib was included in the LinkingTo section of
the DESCRIPTION, we also had to manually specify the search paths for
the library in Makevars.in and Makevars.win. When the dependency on
Rhdf5lib was removed, these manual additions to the linker search
path were not removed. This did not fail for a long time since
these libraries were still available even though we didn't
explicitly depend on Rhdf5lib. Somehow an update to a different
dependency broke this and so this patch removes these paths
that are searching for a library that is no longer there (and
is not needed in the first place).

sherman5 authored on 15/10/2019 05:45:58
Showing 2 changed files

... ...
@@ -1,8 +1,5 @@
1
-RHDF5_LIBS=`echo 'Rhdf5lib::pkgconfig("PKG_CXX_LIBS")'|\
2
-    "${R_HOME}/bin/R" --vanilla --slave`
3
-
4 1
 PKG_CPPFLAGS = @GAPS_CPP_FLAGS@
5 2
 PKG_CXXFLAGS = @GAPS_CXX_FLAGS@
6
-PKG_LIBS = @GAPS_LIBS@ $(RHDF5_LIBS)
3
+PKG_LIBS = @GAPS_LIBS@
7 4
 OBJECTS = @GAPS_SOURCE_FILES@
8 5
 
... ...
@@ -1,6 +1,3 @@
1
-RHDF5_LIBS=$(shell echo 'Rhdf5lib::pkgconfig("PKG_CXX_LIBS")'|\
2
-    "${R_HOME}/bin/R" --vanilla --slave)
3
-
4 1
 PKG_CPPFLAGS = -DBOOST_MATH_PROMOTE_DOUBLE_POLICY=0 -D__GAPS_R_BUILD__ -Iinclude -DGAPS_DISABLE_CHECKPOINTS
5 2
 PKG_CXXFLAGS = -march=native
6 3
 PKG_LIBS =