[sci-misc/boinc] fix patch for 7.4 series

This commit is contained in:
Robert Förster 2014-05-15 20:46:44 +02:00
parent c9b67bb41e
commit dc2f5d5f81
2 changed files with 72 additions and 1 deletions

View File

@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
"${FILESDIR}"/${PN}-7.2.0-fix_subdirs.patch
"${FILESDIR}"/${PN}-7.4.0-fix_subdirs.patch
)
AUTOTOOLS_IN_SOURCE_BUILD=1

View File

@ -0,0 +1,71 @@
diff --git a/Makefile.am b/Makefile.am
index 3287187..f60ffae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,16 +10,16 @@ ACLOCAL_AMFLAGS = -I m4
if ENABLE_LIBRARIES
API_SUBDIRS = api lib
-if ENABLE_SERVER
- API_SUBDIRS += zip
-endif
-if ENABLE_BOINCZIP
- API_SUBDIRS += zip
-endif
+#if ENABLE_SERVER
+# API_SUBDIRS += zip
+#endif
+#if ENABLE_BOINCZIP
+# API_SUBDIRS += zip
+#endif
endif
if ENABLE_SERVER
- SERVER_SUBDIRS = db test py sched apps tools vda html
+ SERVER_SUBDIRS = db test py sched apps tools vda
## once contained samples/example_app which breaks out-of-source-tree builds
endif
@@ -29,9 +29,9 @@ endif
if ENABLE_MANAGER
CLIENTGUI_SUBDIRS = clientgui locale
-if BUILD_X11_SCREENSAVER
- CLIENTGUI_SUBDIRS += clientscr
-endif
+#if BUILD_X11_SCREENSAVER
+# CLIENTGUI_SUBDIRS += clientscr
+#endif
endif
# ORDER MATTERS below. One must build dependencies FIRST, then things
diff --git a/configure.ac b/configure.ac
index 8b8b84a..93acf0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1106,7 +1106,6 @@ AC_CONFIG_FILES([
apps/Makefile
clientgui/Makefile
clientgui/res/Makefile
- clientscr/Makefile
client/Makefile
client/win/boinc_path_config.py:py/boinc_path_config.py.in
client/scripts/Makefile
@@ -1114,7 +1113,6 @@ AC_CONFIG_FILES([
db/Makefile
doc/Makefile
doc/manpages/Makefile
- html/Makefile
lib/Makefile
locale/Makefile
Makefile
@@ -1144,9 +1142,6 @@ AC_CONFIG_FILES([
tools/boinc_path_config.py:py/boinc_path_config.py.in
tools/Makefile
vda/Makefile
- zip/Makefile
- zip/zip/Makefile
- zip/unzip/Makefile
m4/Makefile
])