Merge pull request #1476 from 4fury-c3440d8/master

perlmodules rebuild.
This commit is contained in:
Rmys
2023-01-05 12:13:57 +03:00
committed by GitHub
4 changed files with 33 additions and 10 deletions
@@ -0,0 +1,13 @@
diff --git a/pisi/actionsapi/perlmodules.py b/pisi/actionsapi/perlmodules.py
index cd59b76..2bfb9d5 100644
--- a/pisi/actionsapi/perlmodules.py
+++ b/pisi/actionsapi/perlmodules.py
@@ -72,7 +72,7 @@ def install(parameters = 'install'):
if system('make %s' % parameters):
raise InstallError, _('Make failed.')
else:
- if system('perl Build install'):
+ if system('perl Build install %s' % parameters):
raise MakeError, _('perl install failed.')
removePacklist()
+8
View File
@@ -26,6 +26,7 @@
<Patch level="1">0001-PackageKit-Search-Bug-Fix.patch</Patch> <Patch level="1">0001-PackageKit-Search-Bug-Fix.patch</Patch>
<Patch level="1">pot_file_and_ru_translation.patch</Patch> <Patch level="1">pot_file_and_ru_translation.patch</Patch>
<Patch level="1">qt6-actionsapi.patch</Patch> <Patch level="1">qt6-actionsapi.patch</Patch>
<Patch level="1">perlmodules_fix_Build_PL.patch</Patch>
</Patches> </Patches>
</Source> </Source>
@@ -76,6 +77,13 @@
</Package> </Package>
<History> <History>
<Update release="23">
<Date>2022-12-31</Date>
<Version>2.7.2</Version>
<Comment>Rebuild perlmodules.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="22"> <Update release="22">
<Date>2022-10-05</Date> <Date>2022-10-05</Date>
<Version>2.7.2</Version> <Version>2.7.2</Version>
+9 -7
View File
@@ -8,15 +8,17 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import get from pisi.actionsapi import get
import os #import os
j = ''.join([
' --with-lzo2',
' --disable-static '
])
def setup(): def setup():
autotools.autoreconf("-fi") autotools.autoreconf("-fi")
autotools.configure("--disable-static \ autotools.configure(j)
--with-lzo2 \
") #pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build(): def build():
autotools.make() autotools.make()
@@ -26,7 +28,7 @@ def build():
def install(): def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR()) autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dosed("%s/usr/lib/pkgconfig/libarchive.pc" % get.installDIR(), "iconv", "") pisitools.dosed("%s/usr/lib/pkgconfig/libarchive.pc" % get.installDIR(), "iconv", "")
pisitools.dodoc("COPYING","NEWS") pisitools.dodoc("COPYING","NEWS")
+3 -3
View File
@@ -68,11 +68,11 @@
<History> <History>
<Update release="13"> <Update release="13">
<Date>2022-12-26</Date> <Date>2023-01-03</Date>
<Version>3.6.2</Version> <Version>3.6.2</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name> <Name>fury</Name>
<Email>muscnsl@gmail.com</Email> <Email>uglyside@yandex.ru</Email>
</Update> </Update>
<Update release="12"> <Update release="12">
<Date>2022-11-01</Date> <Date>2022-11-01</Date>