commit 1719784fb17c2de80679d0e87f9d0b58113b604f
Author: Elan Ruusamäe <[email protected]>
Date: Wed Jun 29 23:28:51 2016 +0300
v1.717: %py_install_opts, %py3_install_opts
moved from %py_install, %py3_install so it could be used elsewhere in
install section
rpm-build-macros.spec | 2 +-
rpm.macros | 36 ++++++++++++++++++++++++------------
2 files changed, 25 insertions(+), 13 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 72331d4..0c15aa1 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 1.716
+%define rpm_macros_rev 1.717
%define find_lang_rev 1.38
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index 1c07df4..aeb242c 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -1107,7 +1107,7 @@ fi \
%py3_ocomp %{__python3} -O -c "import compileall; import sys;
compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
-%py_build { \
+%py_build { \
LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
@@ -1117,7 +1117,16 @@ fi \
build --build-base=build-2 \
}
-%py_install { \
+# "shrink" filter to keep this macro without newlines,
+# so it could be used as make arguments
+%py_install_opts() %{shrink: \
+ --prefix=%{_prefix} \
+ --install-purelib=%{py_sitescriptdir} \
+ --install-platlib=%{py_sitedir} \
+ --optimize=2 \
+}
+
+%py_install { \
LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
@@ -1126,14 +1135,11 @@ fi \
%{__python} setup.py \
build --build-base=build-2 \
install --skip-build \
- --prefix=%{_prefix} \
- --install-purelib=%{py_sitescriptdir} \
- --install-platlib=%{py_sitedir} \
- --optimize=2 \
+ %{py_install_opts} \
--root=$RPM_BUILD_ROOT \
}
-%py3_build { \
+%py3_build { \
LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
@@ -1142,7 +1148,16 @@ fi \
%{__python3} setup.py build --build-base=build-3 \
}
-%py3_install { \
+# "shrink" filter to keep this macro without newlines,
+# so it could be used as make arguments
+%py3_install_opts() %{shrink: \
+ --prefix=%{_prefix} \
+ --install-purelib=%{py3_sitescriptdir} \
+ --install-platlib=%{py3_sitedir} \
+ --optimize=2 \
+}
+
+%py3_install { \
LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
@@ -1151,10 +1166,7 @@ fi \
%{__python3} setup.py \
build --build-base=build-3 \
install --skip-build \
- --prefix=%{_prefix} \
- --install-purelib=%{py3_sitescriptdir} \
- --install-platlib=%{py3_sitedir} \
- --optimize=2 \
+ %{py3_install_opts} \
--root=$RPM_BUILD_ROOT \
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/1719784fb17c2de80679d0e87f9d0b58113b604f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
