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-yacs/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-yacs/files')
-rw-r--r--sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch13
-rw-r--r--sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch14
-rw-r--r--sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch22
3 files changed, 49 insertions, 0 deletions
diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch
new file mode 100644
index 000000000..6c83be8e7
--- /dev/null
+++ b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch
@@ -0,0 +1,13 @@
+Files src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/.ac_python_devel.m4.swp and src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/.ac_python_devel.m4.swp differ
+diff -ur src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4 src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4
+--- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4 2010-03-08 20:51:25.810829226 +0100
++++ src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4 2010-03-08 20:53:41.330413913 +0100
+@@ -48,7 +48,7 @@
+ # Check for Python library path
+ AC_MSG_CHECKING([for Python library path])
+ python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
++ for i in "$python_path/lib$LIB_LOCATION_SUFFIX" "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/config/" "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/" "$python_path/lib$LIB_LOCATION_SUFFIX/python/config/" "$python_path/lib$LIB_LOCATION_SUFFIX/python/" "$python_path/" ; do
+ python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
+ if test -n "$python_path" ; then
+ break
diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch
new file mode 100644
index 000000000..9eb803582
--- /dev/null
+++ b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch
@@ -0,0 +1,14 @@
+diff -ur src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4 src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4
+--- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4 2010-03-08 20:39:54.160326435 +0100
++++ src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4 2010-03-08 20:40:58.590323448 +0100
+@@ -23,6 +23,10 @@
+
+ AC_CHECKING(for LIB_LOCATION_SUFFIX)
+ LIB_LOCATION_SUFFIX=""
++ case "$build_cpu" in
++ x86_64*) LIB_LOCATION_SUFFIX="64" ;;
++ *) LIB_LOCATION_SUFFIX="" ;;
++ esac
+ AC_SUBST(LIB_LOCATION_SUFFIX)
+ AC_MSG_RESULT(LIB_LOCATION_SUFFIX is $LIB_LOCATION_SUFFIX)
+
diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch
new file mode 100644
index 000000000..b4a2a50c8
--- /dev/null
+++ b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch
@@ -0,0 +1,22 @@
+--- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/make_begin.am 2010-03-10 15:45:32.281101526 +0100
++++ src5.1.3/YACS_SRC_5.1.3/adm/unix/make_begin.am 2010-03-10 15:46:58.440251953 +0100
+@@ -22,7 +22,7 @@
+
+ # Standard directory for installation
+ salomeincludedir = $(includedir)/salome
+-libdir = $(prefix)/lib/salome
++libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
+ bindir = $(prefix)/bin/salome
+ salomescriptdir = $(bindir)
+ salomepythondir = $(pythondir)/salome
+--- src5.1.3.orig/YACS_SRC_5.1.3/src/genericgui/Makefile.am 2010-03-10 16:26:05.424066867 +0100
++++ src5.1.3/YACS_SRC_5.1.3/src/genericgui/Makefile.am 2010-03-10 16:26:41.450302694 +0100
+@@ -16,7 +16,7 @@
+ #
+ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ #
+-libdir = $(prefix)/lib/salome
++libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
+ bindir = $(prefix)/bin/salome
+
+ lib_LTLIBRARIES = libGenericGui.la