[checkmk-commits] Fix linker hack to build rrdtool

Module: check_mk Branch: master Commit: 0eb749f01a5d504829b8c820da6f27cdd5a225bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0eb749f01a5d50… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Apr 1 11:15:04 2019 +0200 Fix linker hack to build rrdtool Change-Id: I23e0421187f43a093b082b4c269991edf39a1d5a --- Makefile | 4 ++-- omd/Licenses.csv | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 77ff279..5a154c9 100644 --- a/Makefile +++ b/Makefile @@ -399,8 +399,8 @@ config.status: $(CONFIG_DEPS) else \ BOOST_OPT="DUMMY1=" ; \ fi ; \ - if test -d "omd/rrdtool-1.7.0/src/.libs"; then \ - RRD_OPT="LDFLAGS=-L$(realpath omd/rrdtool-1.7.0/src/.libs)" ; \ + if test -d "omd/rrdtool-1.7.1/src/.libs"; then \ + RRD_OPT="LDFLAGS=-L$(realpath omd/rrdtool-1.7.1/src/.libs)" ; \ else \ RRD_OPT="DUMMY2=" ; \ fi ; \ diff --git a/omd/Licenses.csv b/omd/Licenses.csv index 5fa1b96..49005c6 100644 --- a/omd/Licenses.csv +++ b/omd/Licenses.csv @@ -20,11 +20,11 @@ net-snmp,5.8.dev,MIT - CMU style,https://fedoraproject.org/wiki/Licensing:MIT?rd NRPE,3.2.1,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/nrp…,,,, nsca,2.7.2,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/nsc… source code, binaries, documentation, and information contained in this distribution are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE. Nagios and the Nagios logo are registered trademarks of Ethan Galstad. All other trademarks, servicemarks, registered trademarks, and registered servicemarks are the property of their respective owner(s). ",,, nsca,2.9.1,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/nsc… source code, binaries, documentation, and information contained in this distribution are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE. Nagios and the Nagios logo are registered trademarks of Ethan Galstad. All other trademarks, servicemarks, registered trademarks, and registered servicemarks are the property of their respective owner(s).",,, -Open Hardware Monitor,0.8.0,MPL-2.0,https://opensource.org/licenses/MPL-2.0,omd/packages/…, The remainder of the software which is not under the Mozilla Public License 2.0 (MPL) is available under one of a variety of other licenses which are given below. Aga.Controls License WinRing0 License jQuery License Knockout License ,,, +Open Hardware Monitor,0.8.0,MPL-2.0,https://opensource.org/licenses/MPL-2.0,omd/packages/…, The remainder of the software which is not under the Mozilla Public License 2.0 (MPL) is available under one of a variety of other licenses which are given below. Aga.Controls License WinRing0 License jQuery License Knockout License ,,, pnp4nagios,0.6.26,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packa…,,,, Python-snap7,0.2.1,MIT,https://opensource.org/licenses/MIT,omd/packages/sna…,,,, re2,2018-02-01,BSD-3-Clause,https://opensource.org/licenses/BSD-3-Clause,om…,,, -rrdtool,1.7.0,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/rrdtool/rrdtool-1.7.0.tar.gz,,,, +rrdtool,1.7.1,GPL-2.0,https://opensource.org/licenses/GPL-2.0,omd/packages/rrdtool/rrdtool-1.7.1.tar.gz,,,, sapnwrfc,0.19,LGPL-2.1,https://opensource.org/licenses/LGPL-2.1,agents/sap/…,,,, SimpleIni,4.17,MIT,https://opensource.org/licenses/MIT,omd/packages/simplei…,,,, Snap7,1.3.0,LGPL-3.0,https://opensource.org/licenses/LGPL-3.0,omd/packages/…,,,,