Print this page
native tools must reliably use a native adjunct, even if that's inconvenient
While it is perhaps convenient for native tools to use updated versions
of certain things like libxml it is imperative that those versions are
_also_ build for the build machine. Thus they need to be in the native
adjunct (even if that native adjunct is thus not /).
Fix the native adjunct to be rooted similarly to the adjunct proto (that
is, at /), and fix SMF to use it correctly
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/lib/libscf/Makefile.com
+++ new/usr/src/lib/libscf/Makefile.com
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21 #
22 22 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
23 23 #
24 24
25 25 LIBRARY = libscf.a
26 26 VERS = .1
27 27
28 28 OBJECTS = \
29 29 error.o \
30 30 lowlevel.o \
31 31 midlevel.o \
32 32 notify_params.o \
33 33 highlevel.o \
34 34 scf_tmpl.o \
35 35 scf_type.o
36 36
37 37 include ../../Makefile.lib
38 38 include ../../Makefile.rootfs
39 39
40 40 LIBS = $(DYNLIB) $(LINTLIB)
41 41
42 42 $(NOT_NATIVE)NATIVE_BUILD = $(POUND_SIGN)
43 43 $(NATIVE_BUILD)VERS =
44 44 $(NATIVE_BUILD)LIBS = $(DYNLIB)
45 45
46 46 LDLIBS_i386 += -lsmbios
47 47 LDLIBS += -luutil -lc -lgen -lnsl -lnvpair
48 48 LDLIBS += $(LDLIBS_$(MACH))
49 49
50 50 SRCDIR = ../common
51 51 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
52 52
53 53 COMDIR = ../../../common/svc
54 54
55 55 CFLAGS += $(CCVERBOSE) -Wp,-xc99=%all
56 56 CPPFLAGS += -I../inc -I../../common/inc -I$(COMDIR) -I$(ROOTHDRDIR)
57 57 $(NOT_RELEASE_BUILD) CPPFLAGS += -DFASTREBOOT_DEBUG
58 58
59 59 CERRWARN += -_gcc=-Wno-switch
60 60 CERRWARN += -_gcc=-Wno-char-subscripts
61 61 CERRWARN += -_gcc=-Wno-unused-label
62 62 CERRWARN += -_gcc=-Wno-parentheses
↓ open down ↓ |
62 lines elided |
↑ open up ↑ |
63 63 CERRWARN += -_gcc=-Wno-uninitialized
64 64
65 65 #
66 66 # For native builds, we compile and link against the native version
67 67 # of libuutil.
68 68 #
69 69 LIBUUTIL = $(SRC)/lib/libuutil
70 70 MY_NATIVE_CPPFLAGS =\
71 71 -DNATIVE_BUILD $(DTEXTDOM) \
72 72 -I../inc -I$(COMDIR) -I$(LIBUUTIL)/common -I$(ROOTHDRDIR)
73 -MY_NATIVE_LDLIBS = -L$(LIBUUTIL)/native -R$(LIBUUTIL)/native -luutil -lc -lgen \
74 - -lnsl -lnvpair
73 +MY_NATIVE_LDLIBS = -L$(LIBUUTIL)/native -R$(LIBUUTIL)/native \
74 + -L$(NATIVE_ADJUNCT)/usr/lib -R$(NATIVE_ADJUNCT)/usr/lib \
75 + -luutil -lc -lgen -lnsl -lnvpair
75 76 MY_NATIVE_LDLIBS_i386 = -lsmbios
76 77 MY_NATIVE_LDLIBS += $(MY_NATIVE_LDLIBS_$(MACH))
77 78
78 79 .KEEP_STATE:
79 80
80 81 all:
81 82
82 83 lint: lintcheck
83 84
84 85 include ../../Makefile.targ
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX