add flag that fixes R wrapper function on linux

biopragmatics · Feb 12, 2024 · ebfd551 · ebfd551
1 parent 42bc38b
commit ebfd551
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/r/DESCRIPTION b/r/DESCRIPTION
@@ -14,7 +14,7 @@ SystemRequirements: Rust tool chain w/ cargo, libclang/llvm-config
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Suggests:
     rmarkdown,
     testthat

diff --git a/r/man/curiesr-package.Rd b/r/man/curiesr-package.Rd
diff --git a/r/src/Makevars b/r/src/Makevars
@@ -1,7 +1,7 @@
 TARGET_DIR = ./rust/target
 LIBDIR = $(TARGET_DIR)/release
 STATLIB = $(LIBDIR)/libcuriesr.a
-PKG_LIBS = -L$(LIBDIR) -lcuriesr
+PKG_LIBS = -L$(LIBDIR) -lcuriesr -lssl
 
 all: C_clean
 

diff --git a/r/src/Makevars.win b/r/src/Makevars.win
@@ -3,7 +3,7 @@ TARGET = $(subst 64,x86_64,$(subst 32,i686,$(WIN)))-pc-windows-gnu
 TARGET_DIR = ./rust/target
 LIBDIR = $(TARGET_DIR)/$(TARGET)/release
 STATLIB = $(LIBDIR)/libcuriesr.a
-PKG_LIBS = -L$(LIBDIR) -lcuriesr -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll
+PKG_LIBS = -L$(LIBDIR) -lcuriesr -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll -lCrypt32 -lSecur32
 
 all: C_clean
 

diff --git a/r/src/rust/Cargo.toml b/r/src/rust/Cargo.toml
@@ -10,6 +10,7 @@ crate-type = [ 'staticlib' ]
 name = 'curiesr'
 
 [dependencies]
-extendr-api = '*'
+# extendr-api = '*'
+extendr-api = '0.6.0'
 curies = { version = "0.1.1", path = "../../../lib" }
 tokio = { version = "1.34", features = ["rt-multi-thread"] }
diff --git a/r/src/rust/src/lib.rs b/r/src/rust/src/lib.rs
@@ -1,6 +1,3 @@
-use std::collections::HashSet;
-
-use curies::Record;
 use extendr_api::prelude::*;
 
 use ::curies::{sources::get_bioregistry_converter, Converter};