From bd307a2b050257d418b027669af352cf455b2658 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Tue, 3 Sep 2024 06:52:29 -0500 Subject: [PATCH] Try master branch again --- configure | 5 +++-- src/Makevars.in | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ce68592..a925e37 100755 --- a/configure +++ b/configure @@ -83,14 +83,15 @@ download() { ## respects enviroment variable so 'blpHeaders="/opt/blp/blpHeaders_1.2.3.tar.gz" ./configure' works : ${blpHeaders="blpHeaders.tar.gz"} : ${blpLibrary="blpLibrary.tar.gz"} -#: ${blpBranch="master"} -: ${blpBranch="feature/release_3.24.6.1"} +: ${blpBranch="master"} +#: ${blpBranch="feature/release_3.24.6.1"} ## Check for header files and download if needed, this looks at repo blp in directory headers/ cwd=$(pwd) mkdir -p blp/${platform} cd blp/${platform} if [ ! -f ${blpHeaders} ]; then + echo "** Fetching https://github.com/Rblp/blp/raw/${blpBranch}/headers/${platform}/blpHeaders.tar.gz" download https://github.com/Rblp/blp/raw/${blpBranch}/headers/${platform}/blpHeaders.tar.gz else echo "** using ${blpHeaders}" diff --git a/src/Makevars.in b/src/Makevars.in index 5a67af6..70ee9f2 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -33,6 +33,5 @@ all: $(SHLIB) if command -v install_name_tool; then \ echo "fixing"; \ install_name_tool -add_rpath @loader_path/../blp Rblpapi.so; \ - install_name_tool -add_rpath @loader_path/../inst/blp Rblpapi.so; \ otool -L Rblpapi.so; \ fi