Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

Commit

Permalink
Update LilyPond spec for 2.21
Browse files Browse the repository at this point in the history
Use Python3 and do not touch lib/ folder that is not installed
anymore.
  • Loading branch information
hahnjo committed Mar 2, 2020
1 parent 6240dc8 commit b410505
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions gub/specs/lilypond.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class LilyPond__simple (target.AutoBuild):
'ghostscript',
'guile-devel',
'pango-devel',
'python-devel',
'python3-devel',
'tools::fonts-texgyre',
'tools::fonts-urw-core35',

Expand Down Expand Up @@ -69,7 +69,7 @@ class LilyPond__simple (target.AutoBuild):
+ ' --with-texgyre-dir=%(tools_prefix)s/share/fonts/opentype/texgyre'
+ ' --with-urwotf-dir=%(tools_prefix)s/share/fonts/opentype/urw-core35'
)
make_flags = ' TARGET_PYTHON=/usr/bin/python'
make_flags = ' TARGET_PYTHON=/usr/bin/python3'

if 'stat' in misc.librestrict ():
home = os.environ['HOME']
Expand Down Expand Up @@ -121,9 +121,6 @@ def installer_install_stuff (self):
self.system ('cd %(install_prefix)s/share/lilypond && mv %(installer_version)s current',
locals ())

self.system ('cd %(install_prefix)s/lib/lilypond && mv %(installer_version)s current',
locals ())

self.system ('mkdir -p %(install_prefix)s/etc/fonts/')
self.dump ('''\
<fontconfig>
Expand Down Expand Up @@ -155,7 +152,7 @@ class LilyPond__freebsd (LilyPond):
## shortcut: take python out of dependencies
class LilyPond__no_python (LilyPond):
dependencies = [x for x in LilyPond.dependencies
if x != 'python-devel']
if x != 'python3-devel']
def configure (self):
self.system ('mkdir -p %(builddir)s || true')
self.system ('touch %(builddir)s/Python.h')
Expand Down Expand Up @@ -224,7 +221,7 @@ class LilyPond__darwin (LilyPond):
])
configure_flags = (LilyPond.configure_flags
.replace ('--enable-rpath', '--disable-rpath'))
make_flags = ' TARGET_PYTHON="/usr/bin/env python2"'
make_flags = ' TARGET_PYTHON="/usr/bin/env python3"'

class LilyPond__darwin__ppc (LilyPond__darwin):
def configure (self):
Expand Down

0 comments on commit b410505

Please sign in to comment.