From e972ed878bbc3f6fb2f3a14f6f234289bbac67bd Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Sat, 13 Mar 2021 15:41:50 +0300
Subject: [PATCH] libxml2 rebuild py3

---
 system/base/libxml2/actions.py | 40 ++++++++++++++++++++++++++++++++--
 system/base/libxml2/pspec.xml  |  8 +++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/system/base/libxml2/actions.py b/system/base/libxml2/actions.py
index ae8c9406..054fb7a5 100755
--- a/system/base/libxml2/actions.py
+++ b/system/base/libxml2/actions.py
@@ -7,11 +7,16 @@
 from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
 
 def setup():
+    
     # fix sandbox violations when attempt to read "/missing.xml"
     pisitools.dosed("testapi.c", "\/missing.xml", "missing.xml")
-
+    
+    shelltools.system("mkdir build-py{2,3}")
+    shelltools.cd("build-py2")
+    shelltools.sym("../configure", "configure")
     options = "--with-zlib \
                --with-readline \
                --enable-ipv6 \
@@ -25,19 +30,50 @@ def setup():
         options += " --bindir=/emul32/bin \
                      --libdir=/usr/lib32 \
                      --without-python"
-    else: options += " --with-python \
+    else: options += " --with-python=/usr/bin/python \
+                       --libdir=/usr/lib"
+
+    autotools.configure(options)
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+    
+    shelltools.cd("../build-py3")
+    shelltools.sym("../configure", "configure")
+    options = "--with-zlib \
+               --with-readline \
+               --enable-ipv6 \
+               --includedir=/usr/include \
+               --disable-static \
+               --with-threads \
+               --with-history \
+              "
+
+    if get.buildTYPE() == "emul32":
+        options += " --bindir=/emul32/bin \
+                     --libdir=/usr/lib32 \
+                     --without-python"
+    else: options += " --with-python=/usr/bin/python3 \
                        --libdir=/usr/lib"
 
     autotools.configure(options)
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
+    shelltools.cd("build-py2")
+    autotools.make()
+    shelltools.cd("../build-py3")
     autotools.make()
 
 def check():
+    shelltools.cd("build-py2")
+    autotools.make("check")
+    shelltools.cd("../build-py3")
     autotools.make("check")
 
 def install():
+    shelltools.cd("build-py2")
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    
+    shelltools.cd("../build-py3")
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
     if get.buildTYPE() == "emul32" or "i686":
diff --git a/system/base/libxml2/pspec.xml b/system/base/libxml2/pspec.xml
index f3bff2ed..a97bfe2d 100755
--- a/system/base/libxml2/pspec.xml
+++ b/system/base/libxml2/pspec.xml
@@ -15,6 +15,7 @@
         <Archive sha1sum="db6592ec9ca9708c4e71bf6bfd907bbb5cd40644" type="targz">ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>python-devel</Dependency>
+            <Dependency>python3-devel</Dependency>
             <Dependency>xz-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency versionFrom="8.0.1">readline-devel</Dependency>
@@ -93,6 +94,13 @@
     </Package>
 
     <History>
+        <Update release="10">
+            <Date>2021-03-13</Date>
+            <Version>2.9.10</Version>
+            <Comment>Rebuild py3</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="9">
             <Date>2020-12-09</Date>
             <Version>2.9.10</Version>