Re: [oe] [meta-oe][PATCH 01/16] boinc: Add recipe for boinc-client

2016-10-25 Thread Khem Raj 

> On Oct 25, 2016, at 6:32 AM, Martin Jansa  wrote:
> 
> On Tue, Oct 18, 2016 at 10:38:19PM -0700, Khem Raj wrote:
>> Signed-off-by: Khem Raj 
> 
> boinc-client-7.6.33: boinc-client rdepends on libxscrnsaver, but it
> isn't a build dependency, missing libxscrnsaver in DEPENDS or
> PACKAGECONFIG? [build-deps]

thanks, drop this one for now. I will send a v2 with feedback addressed.

> 
>> ---
>> .../boinc/boinc-client/boinc-AM_CONDITIONAL.patch  | 19 +
>> .../boinc/boinc-client/cross-compile.patch | 92 
>> ++
>> .../boinc/boinc-client/opengl_m4_check.patch   | 13 +++
>> .../recipes-extended/boinc/boinc-client_7.6.33.bb  | 60 ++
>> 4 files changed, 184 insertions(+)
>> create mode 100644 
>> meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
>> create mode 100644 
>> meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
>> create mode 100644 
>> meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
>> create mode 100644 meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb
>> 
>> diff --git 
>> a/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch 
>> b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
>> new file mode 100644
>> index 000..3ebf7c8
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
>> @@ -0,0 +1,19 @@
>> +--- A/configure.ac
>>  B/configure.ac
>> +@@ -39,6 +39,7 @@ AC_PROG_CC
>> + AC_PROG_CXX
>> + AC_PROG_F77
>> + AC_PROG_CPP
>> ++AC_PROG_OBJCXX
>> + AC_PROG_MAKE_SET
>> + SAH_LINKS
>> + AC_LANG_PUSH(C)
>> +@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
>> + AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
>> + AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f 
>> ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
>> +
>> ++PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
>> ++
>> + dnl ==
>> + dnl some more vodoo required for building portable client-binary (client, 
>> clientgui)
>> + dnl ==
>> diff --git a/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch 
>> b/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
>> new file mode 100644
>> index 000..3d29558
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
>> @@ -0,0 +1,92 @@
>> +Index: boinc-client_release-7.6-7.6.33/api/Makefile.am
>> +===
>> +--- boinc-client_release-7.6-7.6.33.orig/api/Makefile.am
>>  boinc-client_release-7.6-7.6.33/api/Makefile.am
>> +@@ -43,18 +43,18 @@ endif
>> +
>> + lib_LTLIBRARIES = libboinc_api.la
>> + libboinc_api_la_SOURCES = $(api_files)
>> +-libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number 
>> $(LIBBOINC_VERSION)
>> ++libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
>> +
>> + if BUILD_GRAPHICS_API
>> + lib_LTLIBRARIES += libboinc_graphics2.la
>> + libboinc_graphics2_la_SOURCES = $(graphics2_files)
>> + libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib 
>> -I$(top_srcdir)/samples/image_libs
>> +-libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) 
>> -version-number $(LIBBOINC_VERSION) -ljpeg
>> ++libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg
>> + endif #BUILD_GRAPHICS_API
>> +
>> + lib_LTLIBRARIES += libboinc_opencl.la
>> + libboinc_opencl_la_SOURCES = $(opencl_files)
>> +-libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number 
>> $(LIBBOINC_VERSION)
>> ++libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
>> +
>> + if INSTALL_HEADERS
>> + ## install only headers that are meant for exporting the API !!
>> +Index: boinc-client_release-7.6-7.6.33/lib/Makefile.am
>> +===
>> +--- boinc-client_release-7.6-7.6.33.orig/lib/Makefile.am
>>  boinc-client_release-7.6-7.6.33/lib/Makefile.am
>> +@@ -173,7 +173,7 @@ lib_LTLIBRARIES = libboinc.la
>> + libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
>> + libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
>> + libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
>> +-libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number 
>> $(LIBBOINC_VERSION)
>> ++libboinc_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
>> + libboinc_la_LIBADD =
>> +
>> + if ENABLE_BOINCCRYPT
>> +@@ -181,7 +181,7 @@ lib_LTLIBRARIES += libboinc_crypt.la
>> + libboinc_crypt_la_SOURCES = crypt.cpp
>> + libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) 
>> $(SSL_CFLAGS)
>> + libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) 
>> $(SSL_CXXFLAGS)
>>

Re: [oe] [meta-oe][PATCH 01/16] boinc: Add recipe for boinc-client

2016-10-25 Thread Martin Jansa 
On Tue, Oct 18, 2016 at 10:38:19PM -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj 

boinc-client-7.6.33: boinc-client rdepends on libxscrnsaver, but it
isn't a build dependency, missing libxscrnsaver in DEPENDS or
PACKAGECONFIG? [build-deps]

> ---
>  .../boinc/boinc-client/boinc-AM_CONDITIONAL.patch  | 19 +
>  .../boinc/boinc-client/cross-compile.patch | 92 
> ++
>  .../boinc/boinc-client/opengl_m4_check.patch   | 13 +++
>  .../recipes-extended/boinc/boinc-client_7.6.33.bb  | 60 ++
>  4 files changed, 184 insertions(+)
>  create mode 100644 
> meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
>  create mode 100644 
> meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
>  create mode 100644 
> meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
>  create mode 100644 meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb
> 
> diff --git 
> a/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch 
> b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
> new file mode 100644
> index 000..3ebf7c8
> --- /dev/null
> +++ b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
> @@ -0,0 +1,19 @@
> +--- A/configure.ac
>  B/configure.ac
> +@@ -39,6 +39,7 @@ AC_PROG_CC
> + AC_PROG_CXX
> + AC_PROG_F77
> + AC_PROG_CPP
> ++AC_PROG_OBJCXX
> + AC_PROG_MAKE_SET
> + SAH_LINKS
> + AC_LANG_PUSH(C)
> +@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
> + AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
> + AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f 
> ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
> + 
> ++PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
> ++
> + dnl ==
> + dnl some more vodoo required for building portable client-binary (client, 
> clientgui)
> + dnl ==
> diff --git a/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch 
> b/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
> new file mode 100644
> index 000..3d29558
> --- /dev/null
> +++ b/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
> @@ -0,0 +1,92 @@
> +Index: boinc-client_release-7.6-7.6.33/api/Makefile.am
> +===
> +--- boinc-client_release-7.6-7.6.33.orig/api/Makefile.am
>  boinc-client_release-7.6-7.6.33/api/Makefile.am
> +@@ -43,18 +43,18 @@ endif
> + 
> + lib_LTLIBRARIES = libboinc_api.la
> + libboinc_api_la_SOURCES = $(api_files)
> +-libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number 
> $(LIBBOINC_VERSION)
> ++libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
> + 
> + if BUILD_GRAPHICS_API
> + lib_LTLIBRARIES += libboinc_graphics2.la
> + libboinc_graphics2_la_SOURCES = $(graphics2_files)
> + libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib 
> -I$(top_srcdir)/samples/image_libs
> +-libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) 
> -version-number $(LIBBOINC_VERSION) -ljpeg
> ++libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg
> + endif #BUILD_GRAPHICS_API
> + 
> + lib_LTLIBRARIES += libboinc_opencl.la
> + libboinc_opencl_la_SOURCES = $(opencl_files)
> +-libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number 
> $(LIBBOINC_VERSION)
> ++libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
> + 
> + if INSTALL_HEADERS
> + ## install only headers that are meant for exporting the API !!
> +Index: boinc-client_release-7.6-7.6.33/lib/Makefile.am
> +===
> +--- boinc-client_release-7.6-7.6.33.orig/lib/Makefile.am
>  boinc-client_release-7.6-7.6.33/lib/Makefile.am
> +@@ -173,7 +173,7 @@ lib_LTLIBRARIES = libboinc.la
> + libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
> + libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
> + libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
> +-libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number 
> $(LIBBOINC_VERSION)
> ++libboinc_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
> + libboinc_la_LIBADD =
> + 
> + if ENABLE_BOINCCRYPT
> +@@ -181,7 +181,7 @@ lib_LTLIBRARIES += libboinc_crypt.la
> + libboinc_crypt_la_SOURCES = crypt.cpp
> + libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) 
> $(SSL_CFLAGS)
> + libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) 
> $(SSL_CXXFLAGS)
> +-libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static 
> -version-number $(LIBBOINC_VERSION)
> ++libboinc_crypt_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
> + libboinc_crypt_la_LIBADD =
> + endif
> + 
> +@@ -190,7 +190,7 @@ lib_LTLIBRARIES +=

Re: [oe] [meta-oe][PATCH 01/16] boinc: Add recipe for boinc-client

2016-10-19 Thread akuster808 



On 10/18/2016 10:38 PM, Khem Raj wrote:

Signed-off-by: Khem Raj 


Looks like the patches are missing OE patch format. No Upstream-Status 
or Signoff, etc


- armin

---
  .../boinc/boinc-client/boinc-AM_CONDITIONAL.patch  | 19 +
  .../boinc/boinc-client/cross-compile.patch | 92 ++
  .../boinc/boinc-client/opengl_m4_check.patch   | 13 +++
  .../recipes-extended/boinc/boinc-client_7.6.33.bb  | 60 ++
  4 files changed, 184 insertions(+)
  create mode 100644 
meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
  create mode 100644 
meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
  create mode 100644 
meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
  create mode 100644 meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb

diff --git 
a/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch 
b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
new file mode 100644
index 000..3ebf7c8
--- /dev/null
+++ b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
@@ -0,0 +1,19 @@
+--- A/configure.ac
 B/configure.ac
+@@ -39,6 +39,7 @@ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_F77
+ AC_PROG_CPP
++AC_PROG_OBJCXX
+ AC_PROG_MAKE_SET
+ SAH_LINKS
+ AC_LANG_PUSH(C)
+@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
+ AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
+ AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f 
./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
+
++PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
++
+ dnl ==
+ dnl some more vodoo required for building portable client-binary (client, 
clientgui)
+ dnl ==
diff --git a/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch 
b/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
new file mode 100644
index 000..3d29558
--- /dev/null
+++ b/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
@@ -0,0 +1,92 @@
+Index: boinc-client_release-7.6-7.6.33/api/Makefile.am
+===
+--- boinc-client_release-7.6-7.6.33.orig/api/Makefile.am
 boinc-client_release-7.6-7.6.33/api/Makefile.am
+@@ -43,18 +43,18 @@ endif
+
+ lib_LTLIBRARIES = libboinc_api.la
+ libboinc_api_la_SOURCES = $(api_files)
+-libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number 
$(LIBBOINC_VERSION)
++libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
+
+ if BUILD_GRAPHICS_API
+ lib_LTLIBRARIES += libboinc_graphics2.la
+ libboinc_graphics2_la_SOURCES = $(graphics2_files)
+ libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib 
-I$(top_srcdir)/samples/image_libs
+-libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number 
$(LIBBOINC_VERSION) -ljpeg
++libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg
+ endif #BUILD_GRAPHICS_API
+
+ lib_LTLIBRARIES += libboinc_opencl.la
+ libboinc_opencl_la_SOURCES = $(opencl_files)
+-libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number 
$(LIBBOINC_VERSION)
++libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
+
+ if INSTALL_HEADERS
+ ## install only headers that are meant for exporting the API !!
+Index: boinc-client_release-7.6-7.6.33/lib/Makefile.am
+===
+--- boinc-client_release-7.6-7.6.33.orig/lib/Makefile.am
 boinc-client_release-7.6-7.6.33/lib/Makefile.am
+@@ -173,7 +173,7 @@ lib_LTLIBRARIES = libboinc.la
+ libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
+ libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+ libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+-libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number 
$(LIBBOINC_VERSION)
++libboinc_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
+ libboinc_la_LIBADD =
+
+ if ENABLE_BOINCCRYPT
+@@ -181,7 +181,7 @@ lib_LTLIBRARIES += libboinc_crypt.la
+ libboinc_crypt_la_SOURCES = crypt.cpp
+ libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) 
$(SSL_CFLAGS)
+ libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) 
$(SSL_CXXFLAGS)
+-libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static 
-version-number $(LIBBOINC_VERSION)
++libboinc_crypt_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
+ libboinc_crypt_la_LIBADD =
+ endif
+
+@@ -190,7 +190,7 @@ lib_LTLIBRARIES += libboinc_fcgi.la
+ libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources) $(win_sources)
+ libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) 
$(PTHREAD_CFLAGS)
+ libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) 
$(PTHREAD_CFLAGS)

[oe] [meta-oe][PATCH 01/16] boinc: Add recipe for boinc-client

2016-10-18 Thread Khem Raj 
Signed-off-by: Khem Raj 
---
 .../boinc/boinc-client/boinc-AM_CONDITIONAL.patch  | 19 +
 .../boinc/boinc-client/cross-compile.patch | 92 ++
 .../boinc/boinc-client/opengl_m4_check.patch   | 13 +++
 .../recipes-extended/boinc/boinc-client_7.6.33.bb  | 60 ++
 4 files changed, 184 insertions(+)
 create mode 100644 
meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
 create mode 100644 
meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
 create mode 100644 
meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
 create mode 100644 meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb

diff --git 
a/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch 
b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
new file mode 100644
index 000..3ebf7c8
--- /dev/null
+++ b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
@@ -0,0 +1,19 @@
+--- A/configure.ac
 B/configure.ac
+@@ -39,6 +39,7 @@ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_F77
+ AC_PROG_CPP
++AC_PROG_OBJCXX
+ AC_PROG_MAKE_SET
+ SAH_LINKS
+ AC_LANG_PUSH(C)
+@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
+ AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
+ AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f 
./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
+ 
++PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
++
+ dnl ==
+ dnl some more vodoo required for building portable client-binary (client, 
clientgui)
+ dnl ==
diff --git a/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch 
b/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
new file mode 100644
index 000..3d29558
--- /dev/null
+++ b/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
@@ -0,0 +1,92 @@
+Index: boinc-client_release-7.6-7.6.33/api/Makefile.am
+===
+--- boinc-client_release-7.6-7.6.33.orig/api/Makefile.am
 boinc-client_release-7.6-7.6.33/api/Makefile.am
+@@ -43,18 +43,18 @@ endif
+ 
+ lib_LTLIBRARIES = libboinc_api.la
+ libboinc_api_la_SOURCES = $(api_files)
+-libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number 
$(LIBBOINC_VERSION)
++libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
+ 
+ if BUILD_GRAPHICS_API
+ lib_LTLIBRARIES += libboinc_graphics2.la
+ libboinc_graphics2_la_SOURCES = $(graphics2_files)
+ libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib 
-I$(top_srcdir)/samples/image_libs
+-libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number 
$(LIBBOINC_VERSION) -ljpeg
++libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg
+ endif #BUILD_GRAPHICS_API
+ 
+ lib_LTLIBRARIES += libboinc_opencl.la
+ libboinc_opencl_la_SOURCES = $(opencl_files)
+-libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number 
$(LIBBOINC_VERSION)
++libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
+ 
+ if INSTALL_HEADERS
+ ## install only headers that are meant for exporting the API !!
+Index: boinc-client_release-7.6-7.6.33/lib/Makefile.am
+===
+--- boinc-client_release-7.6-7.6.33.orig/lib/Makefile.am
 boinc-client_release-7.6-7.6.33/lib/Makefile.am
+@@ -173,7 +173,7 @@ lib_LTLIBRARIES = libboinc.la
+ libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
+ libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+ libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+-libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number 
$(LIBBOINC_VERSION)
++libboinc_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
+ libboinc_la_LIBADD =
+ 
+ if ENABLE_BOINCCRYPT
+@@ -181,7 +181,7 @@ lib_LTLIBRARIES += libboinc_crypt.la
+ libboinc_crypt_la_SOURCES = crypt.cpp
+ libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) 
$(SSL_CFLAGS)
+ libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) 
$(SSL_CXXFLAGS)
+-libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static 
-version-number $(LIBBOINC_VERSION)
++libboinc_crypt_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
+ libboinc_crypt_la_LIBADD =
+ endif
+ 
+@@ -190,7 +190,7 @@ lib_LTLIBRARIES += libboinc_fcgi.la
+ libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources) $(win_sources)
+ libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) 
$(PTHREAD_CFLAGS)
+ libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) 
$(PTHREAD_CFLAGS)
+-libboinc_fcgi_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number 
$(LIBBOINC_VERSION)
++libboinc_fcgi_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
+