| /tags/7.8.866-4/debian/control |
|---|
| 3,7 → 3,7 |
| Priority: optional |
| Maintainer: Magnus Holmgren <holmgren@debian.org> |
| Uploaders: Henrik Andreasson <debian@han.pp.se> |
| Standards-Version: 3.9.5 |
| Standards-Version: 3.9.6 |
| Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 5), bison, sharutils, bc, pkg-config, |
| libgmp10-dev, nettle-dev (>= 2.1~), zlib1g-dev | libz-dev, |
| libbz2-dev, libgdbm-dev, unixodbc-dev, libmysqlclient-dev, libpq-dev, |
| /tags/7.8.866-4/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; |
| /tags/7.8.866-4/debian/changelog |
|---|
| 2,8 → 2,12 |
| * 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. |
| * Replace dh_clean -k with dh_prep. |
| * Bump Standards-Version to 3.9.6. |
| -- Magnus Holmgren <holmgren@debian.org> Sun, 20 Sep 2015 18:13:55 +0200 |
| -- Magnus Holmgren <holmgren@debian.org> Sun, 20 Sep 2015 22:26:35 +0200 |
| pike7.8 (7.8.866-3) unstable; urgency=low |
| /tags/7.8.866-4/debian/rules |
|---|
| 169,7 → 169,7 |
| install: build-arch |
| dh_testdir |
| dh_testroot |
| dh_clean -k |
| dh_prep |
| $(MAKE) INSTALLARGS=--traditional \ |
| buildroot=$(TMP) \ |
| prefix=/usr \ |