429996419e
Signed-off-by: liubo <liubo1@xfusion.com> (cherry picked from commit 0d584a02c25906d9934e71cc2dd70d211e333bae)
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From c492be59b02791c5ef084ead9842f5ca07cbdf64 Mon Sep 17 00:00:00 2001
|
|
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
Date: Fri, 8 Nov 2019 21:52:11 +0100
|
|
Subject: [PATCH] RPM removed %buildarch macro
|
|
|
|
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
---
|
|
macros.erlang | 2 +-
|
|
testing.py | 6 ++++++
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/macros.erlang b/macros.erlang
|
|
index 6fe859e..0f6e49f 100644
|
|
--- a/macros.erlang
|
|
+++ b/macros.erlang
|
|
@@ -1,7 +1,7 @@
|
|
# handy macros for erlang-related packages
|
|
|
|
%_erldir %{_libdir}/erlang
|
|
-%_erllibdir %(a=%{buildarch}; if [ "$a" == "noarch" ] ; then echo %{_datadir}/erlang/lib; else echo %{_erldir}/lib; fi)
|
|
+%_erllibdir %(if [ "%{_target_cpu}" == "noarch" ] ; then echo %{_datadir}/erlang/lib; else echo %{_erldir}/lib; fi)
|
|
|
|
%__rebar /usr/bin/rebar
|
|
|
|
diff --git a/testing.py b/testing.py
|
|
index 4a5c263..d0edd07 100644
|
|
--- a/testing.py
|
|
+++ b/testing.py
|
|
@@ -34,6 +34,12 @@ class TestAllMethods(unittest.TestCase):
|
|
Deps = ['erlang-erts', 'erlang-kernel', 'erlang-stdlib']
|
|
self.assertEqual(M.inspect_beam_file('noarch', "./test.beam"), Deps)
|
|
|
|
+ def test_check_for_absense_of_buildarch_macro(self):
|
|
+ self.assertEqual(rpm.expandMacro("%{buildarch}"), "%{buildarch}")
|
|
+
|
|
+ def test_check_for_target_cpu_macro(self):
|
|
+ self.assertNotEqual(rpm.expandMacro("%{_target_cpu}"), "%{_target_cpu}")
|
|
+
|
|
if __name__ == "__main__":
|
|
M = __import__("erlang-find-requires")
|
|
|
|
--
|
|
2.42.0.windows.2
|
|
|