| 1 |
bicatali 11/05/04 00:15:31 |
| 2 |
|
| 3 |
Added: spr-3.3.2-autotools.patch spr-3.3.2-gcc46.patch |
| 4 |
Log: |
| 5 |
Version bump and import to the main tree |
| 6 |
|
| 7 |
(Portage version: 2.1.9.46/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/spr/files/spr-3.3.2-autotools.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spr/files/spr-3.3.2-autotools.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spr/files/spr-3.3.2-autotools.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: spr-3.3.2-autotools.patch |
| 16 |
=================================================================== |
| 17 |
diff -Nur SPR-3.3.2.orig/configure.ac SPR-3.3.2/configure.ac |
| 18 |
--- SPR-3.3.2.orig/configure.ac 2011-03-29 05:52:30.000000000 +0100 |
| 19 |
+++ SPR-3.3.2/configure.ac 2011-05-04 00:48:43.000000000 +0100 |
| 20 |
@@ -35,9 +35,6 @@ |
| 21 |
AC_FUNC_STAT |
| 22 |
AC_CHECK_FUNCS([gettimeofday pow sqrt]) |
| 23 |
|
| 24 |
-## Default compiler flags |
| 25 |
-DEFAULTCXXFLAGS="-O4" |
| 26 |
- |
| 27 |
## ROOT installation |
| 28 |
AC_ARG_VAR([ROOTPATH], [path to ROOT installation]) |
| 29 |
AC_ARG_WITH([root], AC_HELP_STRING([--with-root], [path to ROOT installation]), |
| 30 |
@@ -97,7 +94,6 @@ |
| 31 |
## Test ROOT libs |
| 32 |
AC_MSG_CHECKING([ROOT libraries]) |
| 33 |
if test -f ${ROOTLIBPATH}/libCore.so; then |
| 34 |
- DEFAULTCXXFLAGS="-O2" |
| 35 |
AC_MSG_RESULT([using ROOT libraries in $ROOTLIBPATH]) |
| 36 |
else |
| 37 |
AC_MSG_WARN([ROOT libraries not found under $ROOTLIBPATH... disabling ROOT]) |
| 38 |
@@ -117,16 +113,6 @@ |
| 39 |
################################ |
| 40 |
|
| 41 |
|
| 42 |
-## Set default compiler flags if CXXFLAGS not defined |
| 43 |
-if test -z "$CXXFLAGS"; then |
| 44 |
- CXXFLAGS=$DEFAULTCXXFLAGS |
| 45 |
-fi |
| 46 |
- |
| 47 |
- |
| 48 |
-AM_CXXFLAGS="-ansi -pedantic" |
| 49 |
-AC_SUBST(AM_CPPFLAGS) |
| 50 |
-AC_SUBST(AM_CXXFLAGS) |
| 51 |
-AC_SUBST(CXXFLAGS) |
| 52 |
|
| 53 |
AC_CONFIG_FILES(Makefile) |
| 54 |
AC_CONFIG_FILES(math/Makefile) |
| 55 |
diff -Nur SPR-3.3.2.orig/data/Makefile.am SPR-3.3.2/data/Makefile.am |
| 56 |
--- SPR-3.3.2.orig/data/Makefile.am 2011-03-29 05:52:30.000000000 +0100 |
| 57 |
+++ SPR-3.3.2/data/Makefile.am 2011-03-29 05:54:19.000000000 +0100 |
| 58 |
@@ -1,4 +1,5 @@ |
| 59 |
-dist_data_DATA = \ |
| 60 |
+ |
| 61 |
+pkgdata_DATA = \ |
| 62 |
discrete_square.pat gausscorr_uniform_2d_train.pat \ |
| 63 |
gauss2_uniform_2d_train.pat trainRoot.pat \ |
| 64 |
gauss2_uniform_2d_valid.pat triangle_square_00_train.pat \ |
| 65 |
@@ -9,4 +10,4 @@ |
| 66 |
lambda-test.pat cmc.data \ |
| 67 |
gauss2_uniform_2d_train_root.pat mlp_root.pat \ |
| 68 |
tmva_root.pat cleveland.data \ |
| 69 |
-samplematrixindicator.cfg |
| 70 |
\ No newline at end of file |
| 71 |
+samplematrixindicator.cfg |
| 72 |
diff -Nur SPR-3.3.2.orig/src/Makefile.am SPR-3.3.2/src/Makefile.am |
| 73 |
--- SPR-3.3.2.orig/src/Makefile.am 2011-03-29 05:52:30.000000000 +0100 |
| 74 |
+++ SPR-3.3.2/src/Makefile.am 2011-05-04 00:45:22.000000000 +0100 |
| 75 |
@@ -1,20 +1,14 @@ |
| 76 |
lib_LTLIBRARIES = libSPR.la |
| 77 |
|
| 78 |
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) |
| 79 |
-AM_LDFLAGS = -L/usr/lib -L$(top_srcdir)/src |
| 80 |
-AM_LIBS = -lSPR |
| 81 |
-APPLDADD = -lSPR |
| 82 |
+ |
| 83 |
if WITH_ROOT |
| 84 |
- AM_CXXFLAGS += $(ROOTCXXFLAGS) -O2 |
| 85 |
+ AM_CXXFLAGS = $(ROOTCXXFLAGS) |
| 86 |
AM_CPPFLAGS += $(ROOTCPPFLAGS) -DSPRROOTTUPLE |
| 87 |
- AM_LDFLAGS += $(ROOTLDFLAGS) |
| 88 |
- AM_LIBS += $(ROOTLIBS) |
| 89 |
- APPLDADD += $(ROOTLIBS) |
| 90 |
-else |
| 91 |
- AM_CXXFLAGS += -O4 |
| 92 |
+ AM_LDFLAGS = $(ROOTLDFLAGS) |
| 93 |
endif |
| 94 |
|
| 95 |
-libSPR_la_LIBADD = $(top_srcdir)/math/libSPRmath.la |
| 96 |
+libSPR_la_LIBADD = $(top_srcdir)/math/libSPRmath.la $(ROOTLIBS) |
| 97 |
libSPR_la_SOURCES = \ |
| 98 |
SprDataMoments.cc SprDecisionTree.cc \ |
| 99 |
SprFisher.cc SprFomCalculator.cc \ |
| 100 |
@@ -60,81 +54,52 @@ |
| 101 |
##################################################################### |
| 102 |
|
| 103 |
|
| 104 |
+LDADD = libSPR.la |
| 105 |
|
| 106 |
-noinst_PROGRAMS = exampleBootstrapVarianceEst exampleCorrTest \ |
| 107 |
+check_PROGRAMS = exampleBootstrapVarianceEst exampleCorrTest \ |
| 108 |
exampleUserCuts exampleMatrixTest |
| 109 |
|
| 110 |
exampleBootstrapVarianceEst_SOURCES = exampleBootstrapVarianceEst.cc |
| 111 |
-exampleBootstrapVarianceEst_LDADD = $(APPLDADD) |
| 112 |
exampleCorrTest_SOURCES = exampleCorrTest.cc |
| 113 |
-exampleCorrTest_LDADD = $(APPLDADD) |
| 114 |
exampleMatrixTest_SOURCES = exampleMatrixTest.cc |
| 115 |
-exampleMatrixTest_LDADD = $(APPLDADD) |
| 116 |
|
| 117 |
bin_PROGRAMS = SprFisherLogitApp SprDecisionTreeApp SprExploratoryAnalysisApp \ |
| 118 |
SprMultiClassApp SprGoFDecisionTreeApp SprAdaBoostBinarySplitApp \ |
| 119 |
SprRBFNetApp SprAdaBoostDecisionTreeApp SprStdBackpropApp \ |
| 120 |
SprCombinerApp SprBaggerDecisionTreeApp SprBumpHunterApp \ |
| 121 |
SprInteractiveAnalysisApp SprOutputAnalyzerApp SprOutputWriterApp \ |
| 122 |
- SprBoosterApp SprBaggerApp exampleUserCuts \ |
| 123 |
+ SprBoosterApp SprBaggerApp \ |
| 124 |
SprVariableImportanceApp SprIOTestApp SprAddBaggersApp \ |
| 125 |
SprTransformationApp SprSplitterApp SprAddNRemoveRApp \ |
| 126 |
SprGEPApp SprCrossValidatorApp SprAddColumnsForMCLApp \ |
| 127 |
SprIndicatorMatrixApp |
| 128 |
|
| 129 |
SprFisherLogitApp_SOURCES = SprFisherLogitApp.cc |
| 130 |
-SprFisherLogitApp_LDADD = $(APPLDADD) |
| 131 |
SprDecisionTreeApp_SOURCES = SprDecisionTreeApp.cc |
| 132 |
-SprDecisionTreeApp_LDADD = $(APPLDADD) |
| 133 |
SprExploratoryAnalysisApp_SOURCES = SprExploratoryAnalysisApp.cc |
| 134 |
-SprExploratoryAnalysisApp_LDADD = $(APPLDADD) |
| 135 |
SprMultiClassApp_SOURCES = SprMultiClassApp.cc |
| 136 |
-SprMultiClassApp_LDADD = $(APPLDADD) |
| 137 |
SprGoFDecisionTreeApp_SOURCES = SprGoFDecisionTreeApp.cc |
| 138 |
-SprGoFDecisionTreeApp_LDADD = $(APPLDADD) |
| 139 |
SprAdaBoostBinarySplitApp_SOURCES = SprAdaBoostBinarySplitApp.cc |
| 140 |
-SprAdaBoostBinarySplitApp_LDADD = $(APPLDADD) |
| 141 |
SprRBFNetApp_SOURCES = SprRBFNetApp.cc |
| 142 |
-SprRBFNetApp_LDADD = $(APPLDADD) |
| 143 |
SprAdaBoostDecisionTreeApp_SOURCES = SprAdaBoostDecisionTreeApp.cc |
| 144 |
-SprAdaBoostDecisionTreeApp_LDADD = $(APPLDADD) |
| 145 |
SprStdBackpropApp_SOURCES = SprStdBackpropApp.cc |
| 146 |
-SprStdBackpropApp_LDADD = $(APPLDADD) |
| 147 |
SprCombinerApp_SOURCES = SprCombinerApp.cc |
| 148 |
-SprCombinerApp_LDADD = $(APPLDADD) |
| 149 |
SprBaggerDecisionTreeApp_SOURCES = SprBaggerDecisionTreeApp.cc |
| 150 |
-SprBaggerDecisionTreeApp_LDADD = $(APPLDADD) |
| 151 |
SprBumpHunterApp_SOURCES = SprBumpHunterApp.cc |
| 152 |
-SprBumpHunterApp_LDADD = $(APPLDADD) |
| 153 |
SprInteractiveAnalysisApp_SOURCES = SprInteractiveAnalysisApp.cc |
| 154 |
-SprInteractiveAnalysisApp_LDADD = $(APPLDADD) |
| 155 |
SprOutputAnalyzerApp_SOURCES = SprOutputAnalyzerApp.cc |
| 156 |
-SprOutputAnalyzerApp_LDADD = $(APPLDADD) |
| 157 |
SprOutputWriterApp_SOURCES = SprOutputWriterApp.cc |
| 158 |
-SprOutputWriterApp_LDADD = $(APPLDADD) |
| 159 |
SprBoosterApp_SOURCES = SprBoosterApp.cc |
| 160 |
-SprBoosterApp_LDADD = $(APPLDADD) |
| 161 |
SprBaggerApp_SOURCES = SprBaggerApp.cc |
| 162 |
-SprBaggerApp_LDADD = $(APPLDADD) |
| 163 |
exampleUserCuts_SOURCES = exampleUserCuts.cc |
| 164 |
-exampleUserCuts_LDADD = $(APPLDADD) |
| 165 |
SprVariableImportanceApp_SOURCES = SprVariableImportanceApp.cc |
| 166 |
-SprVariableImportanceApp_LDADD = $(APPLDADD) |
| 167 |
SprIOTestApp_SOURCES = SprIOTestApp.cc |
| 168 |
-SprIOTestApp_LDADD = $(APPLDADD) |
| 169 |
SprAddBaggersApp_SOURCES = SprAddBaggersApp.cc |
| 170 |
-SprAddBaggersApp_LDADD = $(APPLDADD) |
| 171 |
SprTransformationApp_SOURCES = SprTransformationApp.cc |
| 172 |
-SprTransformationApp_LDADD = $(APPLDADD) |
| 173 |
SprSplitterApp_SOURCES = SprSplitterApp.cc |
| 174 |
-SprSplitterApp_LDADD = $(APPLDADD) |
| 175 |
SprAddNRemoveRApp_SOURCES = SprAddNRemoveRApp.cc |
| 176 |
-SprAddNRemoveRApp_LDADD = $(APPLDADD) |
| 177 |
SprGEPApp_SOURCES = SprGEPApp.cc |
| 178 |
-SprGEPApp_LDADD = $(APPLDADD) |
| 179 |
SprCrossValidatorApp_SOURCES = SprCrossValidatorApp.cc |
| 180 |
-SprCrossValidatorApp_LDADD = $(APPLDADD) |
| 181 |
SprAddColumnsForMCLApp_SOURCES = SprAddColumnsForMCLApp.cc |
| 182 |
-SprAddColumnsForMCLApp_LDADD = $(APPLDADD) |
| 183 |
SprIndicatorMatrixApp_SOURCES = SprIndicatorMatrixApp.cc |
| 184 |
-SprIndicatorMatrixApp_LDADD = $(APPLDADD) |
| 185 |
+ |
| 186 |
|
| 187 |
|
| 188 |
|
| 189 |
1.1 sci-libs/spr/files/spr-3.3.2-gcc46.patch |
| 190 |
|
| 191 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spr/files/spr-3.3.2-gcc46.patch?rev=1.1&view=markup |
| 192 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spr/files/spr-3.3.2-gcc46.patch?rev=1.1&content-type=text/plain |
| 193 |
|
| 194 |
Index: spr-3.3.2-gcc46.patch |
| 195 |
=================================================================== |
| 196 |
diff -Nur SPR-3.3.2.orig/src/SprAddBaggersApp.cc SPR-3.3.2/src/SprAddBaggersApp.cc |
| 197 |
--- SPR-3.3.2.orig/src/SprAddBaggersApp.cc 2011-03-29 05:52:30.000000000 +0100 |
| 198 |
+++ SPR-3.3.2/src/SprAddBaggersApp.cc 2011-05-04 00:58:45.000000000 +0100 |
| 199 |
@@ -6,6 +6,7 @@ |
| 200 |
#include "StatPatternRecognition/SprClassifierReader.hh" |
| 201 |
#include "StatPatternRecognition/SprStringParser.hh" |
| 202 |
|
| 203 |
+#include <cstdio> |
| 204 |
#include <stdlib.h> |
| 205 |
#include <unistd.h> |
| 206 |
#include <iostream> |
| 207 |
diff -Nur SPR-3.3.2.orig/src/SprAddColumnsForMCLApp.cc SPR-3.3.2/src/SprAddColumnsForMCLApp.cc |
| 208 |
--- SPR-3.3.2.orig/src/SprAddColumnsForMCLApp.cc 2011-03-29 05:52:30.000000000 +0100 |
| 209 |
+++ SPR-3.3.2/src/SprAddColumnsForMCLApp.cc 2011-05-04 00:59:02.000000000 +0100 |
| 210 |
@@ -4,6 +4,7 @@ |
| 211 |
#include "StatPatternRecognition/SprMultiClassReader.hh" |
| 212 |
#include "StatPatternRecognition/SprTrainedMultiClassLearner.hh" |
| 213 |
|
| 214 |
+#include <cstdio> |
| 215 |
#include <stdlib.h> |
| 216 |
#include <unistd.h> |
| 217 |
#include <iostream> |
| 218 |
diff -Nur SPR-3.3.2.orig/src/SprIndicatorMatrixApp.cc SPR-3.3.2/src/SprIndicatorMatrixApp.cc |
| 219 |
--- SPR-3.3.2.orig/src/SprIndicatorMatrixApp.cc 2011-03-29 05:52:30.000000000 +0100 |
| 220 |
+++ SPR-3.3.2/src/SprIndicatorMatrixApp.cc 2011-05-04 00:59:31.000000000 +0100 |
| 221 |
@@ -4,6 +4,7 @@ |
| 222 |
#include "StatPatternRecognition/SprIndicatorMatrix.hh" |
| 223 |
#include "StatPatternRecognition/SprConfig.hh" |
| 224 |
|
| 225 |
+#include <cstdio> |
| 226 |
#include <iostream> |
| 227 |
#include <string> |
| 228 |
#include <unistd.h> |
Archives