Make it work with current master.

pull/3590/head
Jussi Pakkanen 7 years ago
parent e60bf5d833
commit 10b094c980
  1. 17
      mesonbuild/minstall.py

@ -384,14 +384,15 @@ class Installer:
def install_targets(self, d): def install_targets(self, d):
for t in d.targets: for t in d.targets:
fname = check_for_stampfile(t[0]) fname = check_for_stampfile(t.fname)
outdir = get_destdir_path(d, t[1]) outdir = get_destdir_path(d, t.outdir)
outname = os.path.join(outdir, os.path.basename(fname)) outname = os.path.join(outdir, os.path.basename(fname))
final_path = os.path.join(d.prefix, outname) final_path = os.path.join(d.prefix, t.outdir, os.path.basename(fname))
aliases = t[2] aliases = t.aliases
should_strip = t[3] should_strip = t.strip
install_rpath = t[4] install_rpath = t.install_rpath
install_mode = t[5] install_name_mappings = t.install_name_mappings
install_mode = t.install_mode
d.dirmaker.makedirs(outdir, exist_ok=True) d.dirmaker.makedirs(outdir, exist_ok=True)
if not os.path.exists(fname): if not os.path.exists(fname):
raise RuntimeError('File {!r} could not be found'.format(fname)) raise RuntimeError('File {!r} could not be found'.format(fname))
@ -438,7 +439,7 @@ class Installer:
if os.path.isfile(outname): if os.path.isfile(outname):
try: try:
depfixer.fix_rpath(outname, install_rpath, final_path, depfixer.fix_rpath(outname, install_rpath, final_path,
verbose=False) install_name_mappings, verbose=False)
except SystemExit as e: except SystemExit as e:
if isinstance(e.code, int) and e.code == 0: if isinstance(e.code, int) and e.code == 0:
pass pass

Loading…
Cancel
Save