| /tags/7.8.866-5/debian/patches/clang_inline.patch |
|---|
| 0,0 → 1,19 |
| Description: Fix FTBFS (missing symbols) on i386 |
| (probably due to changed meaning of inline with GCC 5, although it is |
| unclear why only i386 fails). Patch named after what it's for |
| according to upstream's comment. |
| Origin: upstream, commit ab15112ae6c8d82611374d9da1ed3116206d4a29 |
| Author: Tobias S. Josefowitz<tobij@tobij.de> |
| --- a/src/pike_search_engine2.c |
| +++ b/src/pike_search_engine2.c |
| @@ -47,6 +47,9 @@ HCHAR *NameNH(memchr_search)(void *data, |
| } |
| +#ifndef DEBUG_CLANG |
| +static /* works around clang 3.0 compilation/linking error. */ |
| +#endif |
| INLINE HCHAR *NameNH(memchr_memcmp)(NCHAR *needle, |
| ptrdiff_t needlelen, |
| HCHAR *haystack, |
| /tags/7.8.866-5/debian/patches/series |
|---|
| 14,3 → 14,4 |
| undefined_htons.patch |
| bad_size_t_redef.patch |
| freetype_2.6_typeof.patch |
| clang_inline.patch |
| /tags/7.8.866-5/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; |