[checkmk-commits] Cleaned up freetds build.

Module: check_mk Branch: master Commit: 2463a04e812a18d5197cff1294ddabc2eea87a91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2463a04e812a18… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Tue Jan 16 14:06:36 2018 +0100 Cleaned up freetds build. Change-Id: Id181a8899bb396962f0136d42384d15d7fdcecc9 --- omd/Makefile.omd | 9 +++++++++ omd/packages/freetds/.gitignore | 3 ++- omd/packages/freetds/Makefile | 15 ++++++++------- omd/packages/python-modules/Makefile | 17 +++++------------ 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 3f36e33..14cd4d7 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -58,3 +58,12 @@ check-python: echo "ERROR: You need to build the \"python\" package first" ; \ exit 1 ; \ fi + +PACKAGE_FREETDS_DESTDIR := $(REPO_PATH)/omd/packages/freetds/destdir +PACKAGE_FREETDS_LDFLAGS := -L$(PACKAGE_FREETDS_DESTDIR)/lib + +check-freetds: + @if [ ! -d $(PACKAGE_FREETDS_DESTDIR) ]; then \ + echo "ERROR: You need to build the \"freetds\" package first" ; \ + exit 1 ; \ + fi diff --git a/omd/packages/freetds/.gitignore b/omd/packages/freetds/.gitignore index 5a41c94..7abc2c3 100644 --- a/omd/packages/freetds/.gitignore +++ b/omd/packages/freetds/.gitignore @@ -1 +1,2 @@ -freetds-0.95.95 +destdir/ +freetds-[0-9].[0-9][0-9].[0-9][0-9]/ diff --git a/omd/packages/freetds/Makefile b/omd/packages/freetds/Makefile index fdb5d99..4b03a50 100644 --- a/omd/packages/freetds/Makefile +++ b/omd/packages/freetds/Makefile @@ -11,20 +11,21 @@ build: cd $(DIR) && \ ./configure \ --enable-msdblib \ - --prefix=/usr \ + --prefix=$(OMD_ROOT) \ --sysconfdir=/etc/freetds \ --with-tdsver=7.1 \ --disable-apps \ --disable-server \ --disable-pool \ - --disable-odbc \ - && \ - $(MAKE) -j4 + --disable-odbc + $(MAKE) -C $(DIR) -j4 +# Package python-modules needs some stuff during the build. + $(MAKE) -C $(DIR)/include prefix=$(PACKAGE_FREETDS_DESTDIR) install + $(MAKE) -C $(DIR)/src/dblib prefix=$(PACKAGE_FREETDS_DESTDIR) install install: - mkdir -p $(DESTDIR)$(OMD_ROOT)/lib - install -m 644 $(DIR)/src/ctlib/.libs/libct.so $(DESTDIR)$(OMD_ROOT)/lib/ - install -m 644 $(DIR)/src/dblib/.libs/libsybdb.so $(DESTDIR)$(OMD_ROOT)/lib/ +# At runtime we need only the libraries. + $(MAKE) -C $(DIR)/src/dblib DESTDIR=$(DESTDIR) install skel: diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 51478a3..98718d1 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -121,8 +121,8 @@ build: check-python check-freetds unpack mkdir -p $(TMP_INSTALL_PATH)/lib || true; \ export PYTHONPATH="$$PYTHONPATH:$(TMP_INSTALL_PATH)/lib" ; \ export PYTHONPATH="$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH)" ; \ - export CPATH="$(shell pwd)/../freetds/freetds-0.95.95/include" ; \ - export LDFLAGS="-$(PACKAGE_PYTHON_LDFLAGS) -L$(shell pwd)/../freetds/freetds-0.95.95/src/dblib/.libs" ; \ + export CPATH="$(PACKAGE_FREETDS_DESTDIR)/include" ; \ + export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS) $(PACKAGE_FREETDS_LDFLAGS)" ; \ export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ for M in $(MODULES); do \ echo "Building $$M..." ; \ @@ -157,20 +157,13 @@ unpack: patch -p1 -b -d dest < $$p ; \ done - -check-freetds: - @if [ ! -d ../freetds/freetds-0.95.95 ]; then \ - echo "ERROR: You need to build the \"freetds\" package first" ; \ - exit 1 ; \ - fi - install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/python set -e ; cd dest && \ export PYTHONPATH=$$PYTHONPATH:"$(TMP_INSTALL_PATH)/lib" ; \ export PYTHONPATH=$$PYTHONPATH:"$(PACKAGE_PYTHON_PYTHONPATH)" ; \ - export CPATH="$(shell pwd)/../freetds/freetds-0.95.95/include" ; \ - export LDFLAGS="-$(PACKAGE_PYTHON_LDFLAGS) -L$(shell pwd)/../freetds/freetds-0.95.95/src/dblib/.libs" ; \ + export CPATH="$(PACKAGE_FREETDS_DESTDIR)/include" ; \ + export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS) $(PACKAGE_FREETDS_LDFLAGS)" ; \ export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ for M in $$(ls); do \ echo "Installing $$M..." ; \ @@ -198,4 +191,4 @@ install: skel: clean: - rm -rf dest tmp.python + rm -rf dest $(TMP_INSTALL_PATH)