base rebuild

system/base/json-c/actions.py

@@ -7,18 +7,32 @@
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import shelltools
+from pisi.actionsapi import cmaketools
 from pisi.actionsapi import get
 
 def setup():
-    #autotools.autoreconf("-fi")
-    autotools.configure("--disable-static \
-                         --disable-rpath \
-                         --enable-shared")
-                         
+    shelltools.makedirs("build")
+    shelltools.cd("build")
+    options = "-DCMAKE_INSTALL_PREFIX=/usr \
+               -DCMAKE_INSTALL_LIBDIR=lib \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DBUILD_STATIC_LIBS=OFF"
+               
+    if get.buildTYPE() == "emul32":
+        shelltools.export("CC", "gcc -m32")
+        shelltools.export("CXX", "g++ -m32")        
+        options = " -DCMAKE_INSTALL_LIBDIR=lib32 -DBUILD_STATIC_LIBS=OFF"
+    
+    cmaketools.configure(options, sourceDir=".." )
+
 def build():
-    autotools.make("-j1")
+    shelltools.cd("build")
+    cmaketools.make()
 
 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-
+    shelltools.cd("build")
+    cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
+    
+    
+    shelltools.cd("..")
     pisitools.dodoc("COPYING", "README", "ChangeLog", "AUTHORS", "NEWS")

system/base/json-c/pspec.xml

@@ -12,7 +12,10 @@
         <IsA>library</IsA>
         <Summary>A JSON implementation in C</Summary>
         <Description>json-c implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects.</Description>
-        <Archive sha1sum="d4c667ab94e7051b1e78aa727f0d937caba971e9" type="targz">https://github.com/json-c/json-c/archive/json-c-0.13.1-20180305.tar.gz</Archive>
+        <Archive sha1sum="dd6473818fe66f16e747ae0df626a2e1559343b9" type="targz">https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz</Archive>
+        <BuildDependencies>
+            <Dependency>cmake</Dependency>	
+        </BuildDependencies>
         <Patches>
 <!--             <Patch>wno-werror.patch</Patch> -->
         </Patches>
@@ -37,7 +40,9 @@
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/pkgconfig</Path>
+            <Path fileType="data">/usr/lib/cmake</Path>
             <Path fileType="data">/usr/lib32/pkgconfig</Path>
+            <Path fileType="data">/usr/lib32/cmake</Path>
         </Files>
     </Package>
 
@@ -55,7 +60,14 @@
     </Package>
 
     <History>
-		<Update release="5">
+        <Update release="6">
+            <Date>2020-12-09</Date>
+            <Version>0.15.20200726</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="5">
             <Date>2019-12-27</Date>
             <Version>0.13.1_20180305</Version>
             <Comment>Version bump</Comment>