X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=0ec86d41ff6eb6e863d88f292322d3c1c6709d1e;hb=5d743f8e686e86eaf108673c422a2224e5b52979;hp=be53f76286579017bc1cbc855de2cce0705dcaf7;hpb=6900584a091006b5d61077978a28357c24f72752;p=pkg-collectd.git diff --git a/debian/rules b/debian/rules index be53f76..0ec86d4 100755 --- a/debian/rules +++ b/debian/rules @@ -17,19 +17,19 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) CPPFLAGS += -I$(CURDIR)/debian/include CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -CFLAGS += -Wall - -# There is no way to tell lt_dlopen() to use the RTLD_GLOBAL flag which is -# however required by the perl plugin (which would otherwise be unable to find -# symbols defined in libperl when loading perl modules that require such -# symbols). This is a workaround for this issue. -CPPFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL' +CFLAGS += -Wall -Wno-error=deprecated-declarations # Upstream defaults to ${sysconfdir}/collectd.conf. Setting ${sysconfdir} to # /etc/collectd would be wrong though. CPPFLAGS += -UCONFIGFILE CPPFLAGS += -DCONFIGFILE='\"/etc/collectd/collectd.conf\"' +# A PostgreSQL header redefines CACHE_LINE_SIZE on FreeBSD. +# Cf. https://bugs.debian.org/760719 and https://bugs.debian.org/763098 +ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) + CPPFLAGS += -Wp,-w +endif + LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) # The archdir map has been copied from openjdk-6's debian/rules. @@ -37,7 +37,7 @@ JAVA_ARCHDIR = $(shell /usr/share/javahelper/java-arch.sh $(DEB_BUILD_ARCH)) ifeq (,$(JAVA_ARCHDIR)) JAVA_ARCHDIR = $(DEB_BUILD_ARCH) endif -JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH) +JAVA_HOME = /usr/lib/jvm/default-java JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server JAVAC = $(JAVA_HOME)/bin/javac @@ -45,30 +45,34 @@ JAR = $(JAVA_HOME)/bin/jar JAVA_CPPFLAGS = -I$(JAVA_HOME)/include JAVA_LDFLAGS = -L$(JAVA_LIBDIR) -Wl,-rpath -Wl,$(JAVA_LIBDIR) -include /usr/share/dpatch/dpatch.make - confflags = --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \ --mandir=\$${prefix}/share/man \ --localstatedir=/var --sysconfdir=/etc \ - --with-perl-bindings="INSTALLDIRS=vendor" \ + --with-perl-bindings="INSTALLDIRS=vendor INSTALL_BASE=" \ --without-libstatgrab \ --without-included-ltdl \ --disable-static \ + --disable-silent-rules \ --enable-all-plugins # These plugins do not provide any functionality under Linux. -confflags += --disable-apple_sensors --disable-tape +# MacOS only (requires IO Kit): +confflags += --disable-apple_sensors +# AIX only (requires perfstat): +confflags += --disable-lpar +# Solaris only (requires devinfo and kstat) +confflags += --disable-tape + +# libaquaero5 is required for the aquaero plugin +confflags += --disable-aquaero -# libmodbus is required for the modbus plugin. -confflags += --disable-modbus +# libmic is required for the mic plugin +confflags += --disable-mic # libnetapp is required for the netapp plugin. confflags += --disable-netapp -# libowcapi is required for the onewire plugin. -confflags += --disable-onewire - # libclntsh is required for the oracle plugin. confflags += --disable-oracle @@ -78,26 +82,45 @@ confflags += --disable-routeros # xmms1 is required for the xmms plugin. confflags += --disable-xmms -# libkstat is required for the xfs_arc plugin. -confflags += --disable-zfs-arc +# libsigrok4 incompatible with the plugin. +# Cf. https://github.com/collectd/collectd/issues/1574 +confflags += --disable-sigrok -# The static library netstat cannot be linked into shared objects on some -# architectures (see bugs #358637, #419684 and #524593 for more details). -ifneq (,$(filter alpha amd64 hppa ia64 ppc64 mips mipsel, $(DEB_BUILD_ARCH))) - confflags += --disable-netlink -endif +# liblvm2app is deprecated. +# https://github.com/collectd/collectd/issues/2647 +confflags += --disable-lvm # These plugins are Linux-specific. ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) confflags += \ + --disable-barometer \ + --disable-cgroups \ + --disable-cpusleep \ + --disable-drbd \ + --disable-ethstat \ + --disable-fhcount \ + --disable-hugepages \ + --disable-ipc \ --disable-iptables \ --disable-ipvs \ --disable-madwifi \ + --disable-md \ --disable-netlink \ + --disable-numa \ --disable-sensors \ --disable-vserver endif +# This plugin is FreeBSD-specific. +ifeq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) + confflags += \ + --disable-pf +endif + +# This plugin is Solaris-specific. +confflags += \ + --disable-zone + # These plugins have not been ported to FreeBSD yet. ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) # Work-around an incomplete check for kvm functionality @@ -109,7 +132,6 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) --disable-conntrack \ --disable-contextswitch \ --disable-cpufreq \ - --disable-disk \ --disable-entropy \ --disable-fscache \ --disable-irq \ @@ -125,25 +147,44 @@ endif ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) confflags += \ --disable-gmond \ - --disable-libvirt \ + --disable-virt \ --disable-tokyotyrant \ --disable-java endif +# These plugins are Intel-hardware specific. +ifeq (,$(filter amd64 i386, $(DEB_BUILD_ARCH))) + confflags += \ + --disable-dpdkstat \ + --disable-turbostat +endif + +# This plugin is x86 and arm specific. +ifeq (,$(filter amd64 arm64 armhf i386, $(DEB_BUILD_ARCH))) + confflags += \ + --disable-xencpu +endif + +# libatasmart isn't available on these platforms. +ifneq (,$(filter hurd-i386 kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) + confflags += --disable-smart +endif + # The hppa buildds currently do not keep up with Java related stuff, thus -# prevending testing transitions. -ifneq (,$(filter hppa, $(DEB_BUILD_ARCH))) +# prevending testing transitions. sparc is also having trouble building the +# java plugin. +ifneq (,$(filter hppa sparc, $(DEB_BUILD_ARCH))) confflags += --disable-java endif -config.status: configure $(DPATCH_STAMPFN) +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp + +build-stamp: dh_testdir - ( cd debian/patches/; for patch in *; do \ - if test "$$patch" != "00list"; then \ - grep "$$patch" 00list > /dev/null \ - || ( echo "$$patch not enabled\!"; exit 1 ); \ - fi; done ) + dh_autoreconf # This is a work-around for #474087 (broken openipmi .pc files). mkdir debian/pkgconfig @@ -157,19 +198,13 @@ config.status: configure $(DPATCH_STAMPFN) JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \ || ( status=$$?; cat config.log; exit $$status ) -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp - -build-stamp: config.status - dh_testdir - $(MAKE) + dh_auto_test perl ./debian/bin/check_plugins.pl touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp @@ -181,20 +216,32 @@ clean: unpatch rm -rf debian/pkgconfig + dh_autoreconf_clean dh_clean debconf-updatepo install-indep: dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs -i dh_install -i + + # update include path for collectd header files + ( set -e; \ + cd $(CURDIR)/debian/collectd-dev/usr/include/collectd/; \ + for lib in $$(find . -type f -name '*.h'); do \ + libname=$$(basename $$lib); \ + fullpath=$$(echo $$lib | sed -r -e 's,^\./,collectd/,'); \ + for dir in $$(find . -mindepth 1 -type d); do \ + sed -r -i -e "s,(include\s+)\".*\<$$libname\",\1\"$$fullpath\"," $$dir/*.h; \ + done; \ + done ) install-arch: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs -a $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp @@ -215,7 +262,7 @@ binary-indep: install-indep dh_testdir dh_testroot dh_installchangelogs -i ChangeLog - dh_installdocs -A -i debian/README.Debian AUTHORS README TODO + dh_installdocs -A -i debian/README.Debian AUTHORS README dh_installexamples -i contrib/examples/myplugin.c \ contrib/examples/MyPlugin.pm dh_compress -i -Xexamples/ @@ -229,16 +276,17 @@ binary-arch: build install-arch dh_testdir dh_testroot dh_installchangelogs -a ChangeLog - dh_installdocs -A -a debian/README.Debian AUTHORS README TODO + dh_installdocs -A -a debian/README.Debian AUTHORS README dh_installdocs -a debian/NEWS.Debian debian/README.Debian.plugins dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \ contrib/collection3/ contrib/php-collection/ \ contrib/exec-munin.conf contrib/exec-munin.px contrib/exec-smartctl \ - contrib/exec-nagios.conf contrib/exec-nagios.px \ + contrib/exec-nagios.conf contrib/exec-nagios.px contrib/exec-ksm.sh \ contrib/SpamAssassin/ contrib/iptables/ contrib/cussh.pl \ contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py \ contrib/collectd_network.py contrib/collectd_unixsock.py \ contrib/snmp-probe-host.px contrib/GenericJMX.conf \ + contrib/postgresql \ debian/collectd.conf debian/filters.conf debian/thresholds.conf # some upstream tarballs have been built inside a dirty working dir ( cd debian/collectd-core/ \ @@ -248,9 +296,12 @@ binary-arch: build install-arch && rm -f lib/Collectd/Graph/File.pm lib/Collectd/Graph/Filter.pm \ && rm -f lib/Collectd/Graph/MetaData.pm ) dh_installdebconf -a + dh_systemd_enable -pcollectd-core --name=collectd dh_installinit -pcollectd-core --name=collectd -- defaults 95 + dh_systemd_start -pcollectd-core dh_link -a dh_strip -a --dbg-package=collectd-dbg + dh_strip_nondeterminism -pcollectd-core dh_compress -a -Xexamples/ dh_fixperms -a dh_makeshlibs -a