725336ee48
This PR adds an updated version to the r-rhtslib package as well as fix the build. - add patches to use compiler flags from R - add variables for bzip2 and xz dependencies - use the spack Makeconf file when building the in-tree htslib - make patchelf available to allow R to remove reference to temporary installation directory in htslib shared object - Add new version of r-rsamtools as the r-rsamtools and r-rhtlib packages are closely paired.
12 lines
434 B
Diff
12 lines
434 B
Diff
--- a/src/Makevars.common 2020-02-08 17:12:30.000000000 -0600
|
|
+++ b/src/Makevars.common 2020-02-08 20:34:49.573031195 -0600
|
|
@@ -3,7 +3,7 @@
|
|
INCLUDE_DIR=${R_PACKAGE_DIR}/include
|
|
USRLIB_DIR=${R_PACKAGE_DIR}/usrlib${R_ARCH}
|
|
|
|
-R_ETC_MAKECONF=${R_HOME}/etc${R_ARCH}/Makeconf
|
|
+R_ETC_MAKECONF=${R_HOME}/etc${R_ARCH}/Makeconf.spack
|
|
|
|
## Preprocessor options. Keep Rhtslib::pkgconfig() function (defined in
|
|
## R/zzz.R) in sync with this.
|