base rebuild

system/base/libpcre2/actions.py

@@ -9,15 +9,20 @@ from pisi.actionsapi import libtools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 
+LIBDIR = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib"
+bindir = "/usr/bin32" if get.buildTYPE() == "emul32" else "/usr/bin"
+
 def setup():
     autotools.autoreconf("-vif")
     autotools.configure("--enable-jit \
+                         --libdir=%s \
+                         --bindir=%s \
                          --enable-pcre2test-libreadline \
                          --enable-pcre2-32 \
                          --enable-pcre2-16 \
                          --enable-unicode \
                          --docdir=/%s/%s \
-                         --disable-static" % (get.docDIR(), get.srcNAME()))
+                         --disable-static" % (LIBDIR, bindir, get.docDIR(), get.srcNAME()))
     
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
@@ -32,3 +37,7 @@ def check():
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    
+    if get.buildTYPE() == "emul32":
+        pisitools.removeDir("/usr/bin32")
+        return

system/base/libpcre2/pspec.xml

@@ -70,7 +70,7 @@
 
     <History>
 	<Update release="4">
-            <Date>2020-10-22</Date>
+            <Date>2020-12-09</Date>
             <Version>10.35</Version>
             <Comment>Version bump</Comment>
             <Name>PisiLinux Community</Name>