Merge pull request #8528 from blue-devil/master

rrdtool:rebuild
2020-05-19 01:02:21 +03:00
parent cede898e6d 9a289749ba
commit cf88c4db9d
3 changed files with 43 additions and 17 deletions
@@ -4,19 +4,22 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file http://www.gnu.org/licenses/gpl.txt

+from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import perlmodules
-from pisi.actionsapi import get


 def setup():
    shelltools.export("AUTOPOINT", "/bin/true")
-#    autotools.autoreconf("-vfi")
+    #autotools.autoreconf("-vfi")
+    # suppress compiler warnings
+    pisitools.cflags.add("-Wno-missing-prototypes -Wno-format-truncation -Wno-implicit-fallthrough -Wno-cast-function-type -Wstringop-truncation")
+    # fix unused direct dependency analysis
+    shelltools.export("LDSHARED", "x86_64-pc-linux-gnu-gcc -Wl,-O1,--as-needed -shared -lpthread")
    autotools.configure("--disable-silent-rules \
                         --disable-static \
-                         --disable-rpath \
                         --enable-perl \
                         --enable-ruby \
                         --enable-lua \
@@ -32,6 +35,9 @@ def setup():
    pisitools.dosed("bindings/Makefile", "^RRDDOCDIR.*$", "RRDDOCDIR=${datadir}/doc/${PACKAGE}")
    pisitools.dosed("examples/Makefile", "examplesdir = .*$", "examplesdir = $(datadir)/doc/${PACKAGE}/examples")
    
+    # TODO: fix rpath and unused direct dependency analysis
+    
+    # fix unused direct dependency analysis
    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")

 def build():
@@ -42,4 +48,4 @@ def install():

    # remove unnecessary files
    perlmodules.removePacklist()
-    perlmodules.removePodfiles()
+    perlmodules.removePodfiles()
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
    <Source>
        <Name>rrdtool</Name>
@@ -8,6 +8,7 @@
            <Name>PisiLinux Community</Name>
            <Email>admins@pisilinux.org</Email>
        </Packager>
+        <PartOf>network.analyzer</PartOf>
        <License>GPLv2</License>
        <IsA>app:console</IsA>
        <IsA>library</IsA>
@@ -15,43 +16,45 @@
        <Description>RRD is the acronym for Round Robin Database. RRD is a system to store and display time-series data (i.e. network bandwidth, machine/room temperature, server load average).</Description>
        <Archive sha1sum="f0e54258b0f871099623e3a866751928abbb47af" type="targz">http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz</Archive>
        <BuildDependencies>
+            <Dependency>perl</Dependency>
+            <Dependency>groff</Dependency>
            <Dependency>lua-devel</Dependency>
            <Dependency>tcl-devel</Dependency>
-            <Dependency versionFrom="2.6.4">ruby-devel</Dependency>
            <Dependency>cairo-devel</Dependency>
            <Dependency>pango-devel</Dependency>
-            <Dependency>libart_lgpl-devel</Dependency>
            <Dependency>dejavu-fonts</Dependency>
-            <Dependency>perl</Dependency>
            <Dependency>glib2-devel</Dependency>
            <Dependency>python-devel</Dependency>
            <Dependency>libxml2-devel</Dependency>
+            <Dependency>libart_lgpl-devel</Dependency>
            <Dependency>python-setuptools</Dependency>
            <Dependency>tcp-wrappers-devel</Dependency>
-            <Dependency>groff</Dependency>
+            <Dependency versionFrom="2.6.4">ruby-devel</Dependency>
        </BuildDependencies>
        <Patches>
            <!--Patch level="1">rrdtool-1.4.7-ruby-2-fix.patch</Patch-->
-<!--             <Patch level="1">0001_rrdtool-1.4.7-configure.ac.patch</Patch> -->
-<!--             <Patch level="1">rrdtool-1.4.5-automake-1.11.2.patch</Patch> -->
+            <!--<Patch level="1">0001_rrdtool-1.4.7-configure.ac.patch</Patch> -->
+            <!--<Patch level="1">rrdtool-1.4.5-automake-1.11.2.patch</Patch> -->
        </Patches>
    </Source>

    <Package>
        <Name>rrdtool</Name>
+        <Summary>A system to store and display time-series data</Summary>
        <RuntimeDependencies>
            <Dependency>lua</Dependency>
            <Dependency>tcl</Dependency>
+            <Dependency>perl</Dependency>
            <Dependency>ruby</Dependency>
            <Dependency>cairo</Dependency>
+            <Dependency>glib2</Dependency>
            <Dependency>pango</Dependency>
            <Dependency>libpng</Dependency>
-            <Dependency>libart_lgpl</Dependency>
-            <Dependency>dejavu-fonts</Dependency>
-            <Dependency>perl</Dependency>
-            <Dependency>glib2</Dependency>
            <Dependency>python</Dependency>
            <Dependency>libxml2</Dependency>
+            <Dependency>rubygems</Dependency>
+            <Dependency>libart_lgpl</Dependency>
+            <Dependency>dejavu-fonts</Dependency>
            <Dependency>tcp-wrappers</Dependency>
        </RuntimeDependencies>
        <Files>
@@ -66,6 +69,7 @@

    <Package>
        <Name>rrdtool-devel</Name>
+        <Summary>Development header files for rrdtool.</Summary>
        <RuntimeDependencies>
            <Dependency release="current">rrdtool</Dependency>
        </RuntimeDependencies>
@@ -76,6 +80,16 @@
    </Package>

    <History>
+        <Update release="8">
+            <Date>2020-05-18</Date>
+            <Version>1.7.2</Version>
+            <Comment>
+                * Rebuild due to new ruby
+                * Fix translation
+            </Comment>
+            <Name>Blue Devil</Name>
+            <Email>bluedevil@sctzine.com</Email>
+        </Update>
        <Update release="7">
            <Date>2020-01-18</Date>
            <Version>1.7.2</Version>
@@ -126,4 +140,4 @@
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
-</PISI>
+</PISI>
@@ -5,4 +5,10 @@
        <Summary xml:lang="tr">Zaman serisi verilerini saklamak ve göstermek için bir araç</Summary>
        <Description xml:lang="tr">RRD, Round Robin Database için kullanılan bir kısaltmadır. RRD, zaman serisi verilerini (ör. ağ bantgenişliği, makine/oda sıcaklığı, ortalama sunucu yükü) saklamak ve göstermek için kullanılan bir sistemdir.</Description>
    </Source>
-</PISI>
+
+    <Package>
+        <Name>rrdtool-devel</Name>
+        <Summary xml:lang="tr">rrdtool için geliştirme dosyaları</Summary>
+        <Description xml:lang="tr">rrdtool-devel, rrdtool için geliştirme dosyalarını içerir.</Description>
+    </Package>
+</PISI>