Changeset cebd956 in mainline


Ignore:
Timestamp:
2023-10-22T16:45:25Z (14 months ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2944b5a
Parents:
8f9f9b1
git-author:
Vojtech Horky <vojtech.horky@…> (2023-08-02 16:33:40)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-22 16:45:25)
Message:

Prefer mkisofs if genisoimage is a symlink

File:
1 edited

Legend:

Unmodified
Added
Removed
  • meson/part/tools/meson.build

    r8f9f9b1 rcebd956  
    6161endif
    6262
     63# On some distributions (e.g. Arch Linux), genisoimage is actually a symbolic
     64# link to mkisofs. However, they do not accept exactly the same options.
     65# Thus we check if genisoimage is a symbolic link to mkisofs and if it is so,
     66# we switch to mkisofs as that is the native application available.
     67fs = import('fs')
    6368genisoimage = find_program('genisoimage', required: false)
    64 if genisoimage.found()
     69_mkisofs = find_program('mkisofs', required: false)
     70if genisoimage.found() and not (fs.is_symlink(genisoimage.full_path()) and _mkisofs.found() and fs.is_samepath(genisoimage.full_path(), _mkisofs.full_path()))
    6571        genisoimage_type = 'genisoimage'
    6672else
    67         genisoimage = find_program('mkisofs', required: false)
     73        genisoimage = _mkisofs
    6874        if genisoimage.found()
    6975                genisoimage_type = 'mkisofs'
Note: See TracChangeset for help on using the changeset viewer.