From c1e8923eccca0586df1fc471ad8b8e7fae97c670 Mon Sep 17 00:00:00 2001 From: Robert Mustacchi Date: Sat, 16 Mar 2013 02:15:17 +0000 Subject: [PATCH] OS-2032 bind should find nm in /usr/bin OS-2033 illumos-extra install.subr should not reference /usr/ccs for strip OS-2034 libm should find ld, mcs, and strip in /usr --- bind/Makefile | 7 +++++-- bind/nm-loc.patch | 32 ++++++++++++++++++++++++++++++++ install.subr | 2 +- libm/Makefile | 2 +- libm/usr/src/libm/wos/Makefile | 6 +++--- libm/usr/src/libm/wos64/Makefile | 8 ++++---- 6 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 bind/nm-loc.patch diff --git a/bind/Makefile b/bind/Makefile index 2a834872..3e606349 100644 --- a/bind/Makefile +++ b/bind/Makefile @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012 Joyent, Inc. All rights reserved. +# Copyright (c) 2013 Joyent, Inc. All rights reserved. # VER = bind-9.8.0 @@ -32,8 +32,11 @@ AUTOCONF_OPTS += \ CFLAGS += -g $(CPPFLAGS) PARALLEL = +PATCHES += \ + nm-loc.patch + AUTOCONF_ENV += \ - INSTALL="/usr/ucb/install -c" + INSTALL="/usr/ucb/install -c" \ OVERRIDES += \ INSTALL="/usr/ucb/install -c" diff --git a/bind/nm-loc.patch b/bind/nm-loc.patch new file mode 100644 index 00000000..52b65c6c --- /dev/null +++ b/bind/nm-loc.patch @@ -0,0 +1,32 @@ +From f7bd7bb5122a69fae3cdd7bf9cdbb45e7183313f Mon Sep 17 00:00:00 2001 +From: Robert Mustacchi +Date: Sat, 16 Mar 2013 00:56:04 +0000 +Subject: [PATCH] Fix nm location + +--- + util/mksymtbl.pl | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/util/mksymtbl.pl b/util/mksymtbl.pl +index 9908a53..31351f4 100755 +--- a/util/mksymtbl.pl ++++ b/util/mksymtbl.pl +@@ -44,10 +44,14 @@ if ($options{'o'}) { + $nm_prog = "nm"; + $ostype = `uname -s`; + chop($ostype); +-if ($ostype eq "SunOS" || $ostype eq "HP-UX") { ++if ($ostype eq "HP-UX") { + $nm_prog = "/usr/ccs/bin/nm -x" + } + ++if ($ostype eq "SunOS") { ++ $nm_prog = "/usr/bin/nm -x" ++} ++ + if ($options{'i'}) { + open(SYMBOLS, $options{'i'}) || die "failed to open $options{'i'}"; + } else { +-- +1.7.7.2 + diff --git a/install.subr b/install.subr index 67028702..52dd3814 100644 --- a/install.subr +++ b/install.subr @@ -56,7 +56,7 @@ _install() rm -f $_targ cp $_src $_targ chmod u+w $_targ - /usr/ccs/bin/strip $_targ + /usr/bin/strip $_targ chmod $_perm $_targ ;; diff --git a/libm/Makefile b/libm/Makefile index 776c0d72..c313116d 100644 --- a/libm/Makefile +++ b/libm/Makefile @@ -26,7 +26,7 @@ DESTDIR=$(BASE)/../proto all: (cd usr/src/harness; env - \ - make -f Makefile-os) + make -f Makefile-os STRIP=/usr/bin/strip MCS=/usr/bin/mcs LD=/usr/bin/ld) install: all BASE=$(DESTDIR) ksh93 ./install-extra diff --git a/libm/usr/src/libm/wos/Makefile b/libm/usr/src/libm/wos/Makefile index 2cb5654f..84cd52f9 100644 --- a/libm/usr/src/libm/wos/Makefile +++ b/libm/usr/src/libm/wos/Makefile @@ -57,10 +57,10 @@ CPP_CMD = $(CC) -E -Xs INSTALL = /usr/sbin/install INST_CMD = $(INSTALL) $(OWNED_BY) -m 644 -f $(@D) $< INST_EXEC_CMD = $(INSTALL) $(OWNED_BY) -m 755 -f $(@D) $< -LD = /usr/ccs/bin/ld +LD = /usr/bin/ld M4 = /usr/ccs/bin/m4 -MCS = /usr/ccs/bin/mcs -STRIP = /usr/ccs/bin/strip +MCS = /usr/bin/mcs +STRIP = /usr/bin/strip TR = /usr/bin/tr # diff --git a/libm/usr/src/libm/wos64/Makefile b/libm/usr/src/libm/wos64/Makefile index bb39998f..1e796dde 100644 --- a/libm/usr/src/libm/wos64/Makefile +++ b/libm/usr/src/libm/wos64/Makefile @@ -54,15 +54,15 @@ ISA_DIRS = $(ISA_DIRS_$(MCPU)) # system commands # -AR = /usr/ccs/bin/ar +AR = /usr/bin/ar CPP_CMD = $(CC) -E -Xs INSTALL = /usr/sbin/install INST_CMD = $(INSTALL) $(OWNED_BY) -m 644 -f $(@D) $< INST_EXEC_CMD = $(INSTALL) $(OWNED_BY) -m 755 -f $(@D) $< -LD = /usr/ccs/bin/ld +LD = /usr/bin/ld M4 = /usr/ccs/bin/m4 -MCS = /usr/ccs/bin/mcs -STRIP = /usr/ccs/bin/strip +MCS = /usr/bin/mcs +STRIP = /usr/bin/strip TR = /usr/bin/tr #