Commit Graph

20 Commits

Author SHA1 Message Date
Igor Gnatenko 1515fca2d9 rpm: pass --auto-features=enabled [skip ci]
We really want to be explicit.

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2018-07-25 12:52:59 +02:00
Igor Gnatenko 88d1b8f9e7 rpm: use %{shrink…} [skip ci]
Make logs look better!

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2018-07-25 12:52:59 +02:00
Igor Gnatenko 99070beec4 rpm: use %set_build_flags [skip ci]
It has better name and should do the trick.

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2018-07-25 12:52:59 +02:00
Igor Gnatenko 18675c3dea rpm: print testlog from subshell
false || { rc=$?; echo $rc; exit $rc } || :

Exits current shell without possibility to prevent that.

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2018-01-04 22:09:51 +02:00
Zbigniew Jędrzejewski-Szmek 92219a2739 rpm: print test logs on failure
References: https://bugzilla.redhat.com/show_bug.cgi?id=1500248
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2017-10-12 20:53:42 +03:00
Igor Gnatenko 9635d0bd69 rpm: pass --wrap-mode=nodownload to %meson
With ability to change it if needed.
2017-04-28 22:36:39 +03:00
Igor Gnatenko 5bf22c5678 add support for $sharedstatedir
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2016-12-18 00:08:45 +01:00
Igor Gnatenko 2962d3a66b add support for $infodir
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2016-12-18 00:01:27 +01:00
Igor Gnatenko 380b362fa4 add support for $sbindir
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2016-12-18 00:01:23 +01:00
Igor Gnatenko b80f8b2dc2 rpm: use VPATH macro
This is more or less standardized way to have one variable which
will work for all buildsystems defined in redhat-rpm-config.

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2016-12-15 20:45:01 +02:00
Igor Gnatenko 0121faf168 rpm: use __global_*flags
Using RPM's %{optflags} is definitely nice, but not enough. LDFLAGS
are not there, and idea of optflags is too generic. It is supposed
to work under CC and CXX, but apparently someone forgot that there
is difference between these two.

%__global_*flags is not part of RPM itself, it's coming within
redhat-rpm-config which makes our macros file not that portable,
but anyway we already have %__global_ldflags and %ninja_build and
no one complained.

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2016-12-13 16:29:57 +02:00
Igor Gnatenko dcd3c21712 rpm: use meson's syntax to specify sourcedir and builddir
When user uses %meson -Denable_cool_feature=true current macro fails
because RPM adds flag after popd:
...
pushd x86_64-redhat-linux-gnu
  /usr/bin/meson ... $OLDPWD/.
popd -Denable_cool_feature

Since meson can accept $srcdir and $builddir arugments we don't have
this problem with pushd/popd. It also simplifies things a bit.

Reported-by: Richard Hughes <richard@hughsie.com>
References: https://bugzilla.redhat.com/show_bug.cgi?id=1401062
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2016-12-13 14:20:24 +02:00
Igor Gnatenko c9818c02ec add builtin support for localstatedir
Reported-by: Richard Hughes <richard@hughsie.com>
Closes: https://github.com/mesonbuild/meson/issues/1142
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
2016-12-06 20:27:02 +02:00
Igor Gnatenko 1e640955b6 fixup! fixup! rpm: couple of improvements and fixes 2016-10-08 17:15:02 +02:00
Igor Gnatenko b0fc370e72 fixup! rpm: couple of improvements and fixes 2016-10-08 17:13:37 +02:00
Igor Gnatenko 0d58ddd739 rpm: couple of improvements and fixes
* Don't hardcode /usr/bin, use %{_bindir}
* Implement %meson_build / %meson_install / %meson_test
* Automatic handling of out-of-tree builds

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2016-10-08 17:12:20 +02:00
Igor Gnatenko 3ed1ff1c71 macros.meson: override all supported options (#717)
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2016-08-25 22:35:02 +03:00
Igor Gnatenko e96a31cce4 rpm macros: export *FLAGS
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2015-10-30 16:57:23 +01:00
Igor Gnatenko c1dddce4e7 macros.meson: simplify RPM macros by using expand
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2015-08-02 01:21:13 +03:00
Jussi Pakkanen eed0e7d9f6 Moved rpm macros to a subdirectory to reduce clutter. 2015-03-23 18:20:42 +02:00