Package: code-saturne / 5.3.2+repack-1

no-rpath.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
Index: code-saturne-5.3.1+repack/bin/cs_config.py.in
===================================================================
--- code-saturne-5.3.1+repack.orig/bin/cs_config.py.in
+++ code-saturne-5.3.1+repack/bin/cs_config.py.in
@@ -110,7 +110,7 @@ class config:
                       'fcflags': "@FCFLAGS@ @FCFLAGS_DBG@ @FCFLAGS_OPT@"}
 
         self.fcmodinclude = "@FCMODINCLUDE@"
-        self.rpath = "@LDRPATH@"
+        self.rpath = "" # "@LDRPATH@"
         self.special_user_link = "@cs_special_user_link@"
 
         # Constants for system-dependant file extensions
Index: code-saturne-5.3.1+repack/m4/cs_hdf5.m4
===================================================================
--- code-saturne-5.3.1+repack.orig/m4/cs_hdf5.m4
+++ code-saturne-5.3.1+repack/m4/cs_hdf5.m4
@@ -67,12 +67,12 @@ AC_ARG_WITH(hdf5-lib,
              HDF5_LDFLAGS="-L$with_hdf5_lib"
              cs_hdf5_libpath="$with_hdf5_lib"
              # Add the libdir to the runpath as HDF5 might not be libtoolized
-             HDF5RUNPATH="-R$with_hdf5_lib"],
+             HDF5RUNPATH=""],
             [if test "x$with_hdf5" != "xno" -a "x$with_hdf5" != "xyes" \
 	          -a "x$with_hdf5" != "xcheck"; then
                HDF5_LDFLAGS="-L$with_hdf5/lib"
                # Add the libdir to the runpath as HDF5 might not be libtoolized
-               HDF5RUNPATH="-R$with_hdf5/lib"
+               HDF5RUNPATH=""
                cs_hdf5_libpath="$with_hdf5/lib"
              fi])
 
Index: code-saturne-5.3.1+repack/src/apps/Makefile.am
===================================================================
--- code-saturne-5.3.1+repack.orig/src/apps/Makefile.am
+++ code-saturne-5.3.1+repack/src/apps/Makefile.am
@@ -39,7 +39,7 @@ if HAVE_RELOCATABLE
   ORIGINRUNPATH = -R '\$$ORIGIN/../../lib'
   PLUGINRUNPATH_R = -R'\$$ORIGIN/../../lib/'$(PACKAGE)
 else
-  PLUGINRUNPATH_N = -R$(pkglibdir)
+#  PLUGINRUNPATH_N = -R$(pkglibdir)
 endif
 
 if HAVE_PLUGINS