r749 - in /trunk/boinc-app-seti/debian: changelog patches/001_build_fixes.patch patches/004_include_new_str_util.h.patch patches/005_disable_rule_for_main.cpp.patch patches/005_mkdir_depdir_in_handwritten_rules.patch patches/series
fst-guest at users.alioth.debian.org
fst-guest at users.alioth.debian.org
Mon Nov 19 10:40:26 UTC 2007
Author: fst-guest
Date: Mon Nov 19 10:40:26 2007
New Revision: 749
URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=749
Log:
* Added 005_mkdir_depdir_in_handwritten_rules.patch which adds "-mkdir
$(DEPDIR)" to some rules for object files in client/Makefile.am. When
building with CDBS $(DEPDIR) does not get created but it is required by
the aforementioned rules. This patch is only a workaround until I figure
out why $(DEPDIR) does not get created with CDBS and how to fix it
properly.
* Removed patches that are not required anymore.
Added:
trunk/boinc-app-seti/debian/patches/005_mkdir_depdir_in_handwritten_rules.patch
- copied, changed from r748, trunk/boinc-app-seti/debian/patches/005_disable_rule_for_main.cpp.patch
Removed:
trunk/boinc-app-seti/debian/patches/001_build_fixes.patch
trunk/boinc-app-seti/debian/patches/004_include_new_str_util.h.patch
trunk/boinc-app-seti/debian/patches/005_disable_rule_for_main.cpp.patch
Modified:
trunk/boinc-app-seti/debian/changelog
trunk/boinc-app-seti/debian/patches/series
Modified: trunk/boinc-app-seti/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/changelog?rev=749&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/changelog (original)
+++ trunk/boinc-app-seti/debian/changelog Mon Nov 19 10:40:26 2007
@@ -5,12 +5,17 @@
[ Frank S. Thomas ]
* debian/patches/:
+ - Removed 001_build_fixes.patch and 004_include_new_str_util.h.patch
+ because they are not required for the new upstream version.
- Updated 003_dont_use_own_jpeglib.patch for the new release.
- - Added 005_disable_rule_for_main.cpp.patch which comments out the Linux
- specific rule for seti_boinc-main.o in client/Makefile.am. This rule
- breaks building boinc-app-seti with cdbs.
+ - Added 005_mkdir_depdir_in_handwritten_rules.patch which adds "-mkdir
+ $(DEPDIR)" to some rules for object files in client/Makefile.am. When
+ building with CDBS $(DEPDIR) does not get created but it is required by
+ the aforementioned rules. This patch is only a workaround until I figure
+ out why $(DEPDIR) does not get created with CDBS and how to fix it
+ properly.
- -- Frank S. Thomas <frank at thomas-alfeld.de> Sat, 17 Nov 2007 17:59:33 +0100
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Mon, 19 Nov 2007 11:22:53 +0100
boinc-app-seti (5.13+cvs20060510-3) unstable; urgency=low
Copied: trunk/boinc-app-seti/debian/patches/005_mkdir_depdir_in_handwritten_rules.patch (from r748, trunk/boinc-app-seti/debian/patches/005_disable_rule_for_main.cpp.patch)
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/005_mkdir_depdir_in_handwritten_rules.patch?rev=749&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/patches/005_disable_rule_for_main.cpp.patch (original)
+++ trunk/boinc-app-seti/debian/patches/005_mkdir_depdir_in_handwritten_rules.patch Mon Nov 19 10:40:26 2007
@@ -1,21 +1,86 @@
-Index: boinc-app-seti-5.28+cvs20071114/client/Makefile.am
+Index: boinc-app-seti-5.28+cvs20071116/client/Makefile.am
===================================================================
---- boinc-app-seti-5.28+cvs20071114.orig/client/Makefile.am
-+++ boinc-app-seti-5.28+cvs20071114/client/Makefile.am
-@@ -186,11 +186,11 @@
+--- boinc-app-seti-5.28+cvs20071116.orig/client/Makefile.am
++++ boinc-app-seti-5.28+cvs20071116/client/Makefile.am
+@@ -114,6 +114,7 @@
+ if I386
+ # allow use of sse instructions on i[3456]86
+ seti_boinc-analyzeFuncs_sse3.o: vector/analyzeFuncs_sse3.cpp
++ -mkdir $(DEPDIR)
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_SSE -DUSE_SSE2 \
+ -DUSE_SSE3 -D__SSE__ -D__SSE2__ -D__SSE3__ \
+@@ -121,30 +122,35 @@
+ -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ seti_boinc-analyzeFuncs_sse2.o: vector/analyzeFuncs_sse2.cpp
++ -mkdir $(DEPDIR)
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_SSE -DUSE_SSE2 \
+ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -msse2 \
+ -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ seti_boinc-analyzeFuncs_sse.o: vector/analyzeFuncs_sse.cpp
++ -mkdir $(DEPDIR)
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_SSE \
+ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -msse \
+ -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ seti_boinc-analyzeFuncs_x86_64.o: vector/analyzeFuncs_x86_64.cpp
++ -mkdir $(DEPDIR)
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_SSE \
+ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -mfpmath=sse -msse2 \
+ -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ seti_boinc-x86_float4.o: vector/x86_float4.cpp
++ -mkdir $(DEPDIR)
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_SSE \
+ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -msse \
+ -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ seti_boinc-analyzeFuncs_vector.o: vector/analyzeFuncs_vector.cpp
++ -mkdir $(DEPDIR)
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_SSE -DUSE_SSE2 \
+ -DUSE_SSE3 -DUSE_3DNOW \
+@@ -156,12 +162,14 @@
+ if X86_64
+ # allow use of sse instructions on i[3456]86
+ seti_boinc-analyzeFuncs_sse3.o: vector/analyzeFuncs_sse3.cpp
++ -mkdir $(DEPDIR)
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_SSE3 \
+ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -msse3 \
+ -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ seti_boinc-analyzeFuncs_vector.o: vector/analyzeFuncs_vector.cpp
++ -mkdir $(DEPDIR)
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_SSE3 -DUSE_3DNOW \
+ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@@ -172,12 +180,14 @@
+ if PPC
+ # allow use of altivec instructions on PPC
+ seti_boinc-analyzeFuncs_altivec.o: vector/analyzeFuncs_altivec.cpp
++ -mkdir $(DEPDIR)
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_ALTIVEC \
+ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -faltivec \
+ -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ seti_boinc-analyzeFuncs_vector.o: vector/analyzeFuncs_vector.cpp
++ -mkdir $(DEPDIR)
+ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_ALTIVEC \
+ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@@ -189,6 +199,7 @@
+ if LINUX
+ # too much optimization on main.cpp breaks the client for some reason
+ seti_boinc-main.o: main.cpp
++ -mkdir $(DEPDIR)
+ if $(CXX) --include ../sah_config.h $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT $(CLIENT_C_FLAGS) -I$(top_srcdir)/db $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -O2 -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
endif
-
--if LINUX
--# too much optimization on main.cpp breaks the client for some reason
--seti_boinc-main.o: main.cpp
-- if $(CXX) --include ../sah_config.h $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT $(CLIENT_C_FLAGS) -I$(top_srcdir)/db $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -O2 -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
--endif
-+#if LINUX
-+## too much optimization on main.cpp breaks the client for some reason
-+#seti_boinc-main.o: main.cpp
-+# if $(CXX) --include ../sah_config.h $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) -DTEXT_UI -DNDEBUG -DCLIENT $(CLIENT_C_FLAGS) -I$(top_srcdir)/db $(BOINC_CFLAGS) $(PTHREAD_CFLAGS) -O2 -Wall -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+#endif
-
-
- if ENABLE_GUI
Modified: trunk/boinc-app-seti/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc-app-seti/debian/patches/series?rev=749&op=diff
==============================================================================
--- trunk/boinc-app-seti/debian/patches/series (original)
+++ trunk/boinc-app-seti/debian/patches/series Mon Nov 19 10:40:26 2007
@@ -1,5 +1,3 @@
-#001_build_fixes.patch
#002_disable_static_linkage.patch
003_dont_use_own_jpeglib.patch
-#004_include_new_str_util.h.patch
-005_disable_rule_for_main.cpp.patch
+005_mkdir_depdir_in_handwritten_rules.patch
More information about the pkg-boinc-commits
mailing list