From 685434de51f60c00ae5118d10a6f93716b9857ae Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Tue, 15 Jan 2019 13:24:33 -0500 Subject: [PATCH] gnu-iconv: build 64-bit only --- components/gnu-iconv/Makefile | 9 ++++--- components/gnu-iconv/libiconv.p5m | 8 ------ components/gnu-iconv/manifests/sample-manifest.p5m | 30 ++++++++-------------- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/components/gnu-iconv/Makefile b/components/gnu-iconv/Makefile index bf4b28acb..fc98d3767 100644 --- a/components/gnu-iconv/Makefile +++ b/components/gnu-iconv/Makefile @@ -35,6 +35,8 @@ include ../../make-rules/prep.mk include ../../make-rules/configure.mk include ../../make-rules/ips.mk +CONFIGURE_BINDIR.64 = $(CONFIGURE_BINDIR.32) + CONFIGURE_OPTIONS += --disable-static CONFIGURE_OPTIONS += --enable-shared @@ -42,18 +44,17 @@ $(INSTALL_32): COMPONENT_POST_INSTALL_ACTION = \ /usr/bin/elfedit -e "dyn:runpath ''" $(PROTOUSRBINDIR)/iconv $(INSTALL_64): COMPONENT_POST_INSTALL_ACTION = \ - /usr/bin/elfedit -e "dyn:runpath ''" $(PROTOUSRBINDIR64)/iconv + /usr/bin/elfedit -e "dyn:runpath ''" $(PROTOUSRBINDIR)/iconv # common targets -build: $(BUILD_32_and_64) +build: $(BUILD_64) include ../../make-rules/shared-targets.mk -install: $(INSTALL_32_and_64) +install: $(INSTALL_64) # build does this always test: build - @cd $(BUILD_DIR_32); $(MAKE) check @cd $(BUILD_DIR_64); $(MAKE) check BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) diff --git a/components/gnu-iconv/libiconv.p5m b/components/gnu-iconv/libiconv.p5m index 5cd544bb8..71e8c1e79 100644 --- a/components/gnu-iconv/libiconv.p5m +++ b/components/gnu-iconv/libiconv.p5m @@ -32,7 +32,6 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license libiconv.license license="GPLv3" -file usr/bin/$(MACH64)/iconv path=usr/gnu/bin/$(MACH64)/iconv file usr/bin/iconv path=usr/gnu/bin/iconv file usr/include/iconv.h path=usr/gnu/include/iconv.h file usr/include/libcharset.h path=usr/gnu/include/libcharset.h @@ -40,9 +39,6 @@ file usr/include/localcharset.h path=usr/gnu/include/localcharset.h file path=usr/lib/$(MACH64)/libcharset.so.1.0.0 file path=usr/lib/$(MACH64)/libiconv.so.2.5.1 file path=usr/lib/$(MACH64)/preloadable_libiconv.so -file path=usr/lib/libcharset.so.1.0.0 -file path=usr/lib/libiconv.so.2.5.1 -file path=usr/lib/preloadable_libiconv.so file path=usr/share/doc/libiconv/iconv.1.html file path=usr/share/doc/libiconv/iconv.3.html file path=usr/share/doc/libiconv/iconv_close.3.html @@ -61,7 +57,3 @@ link path=usr/lib/$(MACH64)/libcharset.so target=libcharset.so.1.0.0 link path=usr/lib/$(MACH64)/libcharset.so.1 target=libcharset.so.1.0.0 link path=usr/lib/$(MACH64)/libiconv.so target=libiconv.so.2.5.1 link path=usr/lib/$(MACH64)/libiconv.so.2 target=libiconv.so.2.5.1 -link path=usr/lib/libcharset.so target=libcharset.so.1.0.0 -link path=usr/lib/libcharset.so.1 target=libcharset.so.1.0.0 -link path=usr/lib/libiconv.so target=libiconv.so.2.5.1 -link path=usr/lib/libiconv.so.2 target=libiconv.so.2.5.1 diff --git a/components/gnu-iconv/manifests/sample-manifest.p5m b/components/gnu-iconv/manifests/sample-manifest.p5m index 308f73678..9b2d6b732 100644 --- a/components/gnu-iconv/manifests/sample-manifest.p5m +++ b/components/gnu-iconv/manifests/sample-manifest.p5m @@ -1,16 +1,17 @@ # -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. +# Copyright 2018 # -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # - -# -# Copyright 2016 +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -22,7 +23,6 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' -file path=usr/bin/$(MACH64)/iconv file path=usr/bin/iconv file path=usr/include/iconv.h file path=usr/include/libcharset.h @@ -35,14 +35,6 @@ link path=usr/lib/$(MACH64)/libiconv.so target=libiconv.so.2.5.1 link path=usr/lib/$(MACH64)/libiconv.so.2 target=libiconv.so.2.5.1 file path=usr/lib/$(MACH64)/libiconv.so.2.5.1 file path=usr/lib/$(MACH64)/preloadable_libiconv.so -file path=usr/lib/charset.alias -link path=usr/lib/libcharset.so target=libcharset.so.1.0.0 -link path=usr/lib/libcharset.so.1 target=libcharset.so.1.0.0 -file path=usr/lib/libcharset.so.1.0.0 -link path=usr/lib/libiconv.so target=libiconv.so.2.5.1 -link path=usr/lib/libiconv.so.2 target=libiconv.so.2.5.1 -file path=usr/lib/libiconv.so.2.5.1 -file path=usr/lib/preloadable_libiconv.so file path=usr/share/doc/libiconv/iconv.1.html file path=usr/share/doc/libiconv/iconv.3.html file path=usr/share/doc/libiconv/iconv_close.3.html -- 2.11.4.GIT