Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 230 → Rev 231

/branches/7.8-stable/debian/patches/smartlink_rpath.patch
10,37 → 10,9
- if test x$LINKING != xno -a "x$RPATH" != x ; then
- LDOPTS="$LDOPTS -Wl,-rpath,$RPATH"
- fi
+ Linux\ 2.*|Linux\ 3.*)
+ Linux\ *)
+ LD_LIBRARY_PATH="$RPATH"
+ export LD_LIBRARY_PATH
;;
UnixWare\ 7.*)
if test x$LINKING != xno -a "x$RPATH" != x ; then
--- a/src/smartlink.c
+++ b/src/smartlink.c
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
full_rpath = rpath;
#ifdef USE_Wl
- strcat(rpath, "-Wl,-rpath,");
+ /* strcat(rpath, "-Wl,-rpath,"); */
#elif defined(USE_Wl_R)
strcat(rpath, "-Wl,-R");
#elif defined(USE_R)
@@ -310,7 +310,7 @@ int main(int argc, char **argv)
}
rpath_in_use |= add_path(rpath, ld_lib_path);
}
-
+#if 0
if (rpath_in_use) {
/* Delete the terminating ':' */
rpath[strlen(rpath) - 1] = 0;
@@ -357,6 +357,7 @@ int main(int argc, char **argv)
#error Unknown method
#endif
}
+#endif
new_argv[new_argc++] = NULL;
/branches/7.8-stable/debian/changelog
2,6 → 2,8
 
* Update Homepage URL to http://pike.lysator.liu.se.
* freetype_2.6_typeof.patch (new): Fix FTBFS with Freetype 2.6.
* smartlink_rpath.patch: Match all Linux versions. Skip patching
smartlink.c since we've disabled it with --disable-smartlink_binary.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 20 Sep 2015 18:13:55 +0200