[checkmk-commits] Unbreak mysqlclient on CentOS 5.

Module: check_mk Branch: master Commit: 561400b0957c8eb051b217d3390a2ac2829f2bca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=561400b0957c8e… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Fri Nov 9 13:42:43 2018 +0100 Unbreak mysqlclient on CentOS 5. Change-Id: I1589b2f96960ca60e36b87dc72e1040db1d32b7c --- omd/packages/python-modules/Makefile | 2 ++ .../patches/0018-mysqlclient-fortify-source.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 67881d8..f8028ad 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -5,6 +5,7 @@ SHELL = /bin/bash VERSION = $(OMD_VERSION) PATCHES := $(wildcard patches/*.dif) +PATCHES += patches/0018-mysqlclient-fortify-source.patch MODULES = @@ -28,6 +29,7 @@ MODULES += pymssql-2.1.3.tar.gz # needed for check_sql (together with freetds) LEGACY_LDAP=0 ifeq ($(DISTRO_CODE),el5) LEGACY_LDAP=1 + PATCHES += patches/0018-mysqlclient-fortify-source.patch endif ifeq ($(LEGACY_LDAP), 1) diff --git a/omd/packages/python-modules/patches/0018-mysqlclient-fortify-source.patch b/omd/packages/python-modules/patches/0018-mysqlclient-fortify-source.patch new file mode 100644 index 0000000..eb6f05b --- /dev/null +++ b/omd/packages/python-modules/patches/0018-mysqlclient-fortify-source.patch @@ -0,0 +1,14 @@ +diff -Nur dest/mysqlclient-1.3.13.orig/_mysql.c dest/mysqlclient-1.3.13/_mysql.c +--- dest/mysqlclient-1.3.13.orig/_mysql.c 2017-12-21 12:09:51.000000000 +0100 ++++ dest/mysqlclient-1.3.13/_mysql.c 2018-11-09 13:36:46.859066671 +0100 +@@ -1,3 +1,10 @@ ++/* CentOS 5's <unistd.h>, _FORTIFY_SOURCE and more recent GCCs don't like each ++ * other, leading to invalid asssembler: ++ * ++ * {standard input}: Assembler messages: ++ * {standard input}:3177: Error: symbol `pread64' is already defined ++ */ ++#undef _FORTIFY_SOURCE + /* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by