Merge pull request #24 from rvianello/dev/update-cartridge-patch-files

update the rdkit-postgresql* patch files
rdkit · Aug 11, 2016 · 52b4d3c · 52b4d3c
2 parents 69c1598 + 9fd3d5f
commit 52b4d3c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/rdkit-postgresql/Makefile.patch b/rdkit-postgresql/Makefile.patch
@@ -1,5 +1,5 @@
 diff --git Code/PgSQL/rdkit/Makefile Code/PgSQL/rdkit/Makefile
-index 9e47b9f..13d7074 100644
+index 93bb807..9844f7f 100644
 --- Code/PgSQL/rdkit/Makefile
 +++ Code/PgSQL/rdkit/Makefile
 @@ -11,25 +11,28 @@
@@ -27,7 +27,7 @@ index 9e47b9f..13d7074 100644
    AVALONREGRESS=avalon
  endif
 
- POPCOUNTFLAGS=-mpopcnt
+ POPCOUNTFLAGS=-DUSE_BUILTIN_POPCOUNT -mpopcnt
 
  ifeq ($(USE_THREADS),1)
 -  THREADLIBS=-L${BOOSTHOME}/lib -lboost_thread -lboost_system

diff --git a/rdkit-postgresql/adapter.cpp.patch b/rdkit-postgresql/adapter.cpp.patch
@@ -1,10 +1,10 @@
 diff --git Code/PgSQL/rdkit/adapter.cpp Code/PgSQL/rdkit/adapter.cpp
-index 877e9cc..c733bd5 100644
+index 67bd996..1bcf1c1 100644
 --- Code/PgSQL/rdkit/adapter.cpp
 +++ Code/PgSQL/rdkit/adapter.cpp
-@@ -52,10 +52,10 @@
- #include <DataStructs/SparseIntVect.h>
- #include <boost/integer_traits.hpp>
+@@ -59,10 +59,10 @@
+ #include <RDGeneral/BoostEndInclude.h>
+
  #ifdef BUILD_INCHI_SUPPORT
 -#include <INCHI-API/inchi.h>
 +#include <GraphMol/inchi.h>
@@ -13,5 +13,5 @@ index 877e9cc..c733bd5 100644
 -#include <AvalonTools/AvalonTools.h>
 +#include <GraphMol/AvalonTools.h>
  #endif
- #include "rdkit.h"
  #include <GraphMol/ChemReactions/ReactionFingerprints.h>
+ #include <GraphMol/ChemReactions/ReactionUtils.h>
diff --git a/rdkit-postgresql95/Makefile.patch b/rdkit-postgresql95/Makefile.patch
@@ -1,5 +1,5 @@
 diff --git Code/PgSQL/rdkit/Makefile Code/PgSQL/rdkit/Makefile
-index 9e47b9f..13d7074 100644
+index 93bb807..9844f7f 100644
 --- Code/PgSQL/rdkit/Makefile
 +++ Code/PgSQL/rdkit/Makefile
 @@ -11,25 +11,28 @@
@@ -27,7 +27,7 @@ index 9e47b9f..13d7074 100644
    AVALONREGRESS=avalon
  endif
 
- POPCOUNTFLAGS=-mpopcnt
+ POPCOUNTFLAGS=-DUSE_BUILTIN_POPCOUNT -mpopcnt
 
  ifeq ($(USE_THREADS),1)
 -  THREADLIBS=-L${BOOSTHOME}/lib -lboost_thread -lboost_system

diff --git a/rdkit-postgresql95/adapter.cpp.patch b/rdkit-postgresql95/adapter.cpp.patch
@@ -1,10 +1,10 @@
 diff --git Code/PgSQL/rdkit/adapter.cpp Code/PgSQL/rdkit/adapter.cpp
-index 877e9cc..c733bd5 100644
+index 67bd996..1bcf1c1 100644
 --- Code/PgSQL/rdkit/adapter.cpp
 +++ Code/PgSQL/rdkit/adapter.cpp
-@@ -52,10 +52,10 @@
- #include <DataStructs/SparseIntVect.h>
- #include <boost/integer_traits.hpp>
+@@ -59,10 +59,10 @@
+ #include <RDGeneral/BoostEndInclude.h>
+
  #ifdef BUILD_INCHI_SUPPORT
 -#include <INCHI-API/inchi.h>
 +#include <GraphMol/inchi.h>
@@ -13,5 +13,5 @@ index 877e9cc..c733bd5 100644
 -#include <AvalonTools/AvalonTools.h>
 +#include <GraphMol/AvalonTools.h>
  #endif
- #include "rdkit.h"
  #include <GraphMol/ChemReactions/ReactionFingerprints.h>
+ #include <GraphMol/ChemReactions/ReactionUtils.h>