diff options
| author | Igor Pashev <igor.pashev@nexenta.com> | 2012-09-18 18:26:00 +0400 |
|---|---|---|
| committer | Igor Pashev <igor.pashev@nexenta.com> | 2012-09-18 18:26:00 +0400 |
| commit | c2d55ceb45f315ed34b5aea11d317fa8ec55cdbb (patch) | |
| tree | f654970fc9b770839278a2e5675e2962584f22eb | |
| parent | 498ed93b03cb3ab1fbee1f6c5f2c392ce1934cfc (diff) | |
| download | cibs-c2d55ceb45f315ed34b5aea11d317fa8ec55cdbb.tar.gz | |
Added noarch.mk for arch-independend packages (like automake)
| -rw-r--r-- | rules/common.mk | 5 | ||||
| -rw-r--r-- | rules/ips.mk | 2 | ||||
| -rw-r--r-- | rules/noarch.mk | 35 |
3 files changed, 42 insertions, 0 deletions
diff --git a/rules/common.mk b/rules/common.mk index dec0022..4e0c970 100644 --- a/rules/common.mk +++ b/rules/common.mk @@ -41,6 +41,8 @@ destdir.32 := $(workdir)/proto/32 destdir.64 := $(workdir)/proto/64 builddir.32 := $(workdir)/build/32 builddir.64 := $(workdir)/build/64 +destdir.noarch := $(workdir)/proto/noarch +builddir.noarch := $(workdir)/build/noarch CC.32 = gcc -m32 CC.64 = gcc -m64 @@ -62,6 +64,9 @@ bindir.32 = $(prefix)/bin/$(mach32) bindir.64 = $(prefix)/bin/$(mach64) includedir.32 = /usr/include includedir.64 = /usr/include +libdir.noarch = $(prefix)/lib +bindir.noarch = $(prefix)/bin +includedir.noarch = /usr/include PKG_CONFIG_PATH.32 = /usr/gnu/lib/$(mach32)/pkg-config:/usr/lib/$(mach32)/pkg-config PKG_CONFIG_PATH.64 = /usr/gnu/lib/$(mach64)/pkg-config:/usr/lib/$(mach64)/pkg-config diff --git a/rules/ips.mk b/rules/ips.mk index 7d27203..8e05e8b 100644 --- a/rules/ips.mk +++ b/rules/ips.mk @@ -56,6 +56,7 @@ pkg-define += \ # Where to find files: pkg-protos = -d "$(destdir.32)" pkg-protos += -d "$(destdir.64)" +pkg-protos += -d "$(destdir.noarch)" pkg-protos += -d "$(sourcedir)" -d . transformations := \ @@ -95,6 +96,7 @@ mogrify-stamp: $(mogrified-manifests) protodirs-stamp: [ -d "$(destdir.32)" ] || mkdir -p "$(destdir.32)" [ -d "$(destdir.64)" ] || mkdir -p "$(destdir.64)" + [ -d "$(destdir.noarch)" ] || mkdir -p "$(destdir.noarch)" touch $@ depend-manifests := $(manifests:%=$(manifestdir)/depend-%) diff --git a/rules/noarch.mk b/rules/noarch.mk new file mode 100644 index 0000000..00ae3a2 --- /dev/null +++ b/rules/noarch.mk @@ -0,0 +1,35 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license +# at http://www.opensource.org/licenses/CDDL-1.0 +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each file. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright (C) 2012, Nexenta Systems, Inc. All rights reserved. +# + +ifeq (,$(__noarch_mk)) + +build-stamp : build-noarch-stamp +configure-stamp : configure-noarch-stamp +install-stamp : install-noarch-stamp + +%-noarch-stamp: bits = noarch + +__noarch_mk := included + +endif + |