diff options
| author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-21 01:50:42 +0300 |
|---|---|---|
| committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-21 01:50:42 +0300 |
| commit | a7cd29c74b68d34db9066bdfa8a24be1cd8e4667 (patch) | |
| tree | 45977647d10270a4c75443be0f229f37dafb650d | |
| parent | d8c2f187068a8b7b1333dc59b1c9c28df787df9f (diff) | |
| download | meson-a7cd29c74b68d34db9066bdfa8a24be1cd8e4667.zip meson-a7cd29c74b68d34db9066bdfa8a24be1cd8e4667.tar.gz meson-a7cd29c74b68d34db9066bdfa8a24be1cd8e4667.tar.bz2 | |
modules/rpm: implement handling includedirs
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
| -rw-r--r-- | interpreter.py | 1 | ||||
| -rw-r--r-- | modules/rpm.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/interpreter.py b/interpreter.py index 35722ab..4ca5e58 100644 --- a/interpreter.py +++ b/interpreter.py @@ -619,6 +619,7 @@ class ModuleHolder(InterpreterObject): state.project_name = self.interpreter.build.project_name state.compilers = self.interpreter.build.compilers state.targets = self.interpreter.build.targets + state.headers = self.interpreter.build.get_headers() value = fn(state, args, kwargs) return self.interpreter.module_method_callback(value) diff --git a/modules/rpm.py b/modules/rpm.py index 0408ac8..97e50bd 100644 --- a/modules/rpm.py +++ b/modules/rpm.py @@ -62,6 +62,10 @@ class RPMModule: to_delete.append('%%{buildroot}%%{_libdir}/%s' % target.get_filename()) mlog.log('Warning, removing', mlog.bold(target.get_filename()), 'from package because packaging static libs not recommended') + for header in state.headers: + for hdr_src in header.get_sources(): + files_devel.append('%%{_includedir}/%s' % os.path.join( + header.get_install_subdir(), hdr_src)) if len(files_devel) > 0: devel_subpkg = True fn = open('%s.spec' % os.path.join(state.environment.get_build_dir(), proj), |