summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Johnson <glenn-johnson@uiowa.edu>2021-06-07 10:08:43 -0500
committerGitHub <noreply@github.com>2021-06-07 17:08:43 +0200
commitc01730e33b1b7d537d915403a02532ea3bca26c7 (patch)
treee0a33a92e6717204abee381ab342ce083bdc4d2c
parent1fed008410238d011676258fbe42bbf2760e005c (diff)
downloadspack-c01730e33b1b7d537d915403a02532ea3bca26c7.tar.gz
spack-c01730e33b1b7d537d915403a02532ea3bca26c7.tar.bz2
spack-c01730e33b1b7d537d915403a02532ea3bca26c7.tar.xz
spack-c01730e33b1b7d537d915403a02532ea3bca26c7.zip
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.
-rw-r--r--var/spack/repos/builtin/packages/r-rmariadb/configure_add_rpath.patch13
-rw-r--r--var/spack/repos/builtin/packages/r-rmariadb/package.py4
2 files changed, 2 insertions, 15 deletions
diff --git a/var/spack/repos/builtin/packages/r-rmariadb/configure_add_rpath.patch b/var/spack/repos/builtin/packages/r-rmariadb/configure_add_rpath.patch
deleted file mode 100644
index a5c865400f..0000000000
--- a/var/spack/repos/builtin/packages/r-rmariadb/configure_add_rpath.patch
+++ /dev/null
@@ -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}
diff --git a/var/spack/repos/builtin/packages/r-rmariadb/package.py b/var/spack/repos/builtin/packages/r-rmariadb/package.py
index 251e8c0be9..3158031c5b 100644
--- a/var/spack/repos/builtin/packages/r-rmariadb/package.py
+++ b/var/spack/repos/builtin/packages/r-rmariadb/package.py
@@ -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