Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
rmustacc committed Mar 17, 2013
1 parent 795d4b4 commit c1e8923
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 11 deletions.
7 changes: 5 additions & 2 deletions bind/Makefile
Expand Up @@ -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
Expand All @@ -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"
Expand Down
32 changes: 32 additions & 0 deletions bind/nm-loc.patch
@@ -0,0 +1,32 @@
From f7bd7bb5122a69fae3cdd7bf9cdbb45e7183313f Mon Sep 17 00:00:00 2001
From: Robert Mustacchi <rm@joyent.com>
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

2 changes: 1 addition & 1 deletion install.subr
Expand Up @@ -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
;;

Expand Down
2 changes: 1 addition & 1 deletion libm/Makefile
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions libm/usr/src/libm/wos/Makefile
Expand Up @@ -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

#
Expand Down
8 changes: 4 additions & 4 deletions libm/usr/src/libm/wos64/Makefile
Expand Up @@ -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

#
Expand Down

0 comments on commit c1e8923

Please sign in to comment.