summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2012-12-21 08:45:27 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2012-12-21 08:45:27 +0400
commitb7ae173c0e27ab9517bd36ab6342ae5e327a9747 (patch)
tree5322c254dd6670c80ed661acff53d60547b9d88d
parent393ab6c1711c8f487bfb32dc01cb77aafa86b2f0 (diff)
downloadcibs-pkgs-b7ae173c0e27ab9517bd36ab6342ae5e327a9747.tar.gz
openpgm: build only 64-bit
-rw-r--r--openpgm/Makefile1
-rw-r--r--openpgm/libpgm-5.1-0.p5m6
-rw-r--r--openpgm/libpgm.p5m12
3 files changed, 4 insertions, 15 deletions
diff --git a/openpgm/Makefile b/openpgm/Makefile
index 534f229..ab2a282 100644
--- a/openpgm/Makefile
+++ b/openpgm/Makefile
@@ -3,7 +3,6 @@ include /usr/share/cibs/rules/archive.mk
include /usr/share/cibs/rules/patch.mk
include /usr/share/cibs/rules/autoreconf.mk
include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
include /usr/share/cibs/rules/64.mk
configure := $(sourcedir)/openpgm/pgm/configure
diff --git a/openpgm/libpgm-5.1-0.p5m b/openpgm/libpgm-5.1-0.p5m
index 27fa120..8f34e92 100644
--- a/openpgm/libpgm-5.1-0.p5m
+++ b/openpgm/libpgm-5.1-0.p5m
@@ -5,7 +5,5 @@ set name=info.source-url value="$(download)"
license $(license-file) license="$(license)"
-file path=usr/lib/$(MACH64)/libpgm-5.1.so.0.0.118
-file path=usr/lib/libpgm-5.1.so.0.0.118
-link path=usr/lib/libpgm-5.1.so.0 target=libpgm-5.1.so.0.0.118
-link path=usr/lib/$(MACH64)/libpgm-5.1.so.0 target=libpgm-5.1.so.0.0.118
+file path=usr/lib/$(mach64)/libpgm-5.1.so.0.0.118
+link path=usr/lib/$(mach64)/libpgm-5.1.so.0 target=libpgm-5.1.so.0.0.118
diff --git a/openpgm/libpgm.p5m b/openpgm/libpgm.p5m
index 987171d..c35023a 100644
--- a/openpgm/libpgm.p5m
+++ b/openpgm/libpgm.p5m
@@ -31,16 +31,9 @@ license $(license-file) license="$(license)"
depend fmri=pkg:/library/libpgm-5.1-0@$(ips-version) type=require
depend fmri=pkg:/library/libpgm-5.1-0@$(ips-version) type=incorporate
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/include
dir path=usr/include/pgm-5.1
dir path=usr/include/pgm-5.1/pgm
-file path=usr/lib/$(MACH64)/pkgconfig/openpgm-5.1.pc
-file path=usr/lib/pkgconfig/openpgm-5.1.pc
+file path=usr/lib/$(mach64)/pkgconfig/openpgm-5.1.pc
file path=usr/include/pgm-5.1/pgm/msgv.h
file path=usr/include/pgm-5.1/pgm/time.h
file path=usr/include/pgm-5.1/pgm/skbuff.h
@@ -63,5 +56,4 @@ file path=usr/include/pgm-5.1/pgm/socket.h
file path=usr/include/pgm-5.1/pgm/gsi.h
file path=usr/include/pgm-5.1/pgm/mem.h
file path=usr/include/pgm-5.1/pgm/if.h
-link path=usr/lib/$(MACH64)/libpgm.so target=libpgm-5.1.so.0.0.118
-link path=usr/lib/libpgm.so target=libpgm-5.1.so.0.0.118
+link path=usr/lib/$(mach64)/libpgm.so target=libpgm-5.1.so.0