From 73d7cc0cc80b0c58bfebd2c8c036a9a892dac138 Mon Sep 17 00:00:00 2001
From: Igor Pashev <igor.pashev@nexenta.com>
Date: Wed, 24 Oct 2012 15:29:24 +0400
Subject: $(build32) and $(build64) filters in manifests

---
 rules/32.mk     | 5 +++++
 rules/64.mk     | 5 +++++
 rules/common.mk | 7 ++++++-
 rules/ips.mk    | 2 ++
 4 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'rules')

diff --git a/rules/32.mk b/rules/32.mk
index 907f90f..3bd29ba 100644
--- a/rules/32.mk
+++ b/rules/32.mk
@@ -31,6 +31,11 @@ protodirs += $(destdir.32)
 
 %-32-stamp: bits = 32
 
+# build32 = \#, not it is emtpy and lines like
+# $(build32) file path=...
+# in manifests are included
+build32 :=
+
 __32_mk := included
 
 endif
diff --git a/rules/64.mk b/rules/64.mk
index 81c7390..29b63b7 100644
--- a/rules/64.mk
+++ b/rules/64.mk
@@ -31,6 +31,11 @@ protodirs += $(destdir.64)
 
 %-64-stamp: bits = 64
 
+# build64 = \#, not it is emtpy and lines like
+# $(build64) file path=...
+# in manifests are included
+build64 :=
+
 __64_mk := included
 
 endif
diff --git a/rules/common.mk b/rules/common.mk
index e9861e9..820b8f0 100644
--- a/rules/common.mk
+++ b/rules/common.mk
@@ -24,8 +24,13 @@
 # include guard:
 ifeq (,$(__common_mk))
 
+skip := \#
+
+build32 := $(skip)
+build64 := $(skip)
+
 # Default:
-bits := 32
+bits := 64
 
 # Prepended to commands which require root privileges
 # May be overriden in /etc/cibs/cibs.conf to, for example, pfexec
diff --git a/rules/ips.mk b/rules/ips.mk
index 5503147..f0f082e 100644
--- a/rules/ips.mk
+++ b/rules/ips.mk
@@ -44,6 +44,8 @@ pkg-define += \
 -DMACH="$(mach)" \
 -DMACH32="$(mach32)" \
 -DMACH64="$(mach64)" \
+-Dbuild32="$(build32)" \
+-Dbuild64="$(build64)" \
 
 
 # Where to find files:
-- 
cgit v1.2.3