aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
committerEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
commit3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40 (patch)
tree0cc82498adcf7e3fdde6a370e4fdd4f510ca5167 /sci-misc/salome-component/files
parentAdd hydra pm. #309353 (diff)
downloadsci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.gz
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.bz2
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.zip
sci-misc/salome-* : Version bump (5.1.3) + removed broken 3.2.6
Diffstat (limited to 'sci-misc/salome-component/files')
-rw-r--r--sci-misc/salome-component/files/salome-component-3.2.6-gcc-4.3.patch11
-rw-r--r--sci-misc/salome-component/files/salome-component-3.2.6.patch28
-rw-r--r--sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch11
3 files changed, 11 insertions, 39 deletions
diff --git a/sci-misc/salome-component/files/salome-component-3.2.6-gcc-4.3.patch b/sci-misc/salome-component/files/salome-component-3.2.6-gcc-4.3.patch
deleted file mode 100644
index 51c3c0d37..000000000
--- a/sci-misc/salome-component/files/salome-component-3.2.6-gcc-4.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur src3.2.6.old/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx src3.2.6/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx
---- src3.2.6.old/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx 2008-05-25 19:32:48.000000000 +0200
-+++ src3.2.6/COMPONENT_SRC_3.2.6/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx 2008-05-26 02:08:55.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <fstream>
- #include <strstream>
- #include <string>
-+#include <cstring>
- #include <math.h>
-
- using namespace std;
diff --git a/sci-misc/salome-component/files/salome-component-3.2.6.patch b/sci-misc/salome-component/files/salome-component-3.2.6.patch
deleted file mode 100644
index 466118455..000000000
--- a/sci-misc/salome-component/files/salome-component-3.2.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./COMPONENT_SRC_3.2.6/build_configure.org 2007-04-24 18:40:50.000000000 +0200
-+++ ./COMPONENT_SRC_3.2.6/build_configure 2008-02-21 09:57:25.000000000 +0100
-@@ -144,7 +144,7 @@
-
- # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
- echo "" >> configure.in_tmp1
--echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
-+echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
-
- echo "" >> configure.in_tmp1
- echo "AC_OUTPUT([ \\" >> configure.in_tmp1
---- ./COMPONENT_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:40:50.000000000 +0200
-+++ ./COMPONENT_SRC_3.2.6/adm_local/Makefile.in 2008-02-21 09:58:54.000000000 +0100
-@@ -26,12 +26,12 @@
- all: resources
-
- install:
-- cp -rf @top_srcdir@/adm_local @prefix@
-+# cp -rf @top_srcdir@/adm_local @prefix@
-
- bin:
-
- resources :
-- cp -rf @top_srcdir@/adm_local $(top_builddir)
-+# cp -rf @top_srcdir@/adm_local $(top_builddir)
-
- inc:
-
diff --git a/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch b/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch
new file mode 100644
index 000000000..e9e920c8e
--- /dev/null
+++ b/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch
@@ -0,0 +1,11 @@
+--- src5.1.3.orig/COMPONENT_SRC_5.1.3/src/AddComponent/Makefile.in 2010-03-07 22:08:31.371569651 +0100
++++ src5.1.3/COMPONENT_SRC_5.1.3/src/AddComponent/Makefile.in 2010-03-07 22:09:05.060321118 +0100
+@@ -571,7 +571,7 @@
+ done
+ AddComponent_CheckOfUndefined$(EXEEXT): $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_DEPENDENCIES)
+ @rm -f AddComponent_CheckOfUndefined$(EXEEXT)
+- $(AddComponent_CheckOfUndefined_LINK) $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_LDADD) $(LIBS)
++ $(AddComponent_CheckOfUndefined_LINK) $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_LDADD) $(LIBS) $(MPI_LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)