From 4e8696fefcc2c4ce2c5d49b19ce5b4a8a9b9debb Mon Sep 17 00:00:00 2001

From: Igor Gnatenko <i.gnatenko.brain@gmail.com>

Date: Fri, 7 Oct 2016 23:15:55 +0200

Subject: [PATCH 09/10] allow libdir/includedir/etc. be absolute paths

In Fedora we don't care about prefix, we want to ensure that libdir

is /usr/lib64, localedir is /usr/share/locale, and cetera.

Additionally, we don't need to ensure that prefix is absolute as we

check it in main.

Fixes: cc19bf0f45f9 ("Move option validation in objects rather than doing it only in the conf script.")

Closes: https://github.com/mesonbuild/meson/issues/869

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

(cherry picked from commit a513bcfde613f2a0403f7b0cd34d4bd62674c1d8)

---

 mesonbuild/coredata.py  | 5 -----

 mesonbuild/mesonmain.py | 2 +-

 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py

index 2ff3bc8..34bb6f1 100644

--- a/mesonbuild/coredata.py

+++ b/mesonbuild/coredata.py

@@ -36,11 +36,6 @@ class UserStringOption(UserOption):

     def validate(self, value):

         if not isinstance(value, str):

             raise MesonException('Value "%s" for string option "%s" is not a string.' % (str(value), self.name))

-        if self.name == 'prefix' and not os.path.isabs(value):

-            raise MesonException('Prefix option value \'{0}\' must be an absolute path.'.format(value))

-        if self.name in ('libdir', 'bindir', 'includedir', 'datadir', 'mandir', 'localedir') \

-            and os.path.isabs(value):

-            raise MesonException('Option %s must not be an absolute path.' % self.name)

     def set_value(self, newvalue):

         self.validate(newvalue)

diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py

index 6374c41..43e4eee 100644

--- a/mesonbuild/mesonmain.py

+++ b/mesonbuild/mesonmain.py

@@ -70,7 +70,7 @@ class MesonApp():

     def __init__(self, dir1, dir2, script_file, handshake, options, original_cmd_line_args):

         (self.source_dir, self.build_dir) = self.validate_dirs(dir1, dir2, handshake)

         if not os.path.isabs(options.prefix):

-            raise RuntimeError('--prefix value \'{0}\' must be an absolute path: '.format(options.prefix))

+            raise RuntimeError('--prefix value must be an absolute path: {!r}'.format(options.prefix))

         if options.prefix.endswith('/') or options.prefix.endswith('\\'):

             # On Windows we need to preserve the trailing slash if the

             # string is of type 'C:\' because 'C:' is not an absolute path.

-- 

2.10.1