From aa0f58a7d803dfcea2b763dd79244143868eb2da Mon Sep 17 00:00:00 2001 From: Aleksei Shpakovskii Date: Tue, 9 May 2023 12:13:18 +0200 Subject: [PATCH] remove lcov dependency (cherry picked from commit 0f76eb9cc7da113d7e9c3fda85b14a26c497998e) --- build-scripts/compile-options | 1 - deps-packaging/lcov/cfbuild-lcov.spec | 63 ------------------- .../lcov/debian/cfbuild-lcov.install | 5 -- deps-packaging/lcov/debian/compat | 1 - deps-packaging/lcov/debian/control | 12 ---- deps-packaging/lcov/debian/copyright | 0 deps-packaging/lcov/debian/rules | 32 ---------- deps-packaging/lcov/distfiles | 1 - deps-packaging/lcov/hpux/build | 15 ----- deps-packaging/lcov/hpux/packages | 1 - deps-packaging/lcov/solaris/build | 16 ----- deps-packaging/lcov/solaris/packages | 1 - deps-packaging/lcov/source | 1 - deps-packaging/release-monitoring.json | 1 - 14 files changed, 150 deletions(-) delete mode 100644 deps-packaging/lcov/cfbuild-lcov.spec delete mode 100644 deps-packaging/lcov/debian/cfbuild-lcov.install delete mode 100644 deps-packaging/lcov/debian/compat delete mode 100644 deps-packaging/lcov/debian/control delete mode 100644 deps-packaging/lcov/debian/copyright delete mode 100755 deps-packaging/lcov/debian/rules delete mode 100644 deps-packaging/lcov/distfiles delete mode 100755 deps-packaging/lcov/hpux/build delete mode 100644 deps-packaging/lcov/hpux/packages delete mode 100755 deps-packaging/lcov/solaris/build delete mode 100644 deps-packaging/lcov/solaris/packages delete mode 100644 deps-packaging/lcov/source diff --git a/build-scripts/compile-options b/build-scripts/compile-options index 5f2567b7d..c388e7703 100644 --- a/build-scripts/compile-options +++ b/build-scripts/compile-options @@ -100,7 +100,6 @@ EMBEDDED_DB="lmdb" ############### Fill in build dependencies in DEPS variable ################ DEPS= -[ $OS_FAMILY = linux ] && var_append DEPS "lcov" [ $OS_FAMILY = mingw ] && var_append DEPS "pthreads-w32 libgnurx" # libgcc_s.so is needed before we compile any other dependency diff --git a/deps-packaging/lcov/cfbuild-lcov.spec b/deps-packaging/lcov/cfbuild-lcov.spec deleted file mode 100644 index 59081928b..000000000 --- a/deps-packaging/lcov/cfbuild-lcov.spec +++ /dev/null @@ -1,63 +0,0 @@ -Summary: CFEngine Build Automation -- lcov -Name: cfbuild-lcov -Version: 1.16 -Release: 1 -License: GPL -Group: Development/Tools -URL: http://ltp.sourceforge.net/coverage/lcov.php -Source0: lcov-1.16.tar.gz -BuildRoot: %{_topdir}/BUILD/%{name}-%{version}-root -BuildArch: noarch -Requires: perl >= 5.8.8 - -%description -LCOV is a graphical front-end for GCC's coverage testing tool gcov. It collects -gcov data for multiple source files and creates HTML pages containing the -source code annotated with coverage information. It also adds overview pages -for easy navigation within the file structure. - -%prep -%setup -q -n lcov-%{version} - -%build -exit 0 - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr CFG_DIR=/etc - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -/etc/lcovrc -/usr/bin/gendesc -/usr/bin/genhtml -/usr/bin/geninfo -/usr/bin/genpng -/usr/bin/lcov -/usr/share/man/man1 -/usr/share/man/man1/gendesc.1.gz -/usr/share/man/man1/genhtml.1.gz -/usr/share/man/man1/geninfo.1.gz -/usr/share/man/man1/genpng.1.gz -/usr/share/man/man1/lcov.1.gz -/usr/share/man/man5 -/usr/share/man/man5/lcovrc.5.gz - -%changelog -* Mon May 07 2012 Peter Oberparleiter (Peter.Oberparleiter@de.ibm.com) -- added dependency on perl 5.8.8 for >>& open mode support -* Wed Aug 13 2008 Peter Oberparleiter (Peter.Oberparleiter@de.ibm.com) -- changed description + summary text -* Mon Aug 20 2007 Peter Oberparleiter (Peter.Oberparleiter@de.ibm.com) -- fixed "Copyright" tag -* Mon Jul 14 2003 Peter Oberparleiter (Peter.Oberparleiter@de.ibm.com) -- removed variables for version/release to support source rpm building -- added initial rm command in install section -* Mon Apr 7 2003 Peter Oberparleiter (Peter.Oberparleiter@de.ibm.com) -- implemented variables for version/release -* Fri Oct 8 2002 Peter Oberparleiter (Peter.Oberparleiter@de.ibm.com) -- created initial spec file - diff --git a/deps-packaging/lcov/debian/cfbuild-lcov.install b/deps-packaging/lcov/debian/cfbuild-lcov.install deleted file mode 100644 index 7456ec603..000000000 --- a/deps-packaging/lcov/debian/cfbuild-lcov.install +++ /dev/null @@ -1,5 +0,0 @@ -/usr/bin/gendesc -/usr/bin/genhtml -/usr/bin/geninfo -/usr/bin/genpng -/usr/bin/lcov diff --git a/deps-packaging/lcov/debian/compat b/deps-packaging/lcov/debian/compat deleted file mode 100644 index f599e28b8..000000000 --- a/deps-packaging/lcov/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/deps-packaging/lcov/debian/control b/deps-packaging/lcov/debian/control deleted file mode 100644 index 15f5f098f..000000000 --- a/deps-packaging/lcov/debian/control +++ /dev/null @@ -1,12 +0,0 @@ -Source: cfbuild-lcov -Section: libs -Priority: optional -Maintainer: CFEngine Packager -Build-Depends: debhelper -Standards-Version: 3.8.4 - -Package: cfbuild-lcov -Section: libs -Architecture: any -Description: CFEngine Build Automation -- lcov - CFEngine Build Automation -- lcov diff --git a/deps-packaging/lcov/debian/copyright b/deps-packaging/lcov/debian/copyright deleted file mode 100644 index e69de29bb..000000000 diff --git a/deps-packaging/lcov/debian/rules b/deps-packaging/lcov/debian/rules deleted file mode 100755 index 945197535..000000000 --- a/deps-packaging/lcov/debian/rules +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/make -f - -clean: - dh_testdir - dh_testroot - - dh_clean - -install: - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr CFG_DIR=/etc - - rm -rf $(CURDIR)/debian/tmp/usr/share/info - rm -rf $(CURDIR)/debian/tmp/usr/share/emacs - rm -rf $(CURDIR)/debian/tmp/usr/share/man - -binary-indep: install - dh_testdir - dh_testroot - dh_install --sourcedir=debian/tmp - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/deps-packaging/lcov/distfiles b/deps-packaging/lcov/distfiles deleted file mode 100644 index 58381c2b8..000000000 --- a/deps-packaging/lcov/distfiles +++ /dev/null @@ -1 +0,0 @@ -987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b lcov-1.16.tar.gz diff --git a/deps-packaging/lcov/hpux/build b/deps-packaging/lcov/hpux/build deleted file mode 100755 index a89441d31..000000000 --- a/deps-packaging/lcov/hpux/build +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e - -# Options - -LC=${BUILD_ROOT}/cfbuild-lcov/usr - -# Install - -gmake install DESTDIR=${BUILD_ROOT}/cfbuild-lcov - -# Package - -rm -rf ${LC}/share/info -rm -rf ${LC}/share/emacs -rm -rf ${LC}/share/man diff --git a/deps-packaging/lcov/hpux/packages b/deps-packaging/lcov/hpux/packages deleted file mode 100644 index 5f864c219..000000000 --- a/deps-packaging/lcov/hpux/packages +++ /dev/null @@ -1 +0,0 @@ -cfbuild-lcov diff --git a/deps-packaging/lcov/solaris/build b/deps-packaging/lcov/solaris/build deleted file mode 100755 index e390c0bff..000000000 --- a/deps-packaging/lcov/solaris/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/xpg4/bin/sh -e - -# Options - -LC=${BUILD_ROOT}/cfbuild-lcov/usr/bin - -# Install - -mkdir -p ${LC} -gmake install DESTDIR=${BUILD_ROOT}/cfbuild-lcov - -# Package - -rm -rf ${LC}/share/info -rm -rf ${LC}/share/emacs -rm -rf ${LC}/share/man diff --git a/deps-packaging/lcov/solaris/packages b/deps-packaging/lcov/solaris/packages deleted file mode 100644 index 5f864c219..000000000 --- a/deps-packaging/lcov/solaris/packages +++ /dev/null @@ -1 +0,0 @@ -cfbuild-lcov diff --git a/deps-packaging/lcov/source b/deps-packaging/lcov/source deleted file mode 100644 index afefa1557..000000000 --- a/deps-packaging/lcov/source +++ /dev/null @@ -1 +0,0 @@ -https://github.com/linux-test-project/lcov/releases/download/v1.16/ diff --git a/deps-packaging/release-monitoring.json b/deps-packaging/release-monitoring.json index fe220537e..2f4a296a2 100644 --- a/deps-packaging/release-monitoring.json +++ b/deps-packaging/release-monitoring.json @@ -4,7 +4,6 @@ "apr-util":"96", "diffutils":"436", "git":"20450", - "lcov":"346328", "libacl":"16", "libattr":"137", "libcurl":"381",