From 597dda420f3f87f9b9729c5765d233e70a60f785 Mon Sep 17 00:00:00 2001
From: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Date: Thu, 30 Aug 2018 19:14:24 -0400
Subject: [PATCH] bash: build only 64-bit version

---
 components/shell/bash/Makefile                      | 10 ++++++----
 components/shell/bash/bash.p5m                      |  6 +-----
 components/shell/bash/manifests/sample-manifest.p5m |  7 ++++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/components/shell/bash/Makefile b/components/shell/bash/Makefile
index 5ca8ff7e6..f33edcae2 100644
--- a/components/shell/bash/Makefile
+++ b/components/shell/bash/Makefile
@@ -37,6 +37,8 @@ include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/configure.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+CONFIGURE_BINDIR.64 = $(CONFIGURE_BINDIR.32)
+
 BASH_PATCHLEVEL=$(shell grep -h "define PATCHLEVEL" $(COMPONENT_DIR)/patches/bash* | nawk '{print $$NF}' | sort -n | tail -1)
 IPS_COMPONENT_VERSION = $(COMPONENT_VERSION).$(BASH_PATCHLEVEL)
 PATCH_LEVEL = 0
@@ -120,7 +122,7 @@ CONFIGURE_OPTIONS  += 		--with-curses
 CONFIGURE_OPTIONS  += 		--with-installed-readline=no
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 
-COMPONENT_TEST_DIR =		$(BUILD_DIR_32)
+COMPONENT_TEST_DIR =		$(BUILD_DIR_64)
 COMPONENT_TEST_ENV =		- $(TEST_PATH)
 
 # The tests use /tmp/xx, and there can only be one user running
@@ -130,15 +132,15 @@ COMPONENT_POST_TEST_ACTION =	rm -f /tmp/xx
 
 # ASLR_MODE=$(ASLR_ENABLE)
 
-build: $(BUILD_32_and_64)
+build: $(BUILD_64)
 
-install: $(INSTALL_32_and_64)
+install: $(INSTALL_64)
 	( cd $(PROTOUSRSHAREDIR)/locale ; \
 	    cp -Rp "en@boldquot" en ; \
 	    cp -Rp "en@boldquot" en_CA ; \
 	    cp -Rp "en@boldquot" en_GB )
 
-test:	$(TEST_32_and_64)
+test:	$(TEST_64)
 
 REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += system/library
diff --git a/components/shell/bash/bash.p5m b/components/shell/bash/bash.p5m
index 9ff69c656..5acf087e6 100644
--- a/components/shell/bash/bash.p5m
+++ b/components/shell/bash/bash.p5m
@@ -38,14 +38,10 @@ file etc.bash.bashrc path=etc/bash/bashrc.example
 file etc.bash.inputrc path=etc/bash/inputrc.example
 file etc.skel.bashrc path=etc/skel/.bashrc
 
-hardlink path=usr/bin/bash target=../lib/isaexec pkg.linted.userland.action002.0=true
-file usr/bin/bash path=usr/bin/$(MACH32)/bash
+file path=usr/bin/bash
 file path=usr/bin/bashbug
-file path=usr/bin/$(MACH64)/bash
 #
 link path=usr/bin/rbash target=./bash
-link path=usr/bin/$(MACH32)/rbash target=./bash
-link path=usr/bin/$(MACH64)/rbash target=./bash
 link path=usr/gnu/bin/sh target=../../bin/bash
 #
 file path=usr/share/bash/alias
diff --git a/components/shell/bash/manifests/sample-manifest.p5m b/components/shell/bash/manifests/sample-manifest.p5m
index e95a437cf..1e6599e24 100644
--- a/components/shell/bash/manifests/sample-manifest.p5m
+++ b/components/shell/bash/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2016 <contributor>
+# Copyright 2017 <contributor>
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -22,8 +22,6 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 
-file path=usr/bin/$(MACH64)/bash
-file path=usr/bin/$(MACH64)/bashbug
 file path=usr/bin/bash
 file path=usr/bin/bashbug
 file path=usr/share/bash/alias
@@ -122,10 +120,13 @@ file path=usr/share/locale/da/LC_MESSAGES/bash.mo
 file path=usr/share/locale/de/LC_MESSAGES/bash.mo
 file path=usr/share/locale/el/LC_MESSAGES/bash.mo
 file path=usr/share/locale/en/LC_MESSAGES/bash.mo
+file path=usr/share/locale/en/en@boldquot/LC_MESSAGES/bash.mo
 file path=usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
 file path=usr/share/locale/en@quot/LC_MESSAGES/bash.mo
 file path=usr/share/locale/en_CA/LC_MESSAGES/bash.mo
+file path=usr/share/locale/en_CA/en@boldquot/LC_MESSAGES/bash.mo
 file path=usr/share/locale/en_GB/LC_MESSAGES/bash.mo
+file path=usr/share/locale/en_GB/en@boldquot/LC_MESSAGES/bash.mo
 file path=usr/share/locale/eo/LC_MESSAGES/bash.mo
 file path=usr/share/locale/es/LC_MESSAGES/bash.mo
 file path=usr/share/locale/et/LC_MESSAGES/bash.mo
-- 
2.11.4.GIT