From 553e6a3628fc4aa13a6c5cea1a498f2818c68efc Mon Sep 17 00:00:00 2001 From: danieltourde Date: Thu, 29 May 2008 15:24:52 +0000 Subject: Added Gcc-4.3 support. Thanks to Bert K. for his patches! git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1112 32389bae-6d03-0410-99cf-db05cde120eb --- sci-misc/salome-kernel/Changelog | 4 ++ sci-misc/salome-kernel/Manifest | 5 +- .../files/salome-kernel-3.2.6-gcc-4.3.patch | 69 ++++++++++++++++++++++ sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild | 4 ++ 4 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 sci-misc/salome-kernel/files/salome-kernel-3.2.6-gcc-4.3.patch (limited to 'sci-misc/salome-kernel') diff --git a/sci-misc/salome-kernel/Changelog b/sci-misc/salome-kernel/Changelog index a726f488a..1dc37bd0c 100644 --- a/sci-misc/salome-kernel/Changelog +++ b/sci-misc/salome-kernel/Changelog @@ -1,5 +1,9 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 May 2008; Daniel Tourde + +salome-kernel-3.2.6-gcc-4.3.patch + Added support to gcc-4.3. Patch provided by Bert Karwatzki + 20 May 2008; Daniel Tourde Initial import. +salome-kernel-3.2.6.ebuild, +salome-kernel-3.2.6_omniorg.patch, +salome-kernel-gcc4.patch, +salome-kernel-3.2.6-Batch_Couple.patch, +salome-kernel-3.2.6_openpbs.patch, +salome-kernel.png, +salome-kernel-3.2.6-mpich2.patch, +salome-kernel-3.2.6-pyobject.patch diff --git a/sci-misc/salome-kernel/Manifest b/sci-misc/salome-kernel/Manifest index 4b37481dc..77a7d90bb 100644 --- a/sci-misc/salome-kernel/Manifest +++ b/sci-misc/salome-kernel/Manifest @@ -1,4 +1,5 @@ AUX salome-kernel-3.2.6-Batch_Couple.patch 324 RMD160 42284ee163672fc686f9ae3dc79b485058781de2 SHA1 8f9b1aba0e80dc41214290c59e233f000e93d8bc SHA256 fec452f836727542d86d126b17e4143c2a8cd2ecce890a159b9c6dd40964b605 +AUX salome-kernel-3.2.6-gcc-4.3.patch 2841 RMD160 4c77d45f706cba13e03b338c12f6bf95ebf97d95 SHA1 e30d7186cbdd0f848b2182eb587ef0503534f9e7 SHA256 13fab12559ac078c287d22f789b8b733cd79e57f558e9cad706183172ebff2b5 AUX salome-kernel-3.2.6-mpich2.patch 1421 RMD160 be3b85bf0799e90e57c32541aaf76ab9a0492f98 SHA1 99871487a1276356a1ceba1dd575f5b95561eb20 SHA256 793a1b0536329733d0ad65819e97a6ea0a328b72661eebe49ea6828a34de08fa AUX salome-kernel-3.2.6-pyobject.patch 7085 RMD160 db7d5bcccc78f9f1a2a2a0148bd7eadcdcb89fc5 SHA1 d661823bac9249065a3e55055f4947876289c97f SHA256 88f19a09ce6f81e18f6f908a74c683cb2940e0fae413e5e6d8c8a499874b0a09 AUX salome-kernel-3.2.6_omniorg.patch 159 RMD160 6071fe5caa4b2d38bc34e26dfeb5c2b56a501b1d SHA1 1e441ed3543def24cf3fd06fc569b62efa078c10 SHA256 b7effbbb105a57c0f342d55881733d125aff63435605fbf4c2036e556e2a71a0 @@ -6,5 +7,5 @@ AUX salome-kernel-3.2.6_openpbs.patch 847 RMD160 f41b3adde69f2958941643da10b7551 AUX salome-kernel-gcc4.patch 5928 RMD160 9fa81eeac2d5dbb64b3137e711553b4b76bc9e08 SHA1 59eeee6e19b3e5e6c5490b8fbf9e4b67e9ecd9db SHA256 6c5a19dac8893c054c03467a4e463aa582b88c22c37a7d2ce88ba75f918e06dc AUX salome-kernel.png 1934 RMD160 700c6d3a96df0576582af4c2d77f1588cf385ab6 SHA1 4aca0bb3b2331ec4253fdc299777012501841508 SHA256 df2ee182545ccaf1081bd3687b984ccd0b4d0166698cd7a403f138055bcb8ec2 DIST salome-3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258 -EBUILD salome-kernel-3.2.6.ebuild 5512 RMD160 0e0551e6f82dae8de8b1e670813f4b6ddbb47062 SHA1 bf94471116e7984bd63bf75d63e96fbfb0f5b0fa SHA256 267eb35be5b98acbbb2c67a33094fe887aac5269d6594bde5caeffe67e7f33bb -MISC Changelog 774 RMD160 525f58218dd3df8a7f78b4fc971f5db4cb5cd03f SHA1 968bb7e952e0849c4af314d73c1ebd6adeb44aec SHA256 8dd0b2e080bc418b2e2495f28a993d58a3a9c855376d5af6099792dd9e874f6f +EBUILD salome-kernel-3.2.6.ebuild 5629 RMD160 e4912e3ac7713bb43c54f46f0d03d2e3db65a829 SHA1 8059bc41e55219e77fdafbf9988ee0d57a62cffd SHA256 745db78d6d6261c69719fa3b088b1f3b67b9c80ab7c33dee847fef9b2402a995 +MISC Changelog 947 RMD160 6186f62a12842f043a018857248b92eeef8b43be SHA1 e6a1db7e1e8da1feda40a14631a7bcb8cc63ca34 SHA256 b6327993044e57db12c967de7492267a5d5a10585798f13bb21652bbc8de2d60 diff --git a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-gcc-4.3.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-gcc-4.3.patch new file mode 100644 index 000000000..94257b4b2 --- /dev/null +++ b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-gcc-4.3.patch @@ -0,0 +1,69 @@ +diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx +--- src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx 2008-05-25 19:32:46.000000000 +0200 ++++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx 2008-05-25 23:14:01.000000000 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx +--- src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx 2008-05-25 19:32:46.000000000 +0200 ++++ src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx 2008-05-25 22:59:09.000000000 +0200 +@@ -12,7 +12,8 @@ + #define SALOME_Logger_Server_include + + #ifndef WNT +-#include ++#include ++#include + #else + #include + #include +@@ -41,7 +42,7 @@ + bool m_putIntoFile; + //ofstream class specialized for disk file output + #ifndef WNT +- ofstream m_outputFile; ++ std::ofstream m_outputFile; + #else + std::ofstream m_outputFile; + #endif +diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx +--- src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx 2008-05-25 19:32:46.000000000 +0200 ++++ src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx 2008-05-25 22:06:37.000000000 +0200 +@@ -9,6 +9,7 @@ + // Module : SALOME + + #include ++#include + #include "SALOME_Logger_Server.hxx" + #include + #include +diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx src3.2.6/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx +--- src3.2.6.old/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx 2008-05-25 19:32:46.000000000 +0200 ++++ src3.2.6/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx 2008-05-25 19:34:23.000000000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #ifndef WNT + #include +diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx src3.2.6/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx +--- src3.2.6.old/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx 2008-05-25 19:32:46.000000000 +0200 ++++ src3.2.6/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx 2008-05-25 23:04:39.000000000 +0200 +@@ -41,8 +41,8 @@ + + #ifndef WNT + #include +-#include +-#include ++#include ++#include + #include + #else + #endif diff --git a/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild b/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild index c5596846d..2d1d10325 100644 --- a/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild +++ b/sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild @@ -82,6 +82,10 @@ src_unpack() # Fix for mpich2 detection, this is also used by salome-component at least epatch "${FILESDIR}"/${P}-mpich2.patch + # Gcc 4.3 support + if version_is_at_least "4.1" $(gcc-version) ; then + epatch "${FILESDIR}"/${P}-gcc-4.3.patch + fi # Correct the Salome version number sed -i "s:3.2.5:3.2.6:g" configure.ac -- cgit v1.2.3