aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2012-09-24 06:38:56 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2012-09-24 06:38:56 +0400
commit61c63a9737ebad0ade3b852851fd0bbc5870ec1c (patch)
treefebff80eb35a57b4daa44a8d8eb5d34e6eea0620
parent86e7308a52c3a1beab113e631c6667cbe02f7538 (diff)
downloadcibs-61c63a9737ebad0ade3b852851fd0bbc5870ec1c.tar.gz
Bitness via "variants"
variant.elf32=true for 32-bit libraries and related files variant.elf64=true for 64-bit
-rw-r--r--trans/arch10
-rw-r--r--trans/defaults2
2 files changed, 7 insertions, 5 deletions
diff --git a/trans/arch b/trans/arch
index 453ae42..a72ec6f 100644
--- a/trans/arch
+++ b/trans/arch
@@ -1,9 +1,9 @@
-
-<transform dir file link hardlink path=.*/amd64/.* -> \
- default facet.arch.64 true>
+<transform dir file link hardlink path=.*(lib|bin)/amd64(/.*|$) -> \
+ default variant.elf64 true>
<transform dir file link hardlink path=.*/lib/[^/]*\.(so|a|la).* -> \
- default facet.arch.32 true>
+ default variant.elf32 true>
<transform dir file link hardlink path=.*/.?bin/i86/.* -> \
- default facet.arch.32 true>
+ default variant.elf32 true>
+
diff --git a/trans/defaults b/trans/defaults
index acf7b24..a171ebc 100644
--- a/trans/defaults
+++ b/trans/defaults
@@ -100,6 +100,8 @@
<transform dir -> default mode 0755>
set name=variant.arch value=$(MACH)
+set name=variant.elf32 value=true
+set name=variant.elf64 value=true
#
# Defaults for legacy metadata for SVR4 package information