Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eudev: rebuild 32bit pkgconfig.

Browse Source
This commit is contained in:
4fury-c3440d8
2021-02-17 06:33:04 +03:00
parent 35b4258ec8
commit c23cd34fd6
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/eudev/actions.py
+22 -18
View File
@@ -1,13 +1,12 @@
#!/usr/bin/python #!/usr/bin/python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Copyright 2015 TUBITAK/UEKAE # Licensed under the GNU General Public License, version 3.
# Licensed under the GNU General Public License, version 2. # See the file https://www.gnu.org/licenses/gpl-3.0.txt
# See the file http://www.gnu.org/copyleft/gpl.txt.
from pisi.actionsapi import shelltools
from pisi.actionsapi import autotools from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get from pisi.actionsapi import get
suffix = "32" if get.buildTYPE() == "emul32" else "" suffix = "32" if get.buildTYPE() == "emul32" else ""
@@ -15,17 +14,22 @@ suffix = "32" if get.buildTYPE() == "emul32" else ""
def setup(): def setup():
autotools.autoreconf("-fis") autotools.autoreconf("-fis")
autotools.configure("--prefix=/usr \ j = "--prefix=/usr \
--bindir=/sbin \ --bindir=/sbin \
--sbindir=/sbin \ --sbindir=/sbin \
--libdir=/usr/lib \ --libdir=/usr/lib \
--sysconfdir=/etc \ --sysconfdir=/etc \
--libexecdir=/lib \ --libexecdir=/lib \
--with-rootprefix= \ --with-rootprefix= \
--with-rootlibdir=/lib \ --with-rootlibdir=/lib \
--enable-split-usr \ --enable-split-usr \
--enable-static \ --enable-static \
--disable-manpages ") --disable-manpages "
if get.buildTYPE() == "emul32":
j += "--libdir=/usr/lib32 --libexecdir=/lib32 --with-rootlibdir=/lib32"
autotools.configure(j)
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
@@ -38,14 +42,14 @@ def install():
# emul32 stop here # emul32 stop here
if get.buildTYPE() == "emul32": if get.buildTYPE() == "emul32":
shelltools.move("%s%s/lib" % (get.installDIR(), suffix), "%s/lib%s" % (get.installDIR(), suffix)) shelltools.move("%s%s/lib32" % (get.installDIR(), suffix), "%s/lib%s" % (get.installDIR(), suffix))
shelltools.move("%s%s/usr/lib" % (get.installDIR(), suffix), "%s/usr/lib%s" % (get.installDIR(), suffix)) shelltools.move("%s%s/usr/lib32" % (get.installDIR(), suffix), "%s/usr/lib%s" % (get.installDIR(), suffix))
#for f in shelltools.ls("%s/usr/lib32/pkgconfig" % get.installDIR()): #for f in shelltools.ls("%s/usr/lib32/pkgconfig" % get.installDIR()):
# pisitools.dosed("%s/usr/lib32/pkgconfig/%s" % (get.installDIR(), f), "emul32", "usr") # pisitools.dosed("%s/usr/lib32/pkgconfig/%s" % (get.installDIR(), f), "emul32", "usr")
#shelltools.unlinkDir("%s%s" % (get.installDIR(), suffix)) #shelltools.unlinkDir("%s%s" % (get.installDIR(), suffix))
shelltools.unlink("%s/usr/lib%s/libudev.so" % (get.installDIR(), suffix)) shelltools.unlink("%s/usr/lib%s/libudev.so" % (get.installDIR(), suffix))
pisitools.dosym("/lib%s/libudev.so.1.6.3" % suffix, "/usr/lib%s/libudev.so" % suffix) pisitools.dosym("/lib%s/libudev.so.1.6.3" % suffix, "/usr/lib%s/libudev.so" % suffix)
shelltools.unlinkDir("%s/usr/lib%s/pkgconfig" % (get.installDIR(), suffix)) #shelltools.unlinkDir("%s/usr/lib%s/pkgconfig" % (get.installDIR(), suffix))
shelltools.unlinkDir("%s/lib%s/udev" % (get.installDIR(), suffix)) shelltools.unlinkDir("%s/lib%s/udev" % (get.installDIR(), suffix))
return return
system/base/eudev/pspec.xml
+3 -3
View File
@@ -15,7 +15,7 @@
<Archive sha1sum="0648c6e104057fc074a80a742d316cd0b6bee949" type="targz">https://github.com/gentoo/eudev/archive/v3.2.9.tar.gz</Archive> <Archive sha1sum="0648c6e104057fc074a80a742d316cd0b6bee949" type="targz">https://github.com/gentoo/eudev/archive/v3.2.9.tar.gz</Archive>
<AdditionalFiles> <AdditionalFiles>
<!-- http://www.linuxfromscratch.org/lfs/view/development/chapter06/eudev.html --> <!-- http://www.linuxfromscratch.org/lfs/view/development/chapter06/eudev.html -->
<AdditionalFile target="config.cache">config.cache</AdditionalFile> <AdditionalFile target="config.cache">config.cache</AdditionalFile>
</AdditionalFiles> </AdditionalFiles>
<BuildDependencies> <BuildDependencies>
<Dependency>glibc-devel</Dependency> <Dependency>glibc-devel</Dependency>
@@ -93,7 +93,7 @@
<History> <History>
<Update release="13"> <Update release="13">
<Date>2020-12-09</Date> <Date>2021-02-17</Date>
<Version>3.2.9</Version> <Version>3.2.9</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name> <Name>Mustafa Cinasal</Name>
@@ -106,7 +106,7 @@
<Name>Mustafa Cinasal</Name> <Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email> <Email>muscnsl@gmail.com</Email>
</Update> </Update>
<Update release="11"> <Update release="11">
<Date>2019-12-25</Date> <Date>2019-12-25</Date>
<Version>3.2.8</Version> <Version>3.2.8</Version>
<Comment>Version bump</Comment> <Comment>Version bump</Comment>