[checkmk-commits] Extracted Perl 5 library search path during building.

Module: check_mk Branch: master Commit: 189d8a859f720500f1804b97dc9f73e719ce06a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=189d8a859f7205… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Tue Jan 16 11:26:35 2018 +0100 Extracted Perl 5 library search path during building. Change-Id: I2412c1b1fd59d95d3bc193dc3e593190c0715b6d --- omd/Makefile.omd | 1 + omd/packages/check_webinject/Makefile | 2 +- omd/packages/jmx4perl/Makefile | 2 +- omd/packages/perl-modules/Makefile | 8 ++++---- omd/packages/rrdtool/Makefile | 14 +++++++------- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 8d3c43c..e15f4a4 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -44,6 +44,7 @@ include $(REPO_PATH)/omd/distros/$(DISTRO_NAME)_$(DISTRO_VERSION).mk PERL := /usr/bin/perl P5TMPDIST := $(REPO_PATH)/omd/packages/perl-modules/dist +LOCAL_PERL5LIB := $(P5TMPDIST)/dest/lib/perl5 TMP_PYTHON_PATH := $(REPO_PATH)/omd/packages/python/tmp.python27 PYTHON_LIB := $(TMP_PYTHON_PATH)/lib/python2.7 diff --git a/omd/packages/check_webinject/Makefile b/omd/packages/check_webinject/Makefile index 380bf4e..7dd2d2c 100644 --- a/omd/packages/check_webinject/Makefile +++ b/omd/packages/check_webinject/Makefile @@ -12,7 +12,7 @@ build: echo "applying $$p..." ; \ patch -p1 -d $(DIR) < $$p ; \ done - export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5; \ + export PERL5LIB=$(LOCAL_PERL5LIB); \ cd $(DIR) && echo "" | $(PERL) Makefile.PL cd $(DIR) && $(MAKE) check_webinject diff --git a/omd/packages/jmx4perl/Makefile b/omd/packages/jmx4perl/Makefile index 37db0ae..b951169 100644 --- a/omd/packages/jmx4perl/Makefile +++ b/omd/packages/jmx4perl/Makefile @@ -13,7 +13,7 @@ build: # echo "applying $$p..." ; \ # ( cd $(DIR) ; patch -p1 -b ) < $$p ; \ # done - export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5; \ + export PERL5LIB=$(LOCAL_PERL5LIB); \ cd $(DIR) && $(PERL) Build.PL < /dev/null >build.log 2>&1 cd $(DIR) && ./Build diff --git a/omd/packages/perl-modules/Makefile b/omd/packages/perl-modules/Makefile index c57b44f..c30bccf 100644 --- a/omd/packages/perl-modules/Makefile +++ b/omd/packages/perl-modules/Makefile @@ -97,7 +97,7 @@ build: export PERL_MM_OPT=INSTALL_BASE=$(P5TMPDIST)/dest; \ export PERL_MB_OPT=--install_base=$(P5TMPDIST)/dest; \ export MODULEBUILDRC=$(P5TMPDIST)/dest/.modulebuildrc; \ - export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5:$(P5TMPDIST)/src/lib:$(P5TMPDIST)/src/Crypt-SSLeay-0.72; \ + export PERL5LIB=$(LOCAL_PERL5LIB):$(P5TMPDIST)/src/lib:$(P5TMPDIST)/src/Crypt-SSLeay-0.72; \ cd $(P5TMPDIST)/src && \ FORCE=1 ./build_module.pl -d "$(DISTRO)" -p $(P5TMPDIST)/dest \ ExtUtils-MakeMaker-*.tar.gz \ @@ -110,9 +110,9 @@ build: export PERL_JSON_BACKEND='JSON::XS'; \ cd $(P5TMPDIST)/src && \ ./build_module.pl -d "$(DISTRO)" -p $(P5TMPDIST)/dest $(MODULES) - cd $(P5TMPDIST)/dest/lib/perl5/ && rm -f utils.pm && ln -s ../../../nagios/plugins/utils.pm . - mkdir -p $(P5TMPDIST)/dest/lib/perl5/CPAN - cp MyConfig.pm $(P5TMPDIST)/dest/lib/perl5/CPAN/MyConfig.skel + cd $(LOCAL_PERL5LIB)/ && rm -f utils.pm && ln -s ../../../nagios/plugins/utils.pm . + mkdir -p $(LOCAL_PERL5LIB)/CPAN + cp MyConfig.pm $(LOCAL_PERL5LIB)/CPAN/MyConfig.skel install: if [ -z $(DESTDIR) ]; then echo "cannot install without DESTDIR set!"; exit 1; fi diff --git a/omd/packages/rrdtool/Makefile b/omd/packages/rrdtool/Makefile index f9bb3be..55641b3 100644 --- a/omd/packages/rrdtool/Makefile +++ b/omd/packages/rrdtool/Makefile @@ -33,13 +33,13 @@ build: check-python check-python-modules export PYTHONPATH=$$PYTHONPATH:$(TMP_PYTHON_PATH)/lib/python2.7 ; \ export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \ export PYTHONPATH=$$PYTHONPATH:$(TMP_SETUPTOOLS) ; \ - export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5:$$(pwd)/../perl-modules/dist/lib/perl5:$$(pwd)/../perl-modules/dist/lib/perl5/$(PERLARCH); \ - export PERL_MM_OPT=INSTALL_BASE=$(DESTDIR)$(OMD_ROOT)/lib/perl5; \ - export MODULEBUILDRC=$$(pwd)/.modulebuildrc; \ - export PKG_CONFIG_PATH="../../glib/glib-2.13.7:../../pango/pango-1.17.5:../../cairo/cairo-1.4.6/src"; \ - export top_builddir="."; \ + export PERL5LIB=$(LOCAL_PERL5LIB); \ + export PERL_MM_OPT=INSTALL_BASE=$(DESTDIR)$(OMD_ROOT)/lib/perl5; \ + export MODULEBUILDRC=$$(pwd)/.modulebuildrc; \ + export PKG_CONFIG_PATH="../../glib/glib-2.13.7:../../pango/pango-1.17.5:../../cairo/cairo-1.4.6/src"; \ + export top_builddir="."; \ export LDFLAGS="$(shell pkg-config --libs gthread-2.0) -lglib-2.0 -L$$(pwd)/../../cairo/cairo-1.4.6/src/.libs -L$$(pwd)/../../glib/glib-2.13.7/glib/.libs -L$$(pwd)/../../pango/pango-1.17.5/pango/.libs -L$$(pwd)/../../pango/pango-1.17.5/pango -L$(TMP_PYTHON_PATH)/lib -L$(TMP_PYTHON_PATH)/lib/python2.7/config" ; \ - export CPPFLAGS="$(shell pkg-config --cflags gthread-2.0) -I$$(pwd)/../../glib/glib-2.13.7 -I$$(pwd)/../../glib/glib-2.13.7/glib -I$$(pwd)/../../pango/pango-1.17.5 -I$$(pwd)/../../pango/pango-1.17.5/pango -I$$(pwd)/../../cairo/cairo-1.4.6/src" ; \ + export CPPFLAGS="$(shell pkg-config --cflags gthread-2.0) -I$$(pwd)/../../glib/glib-2.13.7 -I$$(pwd)/../../glib/glib-2.13.7/glib -I$$(pwd)/../../pango/pango-1.17.5 -I$$(pwd)/../../pango/pango-1.17.5/pango -I$$(pwd)/../../cairo/cairo-1.4.6/src" ; \ export rd_cv_ms_async="$$MS_ASYNC" ; \ cd $(DIR) && \ ./configure $(CONFIGUREOPTS) && \ @@ -59,7 +59,7 @@ install: export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \ export PYTHONPATH=$$PYTHONPATH:$(TMP_SETUPTOOLS) ; \ export LDFLAGS="-L$(TMP_PYTHON_PATH)/lib -L$(TMP_PYTHON_PATH)/lib/python2.7/config" ; \ - export PERL5LIB=$(P5TMPDIST)/dest/lib/perl5; \ + export PERL5LIB=$(LOCAL_PERL5LIB); \ $(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install # clean up perl man pages which end up in wrong location # clean up systemd init files. Note that on RPM based distros this