Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | Remove rpath, its bad for cross compiling to encode |
| 2 | build time rpaths |
| 3 | |
| 4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 5 | Upstream-Status: Pending |
| 6 | |
| 7 | Index: boinc-client_release-7.6-7.6.33/api/Makefile.am |
| 8 | =================================================================== |
| 9 | --- boinc-client_release-7.6-7.6.33.orig/api/Makefile.am |
| 10 | +++ boinc-client_release-7.6-7.6.33/api/Makefile.am |
| 11 | @@ -43,18 +43,18 @@ endif |
| 12 | |
| 13 | lib_LTLIBRARIES = libboinc_api.la |
| 14 | libboinc_api_la_SOURCES = $(api_files) |
| 15 | -libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) |
| 16 | +libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) |
| 17 | |
| 18 | if BUILD_GRAPHICS_API |
| 19 | lib_LTLIBRARIES += libboinc_graphics2.la |
| 20 | libboinc_graphics2_la_SOURCES = $(graphics2_files) |
| 21 | libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/samples/image_libs |
| 22 | -libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -ljpeg |
| 23 | +libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg |
| 24 | endif #BUILD_GRAPHICS_API |
| 25 | |
| 26 | lib_LTLIBRARIES += libboinc_opencl.la |
| 27 | libboinc_opencl_la_SOURCES = $(opencl_files) |
| 28 | -libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) |
| 29 | +libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) |
| 30 | |
| 31 | if INSTALL_HEADERS |
| 32 | ## install only headers that are meant for exporting the API !! |
| 33 | Index: boinc-client_release-7.6-7.6.33/lib/Makefile.am |
| 34 | =================================================================== |
| 35 | --- boinc-client_release-7.6-7.6.33.orig/lib/Makefile.am |
| 36 | +++ boinc-client_release-7.6-7.6.33/lib/Makefile.am |
| 37 | @@ -173,7 +173,7 @@ lib_LTLIBRARIES = libboinc.la |
| 38 | libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources) |
| 39 | libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) |
| 40 | libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) |
| 41 | -libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION) |
| 42 | +libboinc_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION) |
| 43 | libboinc_la_LIBADD = |
| 44 | |
| 45 | if ENABLE_BOINCCRYPT |
| 46 | @@ -181,7 +181,7 @@ lib_LTLIBRARIES += libboinc_crypt.la |
| 47 | libboinc_crypt_la_SOURCES = crypt.cpp |
| 48 | libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS) |
| 49 | libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS) |
| 50 | -libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION) |
| 51 | +libboinc_crypt_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION) |
| 52 | libboinc_crypt_la_LIBADD = |
| 53 | endif |
| 54 | |
| 55 | @@ -190,7 +190,7 @@ lib_LTLIBRARIES += libboinc_fcgi.la |
| 56 | libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources) $(win_sources) |
| 57 | libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) |
| 58 | libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) |
| 59 | -libboinc_fcgi_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) |
| 60 | +libboinc_fcgi_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) |
| 61 | libboinc_fcgi_la_LIBADD = |
| 62 | endif |
| 63 | # end of "if ENABLE_FCGI" |
| 64 | Index: boinc-client_release-7.6-7.6.33/sched/Makefile.am |
| 65 | =================================================================== |
| 66 | --- boinc-client_release-7.6-7.6.33.orig/sched/Makefile.am |
| 67 | +++ boinc-client_release-7.6-7.6.33/sched/Makefile.am |
| 68 | @@ -26,7 +26,7 @@ lib_LTLIBRARIES = libsched.la |
| 69 | libsched_la_SOURCES = $(libsched_sources) |
| 70 | libsched_la_CFLAGS = $(AM_CPPFLAGS) |
| 71 | libsched_la_CXXFLAGS = $(AM_CPPFLAGS) |
| 72 | -libsched_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) |
| 73 | +libsched_la_LDFLAGS= -version-number $(LIBBOINC_VERSION) |
| 74 | libsched_la_LIBADD= $(SSL_LIBS) |
| 75 | |
| 76 | ## install only headers that are meant for exporting the API !! |
| 77 | @@ -48,7 +48,7 @@ lib_LTLIBRARIES += libsched_fcgi.la |
| 78 | libsched_fcgi_la_SOURCES = $(libsched_sources) |
| 79 | libsched_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS) |
| 80 | libsched_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS) |
| 81 | -libsched_fcgi_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) |
| 82 | +libsched_fcgi_la_LDFLAGS= -version-number $(LIBBOINC_VERSION) |
| 83 | libsched_fcgi_la_LIBADD= |
| 84 | |
| 85 | endif |
| 86 | Index: boinc-client_release-7.6-7.6.33/zip/Makefile.am |
| 87 | =================================================================== |
| 88 | --- boinc-client_release-7.6-7.6.33.orig/zip/Makefile.am |
| 89 | +++ boinc-client_release-7.6-7.6.33/zip/Makefile.am |
| 90 | @@ -61,7 +61,7 @@ endif |
| 91 | |
| 92 | lib_LTLIBRARIES = libboinc_zip.la |
| 93 | libboinc_zip_la_SOURCES = $(libboinc_zip_sources) |
| 94 | -libboinc_zip_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) |
| 95 | +libboinc_zip_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) |
| 96 | libboinc_zip_la_LIBADD = |
| 97 | |
| 98 | # Some OSs may not prefix libraries with lib. |