aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2012-11-22 23:35:23 +0000
committerOlivier Blin <blino@mageia.org>2012-11-22 23:35:23 +0000
commit41bce8adc771335d8936da45ec9e298e523aaf45 (patch)
treef1771b063d9da0c64f0732149d4f96e4ce935771
parent975c9d69d6fac35f07086cc03a20bdc8fd3b288c (diff)
modify arch_tagged macro to use ()(64bit) instead of (lib64), to be
compatible with the mark64 provides generated by find-provides
-rw-r--r--NEWS3
-rw-r--r--build.macros.in2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 0a57496..1355602 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- modify arch_tagged macro to use ()(64bit) instead of (lib64), to be
+ compatible with the mark64 provides generated by find-provides
+
Version 1.162 - 2 Nov 2012, by Funda Wang
- set LC_CTYPE as UTF-8 when building gem
diff --git a/build.macros.in b/build.macros.in
index 55f6e46..ebe26cf 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -47,7 +47,7 @@ Group: %{group}\
# Multilibs
%_multilibpatt (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-%_arch_tag_suffix (%_lib)
+%_arch_tag_suffix %([ "%{?_lib}" = "lib64" ] && echo "()(64bit)")
%arch_tagged() %{1}%{_arch_tag_suffix} %{?2:%{2} %{3}%{?!3:%{error:undefined 3rd argument in arch_tagged}}}
# Games macros