r-rmariadb: remove no longer needed patch (#24171)

Since PR #22873 was merged, the configure patch for r-rmariadb is no
longer needed. Also added comment regarding configure arguments.
This commit is contained in:
Glenn Johnson 2021-06-07 10:08:43 -05:00 committed by GitHub
parent 1fed008410
commit c01730e33b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 15 deletions

View File

@ -1,13 +0,0 @@
diff --git a/configure b/configure
index 6c0f43c..bd7f627 100755
--- a/configure
+++ b/configure
@@ -29,7 +29,7 @@ fi
if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then
echo "Found INCLUDE_DIR and/or LIB_DIR!"
PKG_CFLAGS="-I$INCLUDE_DIR $PKG_CFLAGS"
- PKG_LIBS="-L$LIB_DIR $PKG_LIBS"
+ PKG_LIBS="-L$LIB_DIR -Wl,-rpath,$LIB_DIR $PKG_LIBS"
elif [ "$PKGCONFIG_CFLAGS" ] || [ "$PKGCONFIG_LIBS" ]; then
echo "Found mysql_config/mariadb_config cflags and libs!"
PKG_CFLAGS=${PKGCONFIG_CFLAGS}

View File

@ -30,8 +30,8 @@ class RRmariadb(RPackage):
depends_on('r-plogr', type=('build', 'run'))
depends_on('mariadb-client')
patch('configure_add_rpath.patch')
# Set the library explicitly to prevent configure from finding a system
# mysql-client
def configure_vars(self):
lib_dir = self.spec['mariadb-client'].prefix.lib.mariadb
inc_dir = self.spec['mariadb-client'].prefix.include.mariadb