Commit 7586c2ae authored by Kirill Smelkov's avatar Kirill Smelkov

Cloudooo also uses libpng1.2 and libpng1.6 simultaneously

Fix it similarly to how readline is handled in ERP5 SR.
parent 488dbbc2
...@@ -311,8 +311,9 @@ def namever(url, failonerr=True): # -> (name, ver) | None if !failonerr ...@@ -311,8 +311,9 @@ def namever(url, failonerr=True): # -> (name, ver) | None if !failonerr
ver = del_tgztail(ver) ver = del_tgztail(ver)
ver = removeprefix(ver, 'v') ver = removeprefix(ver, 'v')
# XXX hack: in ERP5 SR we use both readline8 and readline-5 # XXX hack: in ERP5 SR we use both readline8 and readline-5
if name == 'readline' and ver.startswith('5'): # XXX in Cloudooo SR ----//---- libpng16 and libpng12
name += '5' if name == 'readline' and ver.startswith('5'): name += '5'
if name == 'libpng' and ver.startswith('1.2'): name += '12'
return name, ver return name, ver
def _namever(url, failonerr): def _namever(url, failonerr):
......
...@@ -305,16 +305,26 @@ case1("""\ ...@@ -305,16 +305,26 @@ case1("""\
recipe = plone.recipe.command recipe = plone.recipe.command
""", '') """, '')
# readline 8 and 5 used simultaneously -> older one is presented as readline5 # readline 8 and 5 used simultaneously -> older one is presented as readline5
# libpng 12 and 16 used simultaneously -> ----//---- libpng12
case1("""\ case1("""\
[readline] [readline]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz url = http://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz
[readline5] [readline5]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
[libpng]
recipe = slapos.recipe.cmmi
url = http://download.sourceforge.net/libpng/libpng-1.6.37.tar.xz
[libpng12]
recipe = slapos.recipe.cmmi
url = http://download.sourceforge.net/libpng/libpng-1.2.59.tar.xz
""", """\ """, """\
libpng 1.6.37 http://download.sourceforge.net/libpng/libpng-1.6.37.tar.xz
libpng12 1.2.59 http://download.sourceforge.net/libpng/libpng-1.2.59.tar.xz
readline 8.1 http://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz readline 8.1 http://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz
readline5 5.2 http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz readline5 5.2 http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
""") """)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment