diff options
| author | Philippe Makowski <philippem@mageia.org> | 2013-09-25 21:27:40 +0200 |
|---|---|---|
| committer | Philippe Makowski <philippem@mageia.org> | 2013-09-25 21:27:40 +0200 |
| commit | 03ba0e258225997ca8e84e0ecc73080930d08472 (patch) | |
| tree | fefd6c521a0b71181044b74abb05c28a73718bd0 | |
| parent | a12bb63db7eaf6164196a453a48f0eb7f8326a68 (diff) | |
| download | rpm-setup-03ba0e258225997ca8e84e0ecc73080930d08472.tar rpm-setup-03ba0e258225997ca8e84e0ecc73080930d08472.tar.gz rpm-setup-03ba0e258225997ca8e84e0ecc73080930d08472.tar.bz2 rpm-setup-03ba0e258225997ca8e84e0ecc73080930d08472.tar.xz rpm-setup-03ba0e258225997ca8e84e0ecc73080930d08472.zip | |
improve macros for Python byte compilation1.188
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | build.macros.in | 8 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,6 @@ +Version 1.188 - 25 Sep 2013, by Philippe Makowski +- Improve macros for Python byte compilation + Version 1.187 - 24 Sep 2013, by Philippe Makowski - Add macros for Python byte compilation diff --git a/build.macros.in b/build.macros.in index 77f5148..6c5d720 100644 --- a/build.macros.in +++ b/build.macros.in @@ -305,7 +305,7 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o %__os_install_post \ %{?__spec_helper_post}%{?!__spec_helper_post:/usr/share/spec-helper/spec-helper} \ %{!?__jar_repack:/usr/lib/rpm/mageia/brp-java-repack-jars} \ - %{!?__brp-python-bytecompile:/usr/lib/rpm/brp-python-bytecompile /usr/bin/python 1} \ + %{!?__brp-python-bytecompile:[ %{?_python_bytecompile_build} -eq 1 ] && /usr/lib/rpm/brp-python-bytecompile %{__python} %{?_python_bytecompile_errors_terminate_build}} \ %{!?__brp-python-hardlink:/usr/lib/rpm/brp-python-hardlink} \ %{nil} @@ -342,6 +342,12 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o # Useful python macros %pyver %(python -V 2>&1 | cut -f2 -d" " | cut -f1,2 -d".") +# Should python bytecompilation errors terminate a build? +%_python_bytecompile_errors_terminate_build 1 + +# Enable python bytecompilation +%_python_bytecompile_build 1 + #------------------------------------------------------------------------------ # Useful perl macros # (initially from Artur Frysiak <wiget@t17.ds.pwr.wroc.pl>) diff --git a/configure.ac b/configure.ac index c57a00f..058cb32 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $ AC_PREREQ(2.59) -AC_INIT(rpm-mageia-setup, 1.187, philippem@mageia.org) +AC_INIT(rpm-mageia-setup, 1.188, philippem@mageia.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz) AC_CONFIG_SRCDIR |