summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2018-07-17 16:30:57 +0100
committerTony Vroon <chainsaw@gentoo.org>2018-07-17 16:32:05 +0100
commita7f55c68595131e83645bd49315009719269f53c (patch)
treeb48b1907df4263a08f70339f065b0fc2e0e002ec /dev-db
parentapp-misc/faq: Version bump to 0.0.2 (diff)
downloadgentoo-a7f55c68595131e83645bd49315009719269f53c.tar.gz
gentoo-a7f55c68595131e83645bd49315009719269f53c.tar.bz2
gentoo-a7f55c68595131e83645bd49315009719269f53c.zip
dev-db/tokumx: Ensure null pointer checks are not optimised away.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch23
-rw-r--r--dev-db/tokumx/tokumx-2.0.2-r2.ebuild (renamed from dev-db/tokumx/tokumx-2.0.2-r1.ebuild)1
2 files changed, 24 insertions, 0 deletions
diff --git a/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch b/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch
new file mode 100644
index 000000000000..551770553d77
--- /dev/null
+++ b/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch
@@ -0,0 +1,23 @@
+diff -uNr tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt tokumx-enterprise-2.0.2/CMakeLists.txt
+--- tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt 2018-07-17 16:20:18.712013701 +0100
++++ tokumx-enterprise-2.0.2/CMakeLists.txt 2018-07-17 16:22:06.063018495 +0100
+@@ -83,7 +83,7 @@
+ endmacro(set_cxxflags_if_supported)
+
+ set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
+-set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
++set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -fno-delete-null-pointer-checks -ggdb")
+ set_cxxflags_if_supported(
+ -Wall
+ -Wsign-compare
+diff -uNr tokumx-enterprise-2.0.2.ORIG/SConstruct tokumx-enterprise-2.0.2/SConstruct
+--- tokumx-enterprise-2.0.2.ORIG/SConstruct 2018-07-17 16:20:18.712013701 +0100
++++ tokumx-enterprise-2.0.2/SConstruct 2018-07-17 16:22:40.459020031 +0100
+@@ -702,6 +702,7 @@
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+ env.Append( CCFLAGS=["-fPIC",
+ "-fno-strict-aliasing",
++ "-fno-delete-null-pointer-checks",
+ "-ggdb",
+ "-pthread",
+ "-Wall",
diff --git a/dev-db/tokumx/tokumx-2.0.2-r1.ebuild b/dev-db/tokumx/tokumx-2.0.2-r2.ebuild
index 866bdec8d243..b1fbf2a7fdf9 100644
--- a/dev-db/tokumx/tokumx-2.0.2-r1.ebuild
+++ b/dev-db/tokumx/tokumx-2.0.2-r2.ebuild
@@ -43,6 +43,7 @@ src_prepare() {
eapply "${FILESDIR}/${P}-boost-57.patch"
eapply "${FILESDIR}/${P}-gcc-7.patch"
eapply "${FILESDIR}/${P}-undefined-reference.patch"
+ eapply "${FILESDIR}/${P}-no-delete-null-pointer-checks.patch"
cmake-utils_src_prepare
}