collectd: disable python to allow build without python2

Message ID 20210820200551.3535831-1-adolf.belka@ipfire.org
State New
Headers show
Series collectd: disable python to allow build without python2 | expand

Commit Message

Adolf Belka Aug. 20, 2021, 8:05 p.m. UTC
- Added python to ./configure disable line
- Added --disable-static to ./configure

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/collectd | 74 ++------------------------------
 lfs/collectd                     |  3 +-
 2 files changed, 5 insertions(+), 72 deletions(-)

Comments

Michael Tremer Aug. 23, 2021, 10:33 a.m. UTC | #1
Acked-by: Michael Tremer <michael.tremer@ipfire.org>

> On 20 Aug 2021, at 21:05, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> - Added python to ./configure disable line
> - Added --disable-static to ./configure
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
> config/rootfiles/common/collectd | 74 ++------------------------------
> lfs/collectd                     |  3 +-
> 2 files changed, 5 insertions(+), 72 deletions(-)
> 
> diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
> index 277f2c88f..73b9cfed0 100644
> --- a/config/rootfiles/common/collectd
> +++ b/config/rootfiles/common/collectd
> @@ -3,7 +3,6 @@ etc/collectd.custom
> etc/collectd.precache
> etc/collectd.thermal
> etc/collectd.vpn
> -etc/rc.d/init.d/collectd
> etc/rc.d/rc0.d/K50collectd
> etc/rc.d/rc3.d/S29collectd
> etc/rc.d/rc6.d/K50collectd
> @@ -13,204 +12,136 @@ etc/rc.d/rc6.d/K50collectd
> #usr/include/collectd/client.h
> #usr/include/collectd/lcc_features.h
> #usr/lib/collectd
> -#usr/lib/collectd/apache.a
> #usr/lib/collectd/apache.la
> usr/lib/collectd/apache.so
> -#usr/lib/collectd/apcups.a
> #usr/lib/collectd/apcups.la
> usr/lib/collectd/apcups.so
> -#usr/lib/collectd/ascent.a
> #usr/lib/collectd/ascent.la
> usr/lib/collectd/ascent.so
> -#usr/lib/collectd/battery.a
> #usr/lib/collectd/battery.la
> usr/lib/collectd/battery.so
> -#usr/lib/collectd/bind.a
> #usr/lib/collectd/bind.la
> usr/lib/collectd/bind.so
> -#usr/lib/collectd/conntrack.a
> #usr/lib/collectd/conntrack.la
> usr/lib/collectd/conntrack.so
> -#usr/lib/collectd/contextswitch.a
> #usr/lib/collectd/contextswitch.la
> usr/lib/collectd/contextswitch.so
> -#usr/lib/collectd/cpu.a
> #usr/lib/collectd/cpu.la
> usr/lib/collectd/cpu.so
> -#usr/lib/collectd/cpufreq.a
> #usr/lib/collectd/cpufreq.la
> usr/lib/collectd/cpufreq.so
> -#usr/lib/collectd/curl.a
> #usr/lib/collectd/curl.la
> usr/lib/collectd/curl.so
> -#usr/lib/collectd/curl_xml.a
> #usr/lib/collectd/curl_xml.la
> usr/lib/collectd/curl_xml.so
> -#usr/lib/collectd/df.a
> #usr/lib/collectd/df.la
> usr/lib/collectd/df.so
> -#usr/lib/collectd/disk.a
> #usr/lib/collectd/disk.la
> usr/lib/collectd/disk.so
> -#usr/lib/collectd/dns.a
> #usr/lib/collectd/dns.la
> usr/lib/collectd/dns.so
> -#usr/lib/collectd/email.a
> #usr/lib/collectd/email.la
> usr/lib/collectd/email.so
> -#usr/lib/collectd/entropy.a
> #usr/lib/collectd/entropy.la
> usr/lib/collectd/entropy.so
> -#usr/lib/collectd/exec.a
> #usr/lib/collectd/exec.la
> usr/lib/collectd/exec.so
> -#usr/lib/collectd/filecount.a
> #usr/lib/collectd/filecount.la
> usr/lib/collectd/filecount.so
> -#usr/lib/collectd/fscache.a
> #usr/lib/collectd/fscache.la
> usr/lib/collectd/fscache.so
> -#usr/lib/collectd/hddtemp.a
> #usr/lib/collectd/hddtemp.la
> usr/lib/collectd/hddtemp.so
> -#usr/lib/collectd/interface.a
> #usr/lib/collectd/interface.la
> usr/lib/collectd/interface.so
> -#usr/lib/collectd/iptables.a
> #usr/lib/collectd/iptables.la
> usr/lib/collectd/iptables.so
> -#usr/lib/collectd/irq.a
> #usr/lib/collectd/irq.la
> usr/lib/collectd/irq.so
> -#usr/lib/collectd/load.a
> #usr/lib/collectd/load.la
> usr/lib/collectd/load.so
> -#usr/lib/collectd/logfile.a
> #usr/lib/collectd/logfile.la
> usr/lib/collectd/logfile.so
> -#usr/lib/collectd/madwifi.a
> #usr/lib/collectd/madwifi.la
> usr/lib/collectd/madwifi.so
> -#usr/lib/collectd/match_empty_counter.a
> #usr/lib/collectd/match_empty_counter.la
> usr/lib/collectd/match_empty_counter.so
> -#usr/lib/collectd/match_hashed.a
> #usr/lib/collectd/match_hashed.la
> usr/lib/collectd/match_hashed.so
> -#usr/lib/collectd/match_regex.a
> #usr/lib/collectd/match_regex.la
> usr/lib/collectd/match_regex.so
> -#usr/lib/collectd/match_timediff.a
> #usr/lib/collectd/match_timediff.la
> usr/lib/collectd/match_timediff.so
> -#usr/lib/collectd/match_value.a
> #usr/lib/collectd/match_value.la
> usr/lib/collectd/match_value.so
> -#usr/lib/collectd/memory.a
> #usr/lib/collectd/memory.la
> usr/lib/collectd/memory.so
> -#usr/lib/collectd/multimeter.a
> #usr/lib/collectd/multimeter.la
> usr/lib/collectd/multimeter.so
> -#usr/lib/collectd/network.a
> #usr/lib/collectd/network.la
> usr/lib/collectd/network.so
> -#usr/lib/collectd/nfs.a
> #usr/lib/collectd/nfs.la
> usr/lib/collectd/nfs.so
> -#usr/lib/collectd/ntpd.a
> #usr/lib/collectd/ntpd.la
> usr/lib/collectd/ntpd.so
> -#usr/lib/collectd/olsrd.a
> #usr/lib/collectd/olsrd.la
> usr/lib/collectd/olsrd.so
> -#usr/lib/collectd/openvpn.a
> #usr/lib/collectd/openvpn.la
> usr/lib/collectd/openvpn.so
> -#usr/lib/collectd/ping.a
> #usr/lib/collectd/ping.la
> usr/lib/collectd/ping.so
> -#usr/lib/collectd/powerdns.a
> #usr/lib/collectd/powerdns.la
> usr/lib/collectd/powerdns.so
> -#usr/lib/collectd/processes.a
> #usr/lib/collectd/processes.la
> usr/lib/collectd/processes.so
> -#usr/lib/collectd/protocols.a
> #usr/lib/collectd/protocols.la
> usr/lib/collectd/protocols.so
> -#usr/lib/collectd/python.a
> -#usr/lib/collectd/python.la
> -usr/lib/collectd/python.so
> -#usr/lib/collectd/rrdcached.a
> #usr/lib/collectd/rrdcached.la
> usr/lib/collectd/rrdcached.so
> -#usr/lib/collectd/rrdtool.a
> #usr/lib/collectd/rrdtool.la
> usr/lib/collectd/rrdtool.so
> -#usr/lib/collectd/sensors.a
> #usr/lib/collectd/sensors.la
> usr/lib/collectd/sensors.so
> -#usr/lib/collectd/swap.a
> #usr/lib/collectd/swap.la
> usr/lib/collectd/swap.so
> -#usr/lib/collectd/syslog.a
> #usr/lib/collectd/syslog.la
> usr/lib/collectd/syslog.so
> -#usr/lib/collectd/table.a
> #usr/lib/collectd/table.la
> usr/lib/collectd/table.so
> -#usr/lib/collectd/tail.a
> #usr/lib/collectd/tail.la
> usr/lib/collectd/tail.so
> -#usr/lib/collectd/target_notification.a
> #usr/lib/collectd/target_notification.la
> usr/lib/collectd/target_notification.so
> -#usr/lib/collectd/target_replace.a
> #usr/lib/collectd/target_replace.la
> usr/lib/collectd/target_replace.so
> -#usr/lib/collectd/target_scale.a
> #usr/lib/collectd/target_scale.la
> usr/lib/collectd/target_scale.so
> -#usr/lib/collectd/target_set.a
> #usr/lib/collectd/target_set.la
> usr/lib/collectd/target_set.so
> -#usr/lib/collectd/tcpconns.a
> #usr/lib/collectd/tcpconns.la
> usr/lib/collectd/tcpconns.so
> -#usr/lib/collectd/teamspeak2.a
> #usr/lib/collectd/teamspeak2.la
> usr/lib/collectd/teamspeak2.so
> -#usr/lib/collectd/ted.a
> #usr/lib/collectd/ted.la
> usr/lib/collectd/ted.so
> -#usr/lib/collectd/thermal.a
> #usr/lib/collectd/thermal.la
> usr/lib/collectd/thermal.so
> -#usr/lib/collectd/unixsock.a
> #usr/lib/collectd/unixsock.la
> usr/lib/collectd/unixsock.so
> -#usr/lib/collectd/uptime.a
> #usr/lib/collectd/uptime.la
> usr/lib/collectd/uptime.so
> -#usr/lib/collectd/users.a
> #usr/lib/collectd/users.la
> usr/lib/collectd/users.so
> -#usr/lib/collectd/uuid.a
> #usr/lib/collectd/uuid.la
> usr/lib/collectd/uuid.so
> -#usr/lib/collectd/vmem.a
> #usr/lib/collectd/vmem.la
> usr/lib/collectd/vmem.so
> -#usr/lib/collectd/wireless.a
> #usr/lib/collectd/wireless.la
> usr/lib/collectd/wireless.so
> -#usr/lib/collectd/write_http.a
> #usr/lib/collectd/write_http.la
> usr/lib/collectd/write_http.so
> -#usr/lib/libcollectdclient.a
> #usr/lib/libcollectdclient.la
> -usr/lib/libcollectdclient.so
> +#usr/lib/libcollectdclient.so
> usr/lib/libcollectdclient.so.0
> usr/lib/libcollectdclient.so.0.0.0
> #usr/lib/perl5/Collectd
> @@ -242,5 +173,6 @@ usr/share/collectd/types.db
> #usr/share/man/man5/collectd-unixsock.5
> #usr/share/man/man5/collectd.conf.5
> #usr/share/man/man5/types.db.5
> -#var/lib/collectd
> var/ipfire/ovpn/collectd.vpn
> +#var/lib/collectd
> +etc/rc.d/init.d/collectd
> diff --git a/lfs/collectd b/lfs/collectd
> index 09d8c6fcf..3d8ef33a5 100644
> --- a/lfs/collectd
> +++ b/lfs/collectd
> @@ -114,12 +114,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 	cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
> 		--disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
> 		--disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \
> -		--disable-{perl,serial,snmp,tape,vserver,xmms} \
> +		--disable-{perl,serial,snmp,tape,vserver,xmms,python} \
> 		--enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \
> 		--enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
> 		--enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
> 		--enable-{tcpconns,unixsock,users,wireless} \
> 		--with-librrd=/usr/share/rrdtool-1.2.30 \
> +		--disable-static \
> 		--with-fp-layout=nothing
> 	cd $(DIR_APP) && make install #collectd-4 does not support parallel build
> 	cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
> -- 
> 2.33.0
>

Patch

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 277f2c88f..73b9cfed0 100644
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -3,7 +3,6 @@  etc/collectd.custom
 etc/collectd.precache
 etc/collectd.thermal
 etc/collectd.vpn
-etc/rc.d/init.d/collectd
 etc/rc.d/rc0.d/K50collectd
 etc/rc.d/rc3.d/S29collectd
 etc/rc.d/rc6.d/K50collectd
@@ -13,204 +12,136 @@  etc/rc.d/rc6.d/K50collectd
 #usr/include/collectd/client.h
 #usr/include/collectd/lcc_features.h
 #usr/lib/collectd
-#usr/lib/collectd/apache.a
 #usr/lib/collectd/apache.la
 usr/lib/collectd/apache.so
-#usr/lib/collectd/apcups.a
 #usr/lib/collectd/apcups.la
 usr/lib/collectd/apcups.so
-#usr/lib/collectd/ascent.a
 #usr/lib/collectd/ascent.la
 usr/lib/collectd/ascent.so
-#usr/lib/collectd/battery.a
 #usr/lib/collectd/battery.la
 usr/lib/collectd/battery.so
-#usr/lib/collectd/bind.a
 #usr/lib/collectd/bind.la
 usr/lib/collectd/bind.so
-#usr/lib/collectd/conntrack.a
 #usr/lib/collectd/conntrack.la
 usr/lib/collectd/conntrack.so
-#usr/lib/collectd/contextswitch.a
 #usr/lib/collectd/contextswitch.la
 usr/lib/collectd/contextswitch.so
-#usr/lib/collectd/cpu.a
 #usr/lib/collectd/cpu.la
 usr/lib/collectd/cpu.so
-#usr/lib/collectd/cpufreq.a
 #usr/lib/collectd/cpufreq.la
 usr/lib/collectd/cpufreq.so
-#usr/lib/collectd/curl.a
 #usr/lib/collectd/curl.la
 usr/lib/collectd/curl.so
-#usr/lib/collectd/curl_xml.a
 #usr/lib/collectd/curl_xml.la
 usr/lib/collectd/curl_xml.so
-#usr/lib/collectd/df.a
 #usr/lib/collectd/df.la
 usr/lib/collectd/df.so
-#usr/lib/collectd/disk.a
 #usr/lib/collectd/disk.la
 usr/lib/collectd/disk.so
-#usr/lib/collectd/dns.a
 #usr/lib/collectd/dns.la
 usr/lib/collectd/dns.so
-#usr/lib/collectd/email.a
 #usr/lib/collectd/email.la
 usr/lib/collectd/email.so
-#usr/lib/collectd/entropy.a
 #usr/lib/collectd/entropy.la
 usr/lib/collectd/entropy.so
-#usr/lib/collectd/exec.a
 #usr/lib/collectd/exec.la
 usr/lib/collectd/exec.so
-#usr/lib/collectd/filecount.a
 #usr/lib/collectd/filecount.la
 usr/lib/collectd/filecount.so
-#usr/lib/collectd/fscache.a
 #usr/lib/collectd/fscache.la
 usr/lib/collectd/fscache.so
-#usr/lib/collectd/hddtemp.a
 #usr/lib/collectd/hddtemp.la
 usr/lib/collectd/hddtemp.so
-#usr/lib/collectd/interface.a
 #usr/lib/collectd/interface.la
 usr/lib/collectd/interface.so
-#usr/lib/collectd/iptables.a
 #usr/lib/collectd/iptables.la
 usr/lib/collectd/iptables.so
-#usr/lib/collectd/irq.a
 #usr/lib/collectd/irq.la
 usr/lib/collectd/irq.so
-#usr/lib/collectd/load.a
 #usr/lib/collectd/load.la
 usr/lib/collectd/load.so
-#usr/lib/collectd/logfile.a
 #usr/lib/collectd/logfile.la
 usr/lib/collectd/logfile.so
-#usr/lib/collectd/madwifi.a
 #usr/lib/collectd/madwifi.la
 usr/lib/collectd/madwifi.so
-#usr/lib/collectd/match_empty_counter.a
 #usr/lib/collectd/match_empty_counter.la
 usr/lib/collectd/match_empty_counter.so
-#usr/lib/collectd/match_hashed.a
 #usr/lib/collectd/match_hashed.la
 usr/lib/collectd/match_hashed.so
-#usr/lib/collectd/match_regex.a
 #usr/lib/collectd/match_regex.la
 usr/lib/collectd/match_regex.so
-#usr/lib/collectd/match_timediff.a
 #usr/lib/collectd/match_timediff.la
 usr/lib/collectd/match_timediff.so
-#usr/lib/collectd/match_value.a
 #usr/lib/collectd/match_value.la
 usr/lib/collectd/match_value.so
-#usr/lib/collectd/memory.a
 #usr/lib/collectd/memory.la
 usr/lib/collectd/memory.so
-#usr/lib/collectd/multimeter.a
 #usr/lib/collectd/multimeter.la
 usr/lib/collectd/multimeter.so
-#usr/lib/collectd/network.a
 #usr/lib/collectd/network.la
 usr/lib/collectd/network.so
-#usr/lib/collectd/nfs.a
 #usr/lib/collectd/nfs.la
 usr/lib/collectd/nfs.so
-#usr/lib/collectd/ntpd.a
 #usr/lib/collectd/ntpd.la
 usr/lib/collectd/ntpd.so
-#usr/lib/collectd/olsrd.a
 #usr/lib/collectd/olsrd.la
 usr/lib/collectd/olsrd.so
-#usr/lib/collectd/openvpn.a
 #usr/lib/collectd/openvpn.la
 usr/lib/collectd/openvpn.so
-#usr/lib/collectd/ping.a
 #usr/lib/collectd/ping.la
 usr/lib/collectd/ping.so
-#usr/lib/collectd/powerdns.a
 #usr/lib/collectd/powerdns.la
 usr/lib/collectd/powerdns.so
-#usr/lib/collectd/processes.a
 #usr/lib/collectd/processes.la
 usr/lib/collectd/processes.so
-#usr/lib/collectd/protocols.a
 #usr/lib/collectd/protocols.la
 usr/lib/collectd/protocols.so
-#usr/lib/collectd/python.a
-#usr/lib/collectd/python.la
-usr/lib/collectd/python.so
-#usr/lib/collectd/rrdcached.a
 #usr/lib/collectd/rrdcached.la
 usr/lib/collectd/rrdcached.so
-#usr/lib/collectd/rrdtool.a
 #usr/lib/collectd/rrdtool.la
 usr/lib/collectd/rrdtool.so
-#usr/lib/collectd/sensors.a
 #usr/lib/collectd/sensors.la
 usr/lib/collectd/sensors.so
-#usr/lib/collectd/swap.a
 #usr/lib/collectd/swap.la
 usr/lib/collectd/swap.so
-#usr/lib/collectd/syslog.a
 #usr/lib/collectd/syslog.la
 usr/lib/collectd/syslog.so
-#usr/lib/collectd/table.a
 #usr/lib/collectd/table.la
 usr/lib/collectd/table.so
-#usr/lib/collectd/tail.a
 #usr/lib/collectd/tail.la
 usr/lib/collectd/tail.so
-#usr/lib/collectd/target_notification.a
 #usr/lib/collectd/target_notification.la
 usr/lib/collectd/target_notification.so
-#usr/lib/collectd/target_replace.a
 #usr/lib/collectd/target_replace.la
 usr/lib/collectd/target_replace.so
-#usr/lib/collectd/target_scale.a
 #usr/lib/collectd/target_scale.la
 usr/lib/collectd/target_scale.so
-#usr/lib/collectd/target_set.a
 #usr/lib/collectd/target_set.la
 usr/lib/collectd/target_set.so
-#usr/lib/collectd/tcpconns.a
 #usr/lib/collectd/tcpconns.la
 usr/lib/collectd/tcpconns.so
-#usr/lib/collectd/teamspeak2.a
 #usr/lib/collectd/teamspeak2.la
 usr/lib/collectd/teamspeak2.so
-#usr/lib/collectd/ted.a
 #usr/lib/collectd/ted.la
 usr/lib/collectd/ted.so
-#usr/lib/collectd/thermal.a
 #usr/lib/collectd/thermal.la
 usr/lib/collectd/thermal.so
-#usr/lib/collectd/unixsock.a
 #usr/lib/collectd/unixsock.la
 usr/lib/collectd/unixsock.so
-#usr/lib/collectd/uptime.a
 #usr/lib/collectd/uptime.la
 usr/lib/collectd/uptime.so
-#usr/lib/collectd/users.a
 #usr/lib/collectd/users.la
 usr/lib/collectd/users.so
-#usr/lib/collectd/uuid.a
 #usr/lib/collectd/uuid.la
 usr/lib/collectd/uuid.so
-#usr/lib/collectd/vmem.a
 #usr/lib/collectd/vmem.la
 usr/lib/collectd/vmem.so
-#usr/lib/collectd/wireless.a
 #usr/lib/collectd/wireless.la
 usr/lib/collectd/wireless.so
-#usr/lib/collectd/write_http.a
 #usr/lib/collectd/write_http.la
 usr/lib/collectd/write_http.so
-#usr/lib/libcollectdclient.a
 #usr/lib/libcollectdclient.la
-usr/lib/libcollectdclient.so
+#usr/lib/libcollectdclient.so
 usr/lib/libcollectdclient.so.0
 usr/lib/libcollectdclient.so.0.0.0
 #usr/lib/perl5/Collectd
@@ -242,5 +173,6 @@  usr/share/collectd/types.db
 #usr/share/man/man5/collectd-unixsock.5
 #usr/share/man/man5/collectd.conf.5
 #usr/share/man/man5/types.db.5
-#var/lib/collectd
 var/ipfire/ovpn/collectd.vpn
+#var/lib/collectd
+etc/rc.d/init.d/collectd
diff --git a/lfs/collectd b/lfs/collectd
index 09d8c6fcf..3d8ef33a5 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -114,12 +114,13 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
 		--disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
 		--disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \
-		--disable-{perl,serial,snmp,tape,vserver,xmms} \
+		--disable-{perl,serial,snmp,tape,vserver,xmms,python} \
 		--enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \
 		--enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
 		--enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
 		--enable-{tcpconns,unixsock,users,wireless} \
 		--with-librrd=/usr/share/rrdtool-1.2.30 \
+		--disable-static \
 		--with-fp-layout=nothing
 	cd $(DIR_APP) && make install #collectd-4 does not support parallel build
 	cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/