[med-svn] r2099 - trunk/packages/proda/trunk/debian/patches

[plessy at alioth.debian.org]

Author: plessy
Date: 2008-06-26 04:12:29 +0000 (Thu, 26 Jun 2008)
New Revision: 2099

Modified:
   trunk/packages/proda/trunk/debian/patches/01-fix_gcc4.3_warnings.patch
   trunk/packages/proda/trunk/debian/patches/02-fix_CXXFLAGS.patch
   trunk/packages/proda/trunk/debian/patches/03-fix_FTBFS_gcc4.3_missing_includes.patch
Log:
Documented the patches and forwarded them upstream.


Modified: trunk/packages/proda/trunk/debian/patches/01-fix_gcc4.3_warnings.patch
===================================================================
--- trunk/packages/proda/trunk/debian/patches/01-fix_gcc4.3_warnings.patch	2008-06-26 01:26:23 UTC (rev 2098)
+++ trunk/packages/proda/trunk/debian/patches/01-fix_gcc4.3_warnings.patch	2008-06-26 04:12:29 UTC (rev 2099)
@@ -1,3 +1,8 @@
+Authors: David Paleino <d.paleino at gmail.com>
+Forwarded: Phuong Tu Minh <phuongtm at fpt.com.vn>, Do Chuong B. <chuongdo at cs.stanford.edu> 
+Description: Corrects deprecated conversion from string constant to ‘char*’.
+License: Use, modify, redistribute under the same terms as Proda iteslf.
+
 Index: proda-1.0/Assert.cc
 ===================================================================
 --- proda-1.0.orig/Assert.cc	2007-12-16 01:36:01.000000000 +0100

Modified: trunk/packages/proda/trunk/debian/patches/02-fix_CXXFLAGS.patch
===================================================================
--- trunk/packages/proda/trunk/debian/patches/02-fix_CXXFLAGS.patch	2008-06-26 01:26:23 UTC (rev 2098)
+++ trunk/packages/proda/trunk/debian/patches/02-fix_CXXFLAGS.patch	2008-06-26 04:12:29 UTC (rev 2099)
@@ -1,16 +1,46 @@
-Index: proda-1.0/Makefile
-===================================================================
---- proda-1.0.orig/Makefile	2007-12-16 01:38:29.000000000 +0100
-+++ proda-1.0/Makefile	2007-12-16 01:38:55.000000000 +0100
-@@ -17,8 +17,10 @@
+Authors: Charles Plessy <plessy at debian.org>
+Forwarded: Phuong Tu Minh <phuongtm at fpt.com.vn>, Do Chuong B. <chuongdo at cs.stanford.edu> 
+Description: Patch for stricter use of CXXFLAGS.
+ CXXFLAGS is a "user variable" that can be overriden at compilation time. The
+ Debian build system overrides CXXFLAGS, breaking ProDA's build system that
+ relies on it to pass -DVERSION="\"1.00\"" to the compiler. This patch replaces
+ OTHERFLAGS by CPPFLAGS. This makes sure that -DVERSION="\"1.00\"" is passed to
+ the complier for proda as well as all the .o files (build by implicit rule),
+ even if CXXFLAGS is overriden. More information on user variables can be found at
+ http://www.gnu.org/software/libtool/manual/automake/User-Variables.html#User-Variables
+ and http://www.gnu.org/prep/standards/standards.html#Command-Variables
+License: Use, modify, redistribute under the same terms as Proda iteslf.
+--- proda.orig/Makefile
++++ proda/Makefile
+@@ -15,17 +15,17 @@
+ #    c) RELEASE mode
+ ################################################################################
  
- OTHERFLAGS = -DVERSION="\"1.00\""
+-OTHERFLAGS = -DVERSION="\"1.00\""
++CPPFLAGS = -DVERSION="\"1.00\""
  
-+CXXFLAGS="$(CXXFLAGS) $(OTHERFLAGS)"
-+
  # debug mode    
 -CXXFLAGS = -g -W -Wall -pedantic $(OTHERFLAGS)
-+#CXXFLAGS = -g -W -Wall -pedantic $(OTHERFLAGS)
++CXXFLAGS = -g -W -Wall -pedantic
  
  # profile mode
- #CXXFLAGS = -pg -W -Wall -pedantic $(OTHERFLAGS)
+-#CXXFLAGS = -pg -W -Wall -pedantic $(OTHERFLAGS)
++#CXXFLAGS = -pg -W -Wall -pedantic
+ 
+ # release mode
+-#CXXFLAGS = -O3 -W -Wall -pedantic -DNDEBUG $(OTHERFLAGS) -mmmx -msse -msse2 -mfpmath=sse -march=pentium4 -mcpu=pentium4 -funroll-loops -fomit-frame-pointer 
+-#CXXFLAGS = -O3 -W -Wall -pedantic -DNDEBUG $(OTHERFLAGS) -funroll-loops 
++#CXXFLAGS = -O3 -W -Wall -pedantic -DNDEBUG -mmmx -msse -msse2 -mfpmath=sse -march=pentium4 -mcpu=pentium4 -funroll-loops -fomit-frame-pointer 
++#CXXFLAGS = -O3 -W -Wall -pedantic -DNDEBUG -funroll-loops 
+ 
+ ################################################################################
+ # 3) Dependencies
+@@ -38,7 +38,7 @@
+ all : $(TARGETS)
+ 
+ proda : $(OBJECTS)
+-	$(CXX) $(CXXFLAGS) -lm $(OBJECTS) -o proda
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -lm $(OBJECTS) -o proda
+ 
+ Assert.o: Assert.h
+ AlignedFragment.o: AlignedFragment.h Utilities.h

Modified: trunk/packages/proda/trunk/debian/patches/03-fix_FTBFS_gcc4.3_missing_includes.patch
===================================================================
--- trunk/packages/proda/trunk/debian/patches/03-fix_FTBFS_gcc4.3_missing_includes.patch	2008-06-26 01:26:23 UTC (rev 2098)
+++ trunk/packages/proda/trunk/debian/patches/03-fix_FTBFS_gcc4.3_missing_includes.patch	2008-06-26 04:12:29 UTC (rev 2099)
@@ -1,3 +1,9 @@
+Authors: David Paleino <d.paleino at gmail.com>
+Forwarded: Phuong Tu Minh <phuongtm at fpt.com.vn>, Do Chuong B. <chuongdo at cs.stanford.edu> 
+Description: Patch for compiling with g++-4.3.
+ GCC 4.3 has a stricter requirements for the declaration of includes. Without
+ this patch, ProDA would not build with g++4.3.
+License: Use, modify, redistribute under the same terms as Proda iteslf.
 Index: proda-1.0/AlignedFragment.cc
 ===================================================================
 --- proda-1.0.orig/AlignedFragment.cc	2007-12-16 01:39:42.000000000 +0100