Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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...
commit c1e8923eccca0586df1fc471ad8b8e7fae97c670 1 parent 795d4b4
Robert Mustacchi rmustacc authored
7 bind/Makefile
View
@@ -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"
32 bind/nm-loc.patch
View
@@ -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  install.subr
View
@@ -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
;;
2  libm/Makefile
View
@@ -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
6 libm/usr/src/libm/wos/Makefile
View
@@ -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
#
8 libm/usr/src/libm/wos64/Makefile
View
@@ -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
#
Please sign in to comment.
Something went wrong with that request. Please try again.