You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
wine/wine-rpath.patch

46 lines
2.2 KiB

15 years ago
--- configure.orig 2010-10-04 21:35:31.000000000 +0200
+++ configure 2010-10-04 21:37:48.000000000 +0200
@@ -6775,14 +6775,14 @@
fi
- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
16 years ago
-$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
+ as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5
15 years ago
+$as_echo_n "checking whether the compiler supports -fPIC " >&6; }
if eval "test \"\${$as_ac_var+set}\"" = set; then :
16 years ago
$as_echo_n "(cached) " >&6
19 years ago
else
ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
+CFLAGS="$CFLAGS -fPIC"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
15 years ago
int main(int argc, char **argv) { return 0; }
15 years ago
@@ -6800,17 +6800,17 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
16 years ago
$as_echo "$ac_res" >&6; }
if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then :
18 years ago
- LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
15 years ago
- LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"
18 years ago
+ LDRPATH_INSTALL=""
15 years ago
+ LDRPATH_LOCAL=""
15 years ago
else
- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
-$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
+ as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5
15 years ago
+$as_echo_n "checking whether the compiler supports -fPIC " >&6; }
if eval "test \"\${$as_ac_var+set}\"" = set; then :
15 years ago
$as_echo_n "(cached) " >&6
else
15 years ago
ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
+CFLAGS="$CFLAGS -fPIC"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
15 years ago
int main(int argc, char **argv) { return 0; }