forked from pool/boinc-client
7b6209673e
- fix compilation for factory and 12.2 OBS-URL: https://build.opensuse.org/request/show/127505 OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=27
38 lines
2.0 KiB
Diff
38 lines
2.0 KiB
Diff
Index: boinc_core_release_6_12_43/configure.ac
|
|
===================================================================
|
|
--- boinc_core_release_6_12_43.orig/configure.ac 2012-07-10 13:47:58.000000000 +0200
|
|
+++ boinc_core_release_6_12_43/configure.ac 2012-07-10 14:11:55.043582540 +0200
|
|
@@ -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)
|
|
@@ -737,6 +738,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 ======================================================================
|
|
Index: boinc_core_release_6_12_43/clientgui/Makefile.am
|
|
===================================================================
|
|
--- boinc_core_release_6_12_43.orig/clientgui/Makefile.am 2012-02-02 00:02:32.000000000 +0100
|
|
+++ boinc_core_release_6_12_43/clientgui/Makefile.am 2012-07-10 14:14:26.374552322 +0200
|
|
@@ -118,9 +118,8 @@ EXTRA_DIST = *.h \
|
|
../lib/error_numbers.h \
|
|
locale $(mac_headers)
|
|
|
|
-boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
|
|
-boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
|
|
-boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS)
|
|
+boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK2_CFLAGS)
|
|
+boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK2_LIBS)
|
|
|
|
win_config.h: $(top_srcdir)/config.h
|
|
grep '#define.*BOINC.*VERSION' $^ > $@
|