rpms
/
openbabel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- work around gcc bug: http://gcc.gnu.org/PR34708

This commit is contained in:
Dominik Mierzejewski 2008-01-07 22:20:36 +00:00
parent cc33a84b1c
commit 92e8cea974
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
openbabel-gcc43.patch
View File

@ -1,6 +1,6 @@
diff -up openbabel-2.1.1/src/dlhandler_unix.cpp.gcc43 openbabel-2.1.1/src/dlhandler_unix.cpp
--- openbabel-2.1.1/src/dlhandler_unix.cpp.gcc43 2007-04-14 02:34:11.000000000 +0200
+++ openbabel-2.1.1/src/dlhandler_unix.cpp 2008-01-06 20:50:56.000000000 +0100
+++ openbabel-2.1.1/src/dlhandler_unix.cpp 2008-01-07 23:15:46.000000000 +0100
@@ -25,6 +25,7 @@ GNU General Public License for more deta
#include <sys/stat.h>
#include <dlfcn.h>
@ -11,7 +11,7 @@ diff -up openbabel-2.1.1/src/dlhandler_unix.cpp.gcc43 openbabel-2.1.1/src/dlhand
diff -up openbabel-2.1.1/src/zipstreamimpl.h.gcc43 openbabel-2.1.1/src/zipstreamimpl.h
--- openbabel-2.1.1/src/zipstreamimpl.h.gcc43 2006-12-28 16:19:05.000000000 +0100
+++ openbabel-2.1.1/src/zipstreamimpl.h 2008-01-06 19:28:16.000000000 +0100
+++ openbabel-2.1.1/src/zipstreamimpl.h 2008-01-07 23:15:46.000000000 +0100
@@ -31,6 +31,8 @@ Altered by: Geoffrey Hutchison 2005 for
minor namespace modifications, VC++ compatibility
*/
@ -23,7 +23,7 @@ diff -up openbabel-2.1.1/src/zipstreamimpl.h.gcc43 openbabel-2.1.1/src/zipstream
//*****************************************************************************
diff -up openbabel-2.1.1/src/residue.cpp.gcc43 openbabel-2.1.1/src/residue.cpp
--- openbabel-2.1.1/src/residue.cpp.gcc43 2007-01-05 17:29:49.000000000 +0100
+++ openbabel-2.1.1/src/residue.cpp 2008-01-06 20:02:27.000000000 +0100
+++ openbabel-2.1.1/src/residue.cpp 2008-01-07 23:15:46.000000000 +0100
@@ -26,6 +26,8 @@ obtained in part or whole from RasMol2 b
// File Includes
///////////////////////////////////////////////////////////////////////////////
@ -35,7 +35,7 @@ diff -up openbabel-2.1.1/src/residue.cpp.gcc43 openbabel-2.1.1/src/residue.cpp
#include <openbabel/residue.h>
diff -up openbabel-2.1.1/src/tokenst.cpp.gcc43 openbabel-2.1.1/src/tokenst.cpp
--- openbabel-2.1.1/src/tokenst.cpp.gcc43 2006-12-28 16:21:51.000000000 +0100
+++ openbabel-2.1.1/src/tokenst.cpp 2008-01-06 20:33:49.000000000 +0100
+++ openbabel-2.1.1/src/tokenst.cpp 2008-01-07 23:15:46.000000000 +0100
@@ -25,7 +25,7 @@ GNU General Public License for more deta
#include <algorithm>
#include <vector>
@ -47,7 +47,7 @@ diff -up openbabel-2.1.1/src/tokenst.cpp.gcc43 openbabel-2.1.1/src/tokenst.cpp
diff -up openbabel-2.1.1/src/obconversion.cpp.gcc43 openbabel-2.1.1/src/obconversion.cpp
--- openbabel-2.1.1/src/obconversion.cpp.gcc43 2007-07-01 21:16:17.000000000 +0200
+++ openbabel-2.1.1/src/obconversion.cpp 2008-01-06 19:48:30.000000000 +0100
+++ openbabel-2.1.1/src/obconversion.cpp 2008-01-07 23:15:46.000000000 +0100
@@ -37,6 +37,7 @@ GNU General Public License for more deta
#include <sstream>
#include <string>
@ -58,7 +58,7 @@ diff -up openbabel-2.1.1/src/obconversion.cpp.gcc43 openbabel-2.1.1/src/obconver
diff -up openbabel-2.1.1/src/formats/rxnformat.cpp.gcc43 openbabel-2.1.1/src/formats/rxnformat.cpp
--- openbabel-2.1.1/src/formats/rxnformat.cpp.gcc43 2007-03-12 15:23:38.000000000 +0100
+++ openbabel-2.1.1/src/formats/rxnformat.cpp 2008-01-06 21:27:56.000000000 +0100
+++ openbabel-2.1.1/src/formats/rxnformat.cpp 2008-01-07 23:15:46.000000000 +0100
@@ -18,6 +18,8 @@ GNU General Public License for more deta
#pragma warning (disable : 4251) //
#endif
@ -70,7 +70,7 @@ diff -up openbabel-2.1.1/src/formats/rxnformat.cpp.gcc43 openbabel-2.1.1/src/for
#include <openbabel/mol.h>
diff -up openbabel-2.1.1/src/formats/fchkformat.cpp.gcc43 openbabel-2.1.1/src/formats/fchkformat.cpp
--- openbabel-2.1.1/src/formats/fchkformat.cpp.gcc43 2007-03-12 18:42:23.000000000 +0100
+++ openbabel-2.1.1/src/formats/fchkformat.cpp 2008-01-06 21:27:44.000000000 +0100
+++ openbabel-2.1.1/src/formats/fchkformat.cpp 2008-01-07 23:15:46.000000000 +0100
@@ -12,6 +12,7 @@ GNU General Public License for more deta
***********************************************************************/
@ -81,7 +81,7 @@ diff -up openbabel-2.1.1/src/formats/fchkformat.cpp.gcc43 openbabel-2.1.1/src/fo
// #include <eigen/matrix.h>
diff -up openbabel-2.1.1/src/fingerprint.cpp.gcc43 openbabel-2.1.1/src/fingerprint.cpp
--- openbabel-2.1.1/src/fingerprint.cpp.gcc43 2007-06-02 15:56:31.000000000 +0200
+++ openbabel-2.1.1/src/fingerprint.cpp 2008-01-06 19:17:45.000000000 +0100
+++ openbabel-2.1.1/src/fingerprint.cpp 2008-01-07 23:15:46.000000000 +0100
@@ -21,7 +21,7 @@ GNU General Public License for more deta
#include <vector>
#include <algorithm>
@ -91,9 +91,21 @@ diff -up openbabel-2.1.1/src/fingerprint.cpp.gcc43 openbabel-2.1.1/src/fingerpri
#include <fstream>
#include <openbabel/fingerprint.h>
diff -up openbabel-2.1.1/scripts/perl/openbabel_perl.cpp.gcc43 openbabel-2.1.1/scripts/perl/openbabel_perl.cpp
--- openbabel-2.1.1/scripts/perl/openbabel_perl.cpp.gcc43 2007-07-01 22:14:02.000000000 +0200
+++ openbabel-2.1.1/scripts/perl/openbabel_perl.cpp 2008-01-07 23:18:45.000000000 +0100
@@ -814,7 +814,7 @@ extern "C" {
* ----------------------------------------------------------------------------- */
SWIGINTERN const char*
-SWIG_Perl_ErrorType(int code) {
+SWIG_Perl_ErrorType(int code) __attribute__((noinline)) {
const char* type = 0;
switch(code) {
case SWIG_MemoryError:
diff -up openbabel-2.1.1/include/openbabel/xml.h.gcc43 openbabel-2.1.1/include/openbabel/xml.h
--- openbabel-2.1.1/include/openbabel/xml.h.gcc43 2008-01-06 21:15:09.000000000 +0100
+++ openbabel-2.1.1/include/openbabel/xml.h 2008-01-06 21:14:42.000000000 +0100
--- openbabel-2.1.1/include/openbabel/xml.h.gcc43 2007-02-26 17:28:03.000000000 +0100
+++ openbabel-2.1.1/include/openbabel/xml.h 2008-01-07 23:15:46.000000000 +0100
@@ -13,6 +13,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICU
GNU General Public License for more details.
***********************************************************************/
@ -105,7 +117,7 @@ diff -up openbabel-2.1.1/include/openbabel/xml.h.gcc43 openbabel-2.1.1/include/o
#include <openbabel/obmolecformat.h>
diff -up openbabel-2.1.1/include/openbabel/obconversion.h.gcc43 openbabel-2.1.1/include/openbabel/obconversion.h
--- openbabel-2.1.1/include/openbabel/obconversion.h.gcc43 2007-06-02 15:56:37.000000000 +0200
+++ openbabel-2.1.1/include/openbabel/obconversion.h 2008-01-06 19:26:57.000000000 +0100
+++ openbabel-2.1.1/include/openbabel/obconversion.h 2008-01-07 23:15:46.000000000 +0100
@@ -28,6 +28,7 @@ GNU General Public License for more deta
#include <string>
#include <vector>
@ -116,7 +128,7 @@ diff -up openbabel-2.1.1/include/openbabel/obconversion.h.gcc43 openbabel-2.1.1/
#include <openbabel/oberror.h>
diff -up openbabel-2.1.1/include/openbabel/data.h.gcc43 openbabel-2.1.1/include/openbabel/data.h
--- openbabel-2.1.1/include/openbabel/data.h.gcc43 2007-04-14 02:34:14.000000000 +0200
+++ openbabel-2.1.1/include/openbabel/data.h 2008-01-06 19:03:06.000000000 +0100
+++ openbabel-2.1.1/include/openbabel/data.h 2008-01-07 23:15:46.000000000 +0100
@@ -23,7 +23,7 @@ GNU General Public License for more deta
#include <openbabel/babelconfig.h>
@ -128,7 +140,7 @@ diff -up openbabel-2.1.1/include/openbabel/data.h.gcc43 openbabel-2.1.1/include/
#include <string>
diff -up openbabel-2.1.1/include/openbabel/obmolecformat.h.gcc43 openbabel-2.1.1/include/openbabel/obmolecformat.h
--- openbabel-2.1.1/include/openbabel/obmolecformat.h.gcc43 2007-02-26 17:46:15.000000000 +0100
+++ openbabel-2.1.1/include/openbabel/obmolecformat.h 2008-01-06 21:14:18.000000000 +0100
+++ openbabel-2.1.1/include/openbabel/obmolecformat.h 2008-01-07 23:15:46.000000000 +0100
@@ -23,6 +23,8 @@ GNU General Public License for more deta
#include <hash_map>
#endif
@ -140,7 +152,7 @@ diff -up openbabel-2.1.1/include/openbabel/obmolecformat.h.gcc43 openbabel-2.1.1
diff -up openbabel-2.1.1/include/openbabel/lineend.h.gcc43 openbabel-2.1.1/include/openbabel/lineend.h
--- openbabel-2.1.1/include/openbabel/lineend.h.gcc43 2007-06-02 15:56:39.000000000 +0200
+++ openbabel-2.1.1/include/openbabel/lineend.h 2008-01-06 21:06:17.000000000 +0100
+++ openbabel-2.1.1/include/openbabel/lineend.h 2008-01-07 23:15:46.000000000 +0100
@@ -21,6 +21,7 @@ General Public License for more details.
#define OB_LINEEND_H
@ -151,7 +163,7 @@ diff -up openbabel-2.1.1/include/openbabel/lineend.h.gcc43 openbabel-2.1.1/inclu
#define OBCONV
diff -up openbabel-2.1.1/tools/babel.cpp.gcc43 openbabel-2.1.1/tools/babel.cpp
--- openbabel-2.1.1/tools/babel.cpp.gcc43 2007-07-07 08:35:54.000000000 +0200
+++ openbabel-2.1.1/tools/babel.cpp 2008-01-06 21:38:49.000000000 +0100
+++ openbabel-2.1.1/tools/babel.cpp 2008-01-07 23:15:46.000000000 +0100
@@ -35,6 +35,7 @@ GNU General Public License for more deta
#include <conio.h>
#endif

5
openbabel.spec
View File

@ -5,7 +5,7 @@
Name: openbabel
Version: 2.1.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Chemistry software file format converter
License: GPLv2
Group: Applications/File
@ -147,6 +147,9 @@ popd
%{python_sitearch}/openbabel*.egg-info
%changelog
* Mon Jan 07 2008 Dominik Mierzejewski <rpm@greysector.net> 2.1.1-4
- work around gcc bug: http://gcc.gnu.org/PR34708
* Sun Jan 06 2008 Dominik Mierzejewski <rpm@greysector.net> 2.1.1-3
- fix build with gcc-4.3
- include python egg-info