diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-07-17 17:05:07 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2013-08-16 08:31:32 -0700 |
| commit | 494f7e12a62129ef191a15f9dfde6b7abe3bf510 (patch) | |
| tree | 786fce65f889c5fa2b64671a6c7c84f09b9d6dfb /usr | |
| parent | cf7e209d5f01e9f5fe052b444899ba9cba0e9877 (diff) | |
| download | illumos-joyent-494f7e12a62129ef191a15f9dfde6b7abe3bf510.tar.gz | |
3915 Add adjuncts support to the build
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@nexenta.com>
Diffstat (limited to 'usr')
53 files changed, 106 insertions, 83 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 44cc87875e..afca9302ce 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -30,6 +30,17 @@ ROOT= /proto # +# Adjunct root, containing an additional proto area to be used for headers +# and libraries. +# +ADJUNCT_PROTO= + +# +# Adjunct for building things that run on the build machine. +# +NATIVE_ADJUNCT= /usr + +# # RELEASE_BUILD should be cleared for final release builds. # NOT_RELEASE_BUILD is exactly what the name implies. # @@ -571,8 +582,10 @@ NATIVE_CFLAGS= $(COPTFLAG) $($(NATIVE_MACH)_CFLAGS) $(CCMODE) \ DTEXTDOM=-DTEXT_DOMAIN=\"$(TEXT_DOMAIN)\" # For messaging. DTS_ERRNO=-D_TS_ERRNO CPPFLAGS.master=$(DTEXTDOM) $(DTS_ERRNO) \ - $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) -CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) + $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) \ + $(ADJUNCT_PROTO:%=-I%/usr/include) +CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) \ + $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/include CPPFLAGS= $(CPPFLAGS.master) AS_CPPFLAGS= $(CPPFLAGS.master) JAVAFLAGS= -deprecation @@ -684,6 +697,7 @@ MAPFILE.INT = mapfile-intf # LDLIBS64=-YP,$ROOT/lib/$MACH64:$ROOT/usr/lib/$MACH64 # LDLIBS32 = $(ENVLDLIBS1) $(ENVLDLIBS2) $(ENVLDLIBS3) +LDLIBS32 += $(ADJUNCT_PROTO:%=-L%/usr/lib -L%/lib) LDLIBS.cmd = $(LDLIBS32) LDLIBS.lib = $(LDLIBS32) # @@ -708,7 +722,7 @@ COMPILE.java= $(JAVAC) $(JAVAFLAGS) -classpath $(CLASSPATH) # CCNEEDED = -lC CCEXTNEEDED = -lCrun -lCstd -$(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -R$(GCCLIBDIR) -lstdc++ -lgcc_s +$(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc_s $(__GNUC)CCEXTNEEDED = $(CCNEEDED) LINK.c= $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) diff --git a/usr/src/Makefile.master.64 b/usr/src/Makefile.master.64 index 850571dbd3..09169831a1 100644 --- a/usr/src/Makefile.master.64 +++ b/usr/src/Makefile.master.64 @@ -49,6 +49,7 @@ LDLIBS1= $(ENVLDLIBS1:%=%/$(MACH64)) LDLIBS2= $(ENVLDLIBS2:%=%/$(MACH64)) LDLIBS3= $(ENVLDLIBS3:%=%/$(MACH64)) LDLIBS64 = $(LDLIBS1) $(LDLIBS2) $(LDLIBS3) +LDLIBS64 += $(ADJUNCT_PROTO:%=-L%/usr/lib/$(MACH64) -L%/lib/$(MACH64)) # # Moved these up to the top level here, so they can be overridden # @@ -83,7 +84,7 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \ MAPFILECLASS= -64 CCNEEDED = -lCrun -$(__GNUC64)CCNEEDED = -L$(GCCLIBDIR) -R$(GCCLIBDIR) -lstdc++ +$(__GNUC64)CCNEEDED = -L$(GCCLIBDIR) -lstdc++ $(__GNUC64)CCNEEDED += -lgcc_s BUILDCCC.SO= $(CCC) $(CCFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \ diff --git a/usr/src/cmd/availdevs/Makefile b/usr/src/cmd/availdevs/Makefile index 571c88cd3d..e7fa72f930 100644 --- a/usr/src/cmd/availdevs/Makefile +++ b/usr/src/cmd/availdevs/Makefile @@ -23,8 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG= availdevs @@ -32,7 +30,7 @@ include ../Makefile.cmd ROOTCMDDIR= $(ROOTLIB)/zfs -INCS += -I/usr/include/libxml2 +INCS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 # # There is no lint library for libxml2, so we need to avoid linking against diff --git a/usr/src/cmd/avs/dsstat/Makefile b/usr/src/cmd/avs/dsstat/Makefile index 11ddd8c9a9..8a865c34a7 100644 --- a/usr/src/cmd/avs/dsstat/Makefile +++ b/usr/src/cmd/avs/dsstat/Makefile @@ -44,7 +44,7 @@ CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-clobbered -LDLIBS += -L/usr/lib -lkstat +LDLIBS += -lkstat LINTFLAGS += -Xa -n -s -x -m -u -Dlint -errhdr=%user LINTFLAGS += -erroff=E_SEC_PRINTF_VAR_FMT -erroff=E_SEC_SPRINTF_UNBOUNDED_COPY LINTDIR = $(KBASE)/lintdir diff --git a/usr/src/cmd/cmd-crypto/kmfcfg/Makefile b/usr/src/cmd/cmd-crypto/kmfcfg/Makefile index 33d43da3d9..beaac6f8e7 100644 --- a/usr/src/cmd/cmd-crypto/kmfcfg/Makefile +++ b/usr/src/cmd/cmd-crypto/kmfcfg/Makefile @@ -47,7 +47,8 @@ POFILES = $(OBJS:%.o=%.po) POFILE = $(PROG)_msg.po MSGFILES = $(SRCS:%.c=%.i) -CPPFLAGS += -I/usr/include/libxml2 -I$(KMFDIR)/include -I. +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ + -I$(KMFDIR)/include -I. LDLIBS += -L$(ROOT)/usr/lib -lkmf -lcryptoutil XMLLIB = -lxml2 diff --git a/usr/src/cmd/cmd-crypto/pktool/Makefile b/usr/src/cmd/cmd-crypto/pktool/Makefile index 8c4c3d8a1e..d33a9d5cc9 100644 --- a/usr/src/cmd/cmd-crypto/pktool/Makefile +++ b/usr/src/cmd/cmd-crypto/pktool/Makefile @@ -48,7 +48,7 @@ POFILES = $(OBJS:%.o=%.po) POFILE = $(PROG)_msg.po MSGFILES=$(SRCS:%.c=%.i) -CPPFLAGS += -I. -I$(KMFDIR)/include -I/usr/include/libxml2 \ +CPPFLAGS += -I. -I$(KMFDIR)/include -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ -I$(KMFDIR)/ber_der/inc CFLAGS += $(CCVERBOSE) -DDEBUG diff --git a/usr/src/cmd/cmd-crypto/tpmadm/Makefile b/usr/src/cmd/cmd-crypto/tpmadm/Makefile index 0cda8bf725..de581b779b 100644 --- a/usr/src/cmd/cmd-crypto/tpmadm/Makefile +++ b/usr/src/cmd/cmd-crypto/tpmadm/Makefile @@ -35,7 +35,7 @@ POFILE = $(PROG)_msg.po MSGFILES=$(SRCS:%.c=%.i) CPPFLAGS += -xCC -LINTFLAGS += -XCC -L/usr/lib +LINTFLAGS += -XCC -L$(ADJUNCT_PROTO)/usr/lib LDLIBS += -ltspi -luuid .KEEP_STATE: diff --git a/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com b/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com index fe67e74b4f..49272439c6 100644 --- a/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com +++ b/usr/src/cmd/dfs.cmds/sharemgr/Makefile.com @@ -35,7 +35,8 @@ PROG= sharemgr OBJS = sharemgr_main.o commands.o shareutil.o SRCS = $(OBJS:%.o=../%.c) -MYCPPFLAGS = -I../../../../lib/libfsmgt/common -I/usr/include/libxml2 \ +MYCPPFLAGS = -I../../../../lib/libfsmgt/common \ + -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ -I../.. CPPFLAGS += $(MYCPPFLAGS) LDLIBS += -lshare -lscf -lsecdb -lumem diff --git a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile index 04fcae4022..ef2fd7530d 100644 --- a/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile +++ b/usr/src/cmd/fm/modules/common/fabric-xlate/Makefile @@ -29,7 +29,7 @@ SRCS = fabric-xlate.c fx_epkt.c fx_fabric.c fx_fire.c fx_subr.c include ../../Makefile.plugin -CPPFLAGS += -I/usr/include/libxml2 -I$(KMFDIR)/include -I. +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(KMFDIR)/include -I. CPPFLAGS += -I$(SRC)/uts/sun4v/io/px INCDIRS = $(SRC)/uts/common CFLAGS += -I$(INCDIRS) diff --git a/usr/src/cmd/hal/Makefile.hal b/usr/src/cmd/hal/Makefile.hal index a6bd4ac3f9..fc3a54f617 100644 --- a/usr/src/cmd/hal/Makefile.hal +++ b/usr/src/cmd/hal/Makefile.hal @@ -53,10 +53,13 @@ HAL_CONFIG_CPPFLAGS = -DPACKAGE_DATA_DIR=\"/usr/lib\" \ -DHAL_USER=\"$(HAL_USER)\" \ -DHAL_GROUP=\"$(HAL_GROUP)\" -HAL_DBUS_CPPFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE -DDBUS_SYSTEMD_DIR=\"/etc/dbus-1/system.d\" \ - -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include +HAL_DBUS_CPPFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE \ + -DDBUS_SYSTEMD_DIR=\"/etc/dbus-1/system.d\" \ + -I$(ADJUNCT_PROTO)/usr/include/dbus-1.0 \ + -I$(ADJUNCT_PROTO)/usr/lib/dbus-1.0/include -HAL_GLIB_CPPFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +HAL_GLIB_CPPFLAGS = -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ + -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include HAL_GETTEXT_PACKAGE = $(TEXT_DOMAIN) diff --git a/usr/src/cmd/isns/isnsadm/Makefile b/usr/src/cmd/isns/isnsadm/Makefile index 77c0349c65..e121b27ff0 100644 --- a/usr/src/cmd/isns/isnsadm/Makefile +++ b/usr/src/cmd/isns/isnsadm/Makefile @@ -31,7 +31,7 @@ include ../../Makefile.cmd LDLIBS += -lxml2 -lscf -lc CFLAGS += $(CCVERBOSE) -CPPFLAGS += -I. -I/usr/include/libxml2 -I../isnsd +CPPFLAGS += -I. -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I../isnsd POFILE = isnsadm_all.po POFILES = $(OBJS:%.o=%.po) diff --git a/usr/src/cmd/isns/isnsd/Makefile b/usr/src/cmd/isns/isnsd/Makefile index 0b0425d5e2..aaecd2ae6f 100644 --- a/usr/src/cmd/isns/isnsd/Makefile +++ b/usr/src/cmd/isns/isnsd/Makefile @@ -51,7 +51,7 @@ ROOTMANIFESTDIR = $(ROOTSVCNETWORK) $(ROOTSVCNETWORK)/isns_server.xml := FILEMODE = 0444 CFLAGS += $(CCVERBOSE) -CPPFLAGS += -I./ -I/usr/include/libxml2 +CPPFLAGS += -I./ -I$(ADJUNCT_PROTO)/usr/include/libxml2 CPPFLAGS += -DTARGET_DATA_STORE=$(DATA_STORE) CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS LINTFLAGS += -xerroff=E_BAD_PTR_CAST_ALIGN diff --git a/usr/src/cmd/latencytop/Makefile.com b/usr/src/cmd/latencytop/Makefile.com index 16884c4fd3..4b974078cc 100644 --- a/usr/src/cmd/latencytop/Makefile.com +++ b/usr/src/cmd/latencytop/Makefile.com @@ -34,7 +34,8 @@ CFLAGS64 += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-uninitialized -CPPFLAGS += -DEMBED_CONFIGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +CPPFLAGS += -DEMBED_CONFIGS -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ + -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include C99MODE = $(C99_ENABLE) LDLIBS += -lcurses -ldtrace all install := LDLIBS += -lglib-2.0 diff --git a/usr/src/cmd/lvm/metassist/controller/Makefile b/usr/src/cmd/lvm/metassist/controller/Makefile index 4272d4d504..137b867eaf 100644 --- a/usr/src/cmd/lvm/metassist/controller/Makefile +++ b/usr/src/cmd/lvm/metassist/controller/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# METASSIST_TOPLEVEL = .. @@ -36,7 +34,7 @@ include $(METASSIST_TOPLEVEL)/../../Makefile.cmd include $(METASSIST_TOPLEVEL)/Makefile.env INCLUDES += -I.. -I../common -I../xml -I../layout \ - -I/usr/include/libxml2 + -I$(ADJUNCT_PROTO)/usr/include/libxml2 CFLAGS += $(INCLUDES) POFILE = controllerp.po diff --git a/usr/src/cmd/lvm/metassist/xml/Makefile b/usr/src/cmd/lvm/metassist/xml/Makefile index 89f786d3a6..6d2a321797 100644 --- a/usr/src/cmd/lvm/metassist/xml/Makefile +++ b/usr/src/cmd/lvm/metassist/xml/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# METASSIST_TOPLEVEL = .. @@ -35,7 +33,7 @@ MSGFILES = $(SRCS:%.c=%.i) include $(METASSIST_TOPLEVEL)/../../Makefile.cmd include $(METASSIST_TOPLEVEL)/Makefile.env -INCLUDES += -I /usr/include/libxml2 -I../common +INCLUDES += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I../common CFLAGS += $(INCLUDES) POFILE = xmlp.po diff --git a/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile b/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile index 53703a48cc..ab57dbd02a 100644 --- a/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/libpython2.6/Makefile @@ -34,6 +34,8 @@ include ../../../../Makefile.cmd include ../../Makefile.ia32 include ../../../Makefile.module +$(__GNUC)CPPFLAGS += -isystem $(ADJUNCT_PROTO)/usr/include + dmod/$(MODULE) := LDLIBS += -lproc %.o: $(MODSRCS_DIR)/%.c diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile index 9b8ede22c5..c6f2000e8c 100644 --- a/usr/src/cmd/svc/configd/Makefile +++ b/usr/src/cmd/svc/configd/Makefile @@ -75,7 +75,8 @@ $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS) $(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc $(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD $(NATIVE_BUILD)LDFLAGS = -$(NATIVE_BUILD)LDLIBS = -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS) +$(NATIVE_BUILD)LDLIBS = -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \ + -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS) DIRMODE = 0755 FILEMODE = 0555 diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile index 723469fdc5..d5a6e434d6 100644 --- a/usr/src/cmd/svc/svccfg/Makefile +++ b/usr/src/cmd/svc/svccfg/Makefile @@ -69,7 +69,7 @@ $(NATIVE_BUILD)OBJS = $(MYOBJS:%.o=%-native.o) MAPFILES += $(MAPFILE.LEX) $(MAPFILE.NGB) MAPOPTS = $(MAPFILES:%=-M%) -MYCPPFLAGS = -I ../common -I/usr/include/libxml2 +MYCPPFLAGS = -I ../common -I$(ADJUNCT_PROTO)/usr/include/libxml2 CPPFLAGS += $(MYCPPFLAGS) LDFLAGS += $(MAPOPTS) @@ -113,6 +113,7 @@ $(NATIVE_BUILD)LDFLAGS = $(NATIVE_BUILD)LDLIBS = \ -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native \ -L$(LIBSCF)/native -R $(LIBSCF)/native \ + -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \ $(SVCCFG_EXTRA_LIBS) svccfg_lex.o svccfg_grammar.o := CCVERBOSE = diff --git a/usr/src/cmd/zonestat/zonestatd/Makefile b/usr/src/cmd/zonestat/zonestatd/Makefile index 656ba2e95b..169e995585 100644 --- a/usr/src/cmd/zonestat/zonestatd/Makefile +++ b/usr/src/cmd/zonestat/zonestatd/Makefile @@ -33,7 +33,7 @@ ROOTMANIFESTDIR = $(ROOTSVCSYSTEM) SRCS = zonestatd.c -CPPFLAGS += -I/usr/include/libxml2 +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 LDLIBS += -lkstat -lpool -lexacct -lscf \ -lcontract -lcmdutils -lumem diff --git a/usr/src/lib/efcode/interpreter/Makefile b/usr/src/lib/efcode/interpreter/Makefile index 82c44bbdc2..d7475b45bb 100644 --- a/usr/src/lib/efcode/interpreter/Makefile +++ b/usr/src/lib/efcode/interpreter/Makefile @@ -39,7 +39,8 @@ CERRWARN += -_gcc=-Wno-uninitialized LDFLAGS += -R/usr/lib/efcode/$(MACH64) -M mapfile64 LIBS = fcode.so fcdriver.so -$(PROG) := LDLIBS += -L/usr/lib/efcode/$(MACH64) $(LIBS:%=$(EFCODEDIR64)/%) +$(PROG) := LDLIBS += -L$(ADJUNCT_PROTO)/usr/lib/efcode/$(MACH64) \ + $(LIBS:%=$(EFCODEDIR64)/%) all: $(PROG) diff --git a/usr/src/lib/fm/libldom/Makefile.com b/usr/src/lib/fm/libldom/Makefile.com index 931961fe4a..859a177363 100644 --- a/usr/src/lib/fm/libldom/Makefile.com +++ b/usr/src/lib/fm/libldom/Makefile.com @@ -38,7 +38,7 @@ SRCDIR = ../sparc LIBS = $(DYNLIB) $(LINTLIB) CPPFLAGS += -I. -I$(SRC)/uts/sun4v -I$(ROOT)/usr/platform/sun4v/include \ - -I/usr/include/libxml2 -I/usr/sfw/include + -I$(ADJUNCT_PROTO)/usr/include/libxml2 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) diff --git a/usr/src/lib/fm/topo/libtopo/Makefile.com b/usr/src/lib/fm/topo/libtopo/Makefile.com index 0b7dc59c6d..56871dd6d4 100644 --- a/usr/src/lib/fm/topo/libtopo/Makefile.com +++ b/usr/src/lib/fm/topo/libtopo/Makefile.com @@ -74,7 +74,7 @@ SRCDIR = ../common CLEANFILES += $(SRCDIR)/topo_error.c $(SRCDIR)/topo_tables.c -CPPFLAGS += -I../common -I/usr/include/libxml2 -I. +CPPFLAGS += -I../common -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I. CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) CFLAGS += -D_POSIX_PTHREAD_SEMANTICS CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) diff --git a/usr/src/lib/libbrand/Makefile.com b/usr/src/lib/libbrand/Makefile.com index cd7d83371a..77443eb600 100644 --- a/usr/src/lib/libbrand/Makefile.com +++ b/usr/src/lib/libbrand/Makefile.com @@ -22,7 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" LIBRARY= libbrand.a VERS= .1 @@ -34,7 +33,7 @@ include ../../Makefile.lib LIBS= $(DYNLIB) $(LINTLIB) LDLIBS += -lc $(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) -CPPFLAGS += -I/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT $(DYNLIB) := LDLIBS += -lxml2 SRCDIR= ../common diff --git a/usr/src/lib/libkmf/ber_der/Makefile.com b/usr/src/lib/libkmf/ber_der/Makefile.com index e056b6cfa7..6654e7cfde 100644 --- a/usr/src/lib/libkmf/ber_der/Makefile.com +++ b/usr/src/lib/libkmf/ber_der/Makefile.com @@ -43,8 +43,10 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) -xCC CFLAGS64 += $(CCVERBOSE) -xCC -CPPFLAGS += -I/usr/include/libxml2 -I$(INCDIR) -I../../include -CPPFLAGS64 += -I/usr/include/libxml2 -I$(INCDIR) -I../../include +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ + -I$(INCDIR) -I../../include +CPPFLAGS64 += -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ + -I$(INCDIR) -I../../include LDLIBS += -lc CERRWARN += -_gcc=-Wno-unused-label diff --git a/usr/src/lib/libkmf/libkmf/Makefile.com b/usr/src/lib/libkmf/libkmf/Makefile.com index 4091ae09c1..a704d1e5a8 100644 --- a/usr/src/lib/libkmf/libkmf/Makefile.com +++ b/usr/src/lib/libkmf/libkmf/Makefile.com @@ -63,7 +63,8 @@ LDLIBS6 += $(BERDERLIB64) $(CRYPTOUTILLIB64) -lmd -lpkcs11 -lnsl -lsocket -lc $(DYNLIB) := LDLIBS += -lxml2 $(DYNLIB64) := LDLIBS64 += -lxml2 -CPPFLAGS += -I$(INCDIR) -I/usr/include/libxml2 -I../../ber_der/inc -I$(SRCDIR) +CPPFLAGS += -I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ + -I../../ber_der/inc -I$(SRCDIR) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch diff --git a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com index a3ab702811..3b5f23aa92 100644 --- a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com @@ -34,19 +34,21 @@ include $(SRC)/lib/Makefile.lib MPSDIR= /usr/lib/mps KMFINC= -I../../../include -I../../../ber_der/inc -NSSINC= -I/usr/include/mps +NSSINC= -I$(ADJUNCT_PROTO)/usr/include/mps BERLIB= -lkmf -lkmfberder BERLIB64= $(BERLIB) -NSSLIBS= $(BERLIB) -L$(MPSDIR) -R$(MPSDIR) -lnss3 -lnspr4 -lsmime3 -lc -NSSLIBS64= $(BERLIB64) -L$(MPSDIR)/$(MACH64) -R$(MPSDIR)/$(MACH64) -lnss3 -lnspr4 -lsmime3 -lc +NSSLIBS= $(BERLIB) -L$(ADJUNCT_PROTO)$(MPSDIR) -R$(MPSDIR) \ + -lnss3 -lnspr4 -lsmime3 -lc +NSSLIBS64= $(BERLIB64) -L$(ADJUNCT_PROTO)$(MPSDIR)/$(MACH64) \ + -R$(MPSDIR)/$(MACH64) -lnss3 -lnspr4 -lsmime3 -lc SRCDIR= ../common INCDIR= ../../include CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT $(KMFINC) $(NSSINC) \ - -I$(SFWDIR)/include -I$(INCDIR) -I/usr/include/libxml2 + -I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2 PICS= $(OBJECTS:%=pics/%) diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com index e44eb0a87c..76ecd38479 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com @@ -48,7 +48,7 @@ INCDIR= ../../include CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT $(KMFINC) \ - -I$(INCDIR) -I/usr/include/libxml2 + -I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2 CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-unused-value diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com index ae97ef8e8f..0b69e23fd6 100644 --- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com @@ -49,7 +49,8 @@ SRCS = \ CFLAGS += $(CCVERBOSE) -CPPFLAGS += -D_REENTRANT $(KMFINC) -I$(INCDIR) -I/usr/include/libxml2 -I$(BIGNUMDIR) +CPPFLAGS += -D_REENTRANT $(KMFINC) -I$(INCDIR) \ + -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(BIGNUMDIR) LINTFLAGS64 += -errchk=longptr64 CERRWARN += -_gcc=-Wno-unused-label diff --git a/usr/src/lib/libldap5/Makefile.com b/usr/src/lib/libldap5/Makefile.com index 9c28fae337..ee48739eea 100644 --- a/usr/src/lib/libldap5/Makefile.com +++ b/usr/src/lib/libldap5/Makefile.com @@ -57,7 +57,7 @@ OBJECTS= $(BEROBJS) $(LDAPOBJS) $(SSLDAPOBJS) $(PRLDAPOBJS) \ include ../../Makefile.lib NSS_LIBS= -lnspr4 -lplc4 -lnss3 -lssl3 -NSS_HDRS= /usr/include/mps +NSS_HDRS= $(ADJUNCT_PROTO)/usr/include/mps NSS_LDPATH= /usr/lib/mps NSS_LDPATH64= $(NSS_LDPATH)/64 diff --git a/usr/src/lib/libldap5/amd64/Makefile b/usr/src/lib/libldap5/amd64/Makefile index 680f2fb7c6..82a354b822 100644 --- a/usr/src/lib/libldap5/amd64/Makefile +++ b/usr/src/lib/libldap5/amd64/Makefile @@ -2,15 +2,13 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PR_MDUSOBJS = os_SunOS_x86.o include ../Makefile.com include ../../Makefile.lib.64 -LDLIBS += -L$(NSS_LDPATH64) $(NSS_LIBS) +LDLIBS += -L$(ADJUNCT_PROTO)$(NSS_LDPATH64) $(NSS_LIBS) DYNFLAGS += -R$(NSS_LDPATH64) all: $(LIBS) diff --git a/usr/src/lib/libldap5/i386/Makefile b/usr/src/lib/libldap5/i386/Makefile index d0eba36ca2..500155684a 100644 --- a/usr/src/lib/libldap5/i386/Makefile +++ b/usr/src/lib/libldap5/i386/Makefile @@ -2,8 +2,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # lib/libldap5/i386/Makefile # @@ -11,7 +9,7 @@ PR_MDUSOBJS = os_SunOS_x86.o include ../Makefile.com -LDLIBS += -L$(NSS_LDPATH) $(NSS_LIBS) +LDLIBS += -L$(ADJUNCT_PROTO)$(NSS_LDPATH) $(NSS_LIBS) DYNFLAGS += -R$(NSS_LDPATH) all: $(LIBS) diff --git a/usr/src/lib/libldap5/sparc/Makefile b/usr/src/lib/libldap5/sparc/Makefile index e5e0562484..b650c81920 100644 --- a/usr/src/lib/libldap5/sparc/Makefile +++ b/usr/src/lib/libldap5/sparc/Makefile @@ -2,8 +2,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # lib/libldap5/sparc/Makefile # @@ -11,7 +9,7 @@ PR_MDUSOBJS = os_SunOS.o include ../Makefile.com -LDLIBS += -L$(NSS_LDPATH) $(NSS_LIBS) +LDLIBS += -L$(ADJUNCT_PROTO)$(NSS_LDPATH) $(NSS_LIBS) DYNFLAGS += -R$(NSS_LDPATH) diff --git a/usr/src/lib/libldap5/sparcv9/Makefile b/usr/src/lib/libldap5/sparcv9/Makefile index e1ac900b72..a36300f4ba 100644 --- a/usr/src/lib/libldap5/sparcv9/Makefile +++ b/usr/src/lib/libldap5/sparcv9/Makefile @@ -2,8 +2,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # lib/libldap5/sparcv9/Makefile # @@ -12,7 +10,7 @@ PR_MDUSOBJS = os_SunOS.o include ../Makefile.com include ../../Makefile.lib.64 -LDLIBS += -L$(NSS_LDPATH64) $(NSS_LIBS) +LDLIBS += -L$(ADJUNCT_PROTO)$(NSS_LDPATH64) $(NSS_LIBS) DYNFLAGS += -R$(NSS_LDPATH64) all: $(LIBS) diff --git a/usr/src/lib/libpool/Makefile.com b/usr/src/lib/libpool/Makefile.com index 493e442d0d..13b8a05cc1 100644 --- a/usr/src/lib/libpool/Makefile.com +++ b/usr/src/lib/libpool/Makefile.com @@ -48,7 +48,8 @@ SRCDIR = ../common $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) -CPPFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 -I/usr/include/libxml2 +CPPFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 \ + -I$(ADJUNCT_PROTO)/usr/include/libxml2 CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch diff --git a/usr/src/lib/libshare/Makefile.com b/usr/src/lib/libshare/Makefile.com index 7e3c902a5e..328ffb353a 100644 --- a/usr/src/lib/libshare/Makefile.com +++ b/usr/src/lib/libshare/Makefile.com @@ -45,7 +45,8 @@ CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-switch -CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) -I/usr/include/libxml2 +CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) \ + -I$(ADJUNCT_PROTO)/usr/include/libxml2 .KEEP_STATE: diff --git a/usr/src/lib/libshare/autofs/Makefile.com b/usr/src/lib/libshare/autofs/Makefile.com index 41c7dfd334..d110bf634a 100644 --- a/usr/src/lib/libshare/autofs/Makefile.com +++ b/usr/src/lib/libshare/autofs/Makefile.com @@ -49,8 +49,9 @@ CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-uninitialized -CPPFLAGS += -D_REENTRANT -I$(AUTOFSSMFLIB_DIR) -I/usr/include/libxml2 \ - -I$(SRCDIR)../common +CPPFLAGS += -D_REENTRANT -I$(AUTOFSSMFLIB_DIR) \ + -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ + -I$(SRCDIR)../common .KEEP_STATE: diff --git a/usr/src/lib/libshare/nfs/Makefile.com b/usr/src/lib/libshare/nfs/Makefile.com index d393c5f8ba..ed89b6d960 100644 --- a/usr/src/lib/libshare/nfs/Makefile.com +++ b/usr/src/lib/libshare/nfs/Makefile.com @@ -50,8 +50,8 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-uninitialized -CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) -I/usr/include/libxml2 \ - -I$(SRCDIR)/../common +CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) \ + -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR)/../common .KEEP_STATE: diff --git a/usr/src/lib/libshare/smb/Makefile.com b/usr/src/lib/libshare/smb/Makefile.com index 6b3d821684..0fc5f66142 100644 --- a/usr/src/lib/libshare/smb/Makefile.com +++ b/usr/src/lib/libshare/smb/Makefile.com @@ -51,8 +51,8 @@ all install := LDLIBS += -lxml2 CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-char-subscripts CERRWARN += -_gcc=-Wno-switch -CPPFLAGS += -D_REENTRANT -I/usr/include/libxml2 \ - -I$(SRCDIR)/../common +CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ + -I$(SRCDIR)/../common $(ENABLE_SMB_PRINTING) CPPFLAGS += -DHAVE_CUPS .KEEP_STATE: diff --git a/usr/src/lib/libshare/smbfs/Makefile.com b/usr/src/lib/libshare/smbfs/Makefile.com index c4b7b48117..36b4875560 100644 --- a/usr/src/lib/libshare/smbfs/Makefile.com +++ b/usr/src/lib/libshare/smbfs/Makefile.com @@ -43,8 +43,8 @@ LDLIBS += -lshare -lscf -lumem -luuid -lc -lxml2 -lsmbfs CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized -CPPFLAGS += -D_REENTRANT -I/usr/include/libxml2 -I$(SRCDIR)/../common \ - -I$(SRC)/lib/libsmbfs -I$(SRC)/uts/common +CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ + -I$(SRCDIR)/../common -I$(SRC)/lib/libsmbfs -I$(SRC)/uts/common .KEEP_STATE: diff --git a/usr/src/lib/libsldap/Makefile.com b/usr/src/lib/libsldap/Makefile.com index d03823deb8..0d35b1f794 100644 --- a/usr/src/lib/libsldap/Makefile.com +++ b/usr/src/lib/libsldap/Makefile.com @@ -47,7 +47,7 @@ SRCDIR = ../common CFLAGS += $(CCVERBOSE) LOCFLAGS += -D_REENTRANT -DSUNW_OPTIONS CPPFLAGS += -I../common -I$(SRC)/lib/libldap5/include/ldap \ - -I/usr/include/mps $(LOCFLAGS) + -I$(ADJUNCT_PROTO)/usr/include/mps $(LOCFLAGS) LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN diff --git a/usr/src/lib/libzonecfg/Makefile.com b/usr/src/lib/libzonecfg/Makefile.com index 4c94fe6dd6..0bee2fc908 100644 --- a/usr/src/lib/libzonecfg/Makefile.com +++ b/usr/src/lib/libzonecfg/Makefile.com @@ -35,7 +35,7 @@ LDLIBS += -lc -lsocket -lnsl -luuid -lnvpair -lsysevent -lsec -lbrand \ $(DYNLIB) := LDLIBS += -lxml2 SRCDIR = ../common -CPPFLAGS += -I/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-parentheses $(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) diff --git a/usr/src/lib/lvm/libsvm/Makefile.com b/usr/src/lib/lvm/libsvm/Makefile.com index 7df4a4b39f..dbcd2a7295 100644 --- a/usr/src/lib/lvm/libsvm/Makefile.com +++ b/usr/src/lib/lvm/libsvm/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# LIBRARY= libsvm.a VERS= .1 @@ -46,7 +44,7 @@ LDLIBS += -lmeta -ldevid -lc # XXX There isn't a lint library for libspmicommon. For now, we work # around this by only using the library when we build (as opposed to lint). # -all debug install := LDLIBS += -L/usr/snadm/lib -lspmicommon +all debug install := LDLIBS += -L$(ADJUNCT_PROTO)/usr/snadm/lib -lspmicommon DYNFLAGS += -R/usr/snadm/lib CPPFLAGS += -D_FILE_OFFSET_BITS=64 diff --git a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com index 22082a1fb8..323f311dec 100644 --- a/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com +++ b/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com @@ -66,14 +66,14 @@ ROOTLIBDIR64=$(ROOT)/usr/lib/security/$(MACH64) LIBS=$(DYNLIB) $(DYNLIB64) -TSSROOT= +TSSROOT=$(ADJUNCT_PROTO) TSPILIBDIR=$(TSSROOT)/usr/lib TSPIINCDIR=$(TSSROOT)/usr/include TSSLIB=-L$(TSPILIBDIR) TSSLIB64=-L$(TSPILIBDIR)/$(MACH64) TSSINC=-I$(TSPIINCDIR) -LDLIBS += $(TSSLIB) -L/lib -lc -luuid -lmd -ltspi -lcrypto +LDLIBS += $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi -lcrypto CPPFLAGS += -xCC -D_POSIX_PTHREAD_SEMANTICS $(TSSINC) CPPFLAGS64 += $(CPPFLAGS) C99MODE= $(C99_ENABLE) diff --git a/usr/src/lib/policykit/Makefile.policykit b/usr/src/lib/policykit/Makefile.policykit index 8b8cff0fe1..e7f2d8a2da 100644 --- a/usr/src/lib/policykit/Makefile.policykit +++ b/usr/src/lib/policykit/Makefile.policykit @@ -22,15 +22,16 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # Definitions common for PolicyKit # POLICYKIT_VERSION = 0.2 -POLICYKIT_DBUS_CPPFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -POLICYKIT_GLIB_CPPFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +POLICYKIT_DBUS_CPPFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE \ + -I$(ADJUNCT_PROTO)/usr/include/dbus-1.0 \ + -I$(ADJUNCT_PROTO)/usr/lib/dbus-1.0/include +POLICYKIT_GLIB_CPPFLAGS = -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ + -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include POLICYKIT_DBUS_LDLIBS = -ldbus-1 POLICYKIT_GLIB_LDLIBS = -lglib-2.0 diff --git a/usr/src/lib/pylibbe/Makefile.com b/usr/src/lib/pylibbe/Makefile.com index aa26dec043..9f964ce417 100644 --- a/usr/src/lib/pylibbe/Makefile.com +++ b/usr/src/lib/pylibbe/Makefile.com @@ -44,7 +44,8 @@ C99MODE= $(C99_ENABLE) LIBS = $(DYNLIB) LDLIBS += -lbe -lnvpair -lc CFLAGS += $(CCVERBOSE) -CPPFLAGS += -I/usr/include/python2.6 -D_FILE_OFFSET_BITS=64 -I../../libbe/common +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6 \ + -D_FILE_OFFSET_BITS=64 -I../../libbe/common .KEEP_STATE: diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com index a27492771a..28d68704f9 100644 --- a/usr/src/lib/pysolaris/Makefile.com +++ b/usr/src/lib/pysolaris/Makefile.com @@ -45,7 +45,7 @@ LIBS = $(DYNLIB) LDLIBS += -lc -lsec -lidmap -lpython2.6 CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable -CPPFLAGS += -I/usr/include/python2.6 +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6 .KEEP_STATE: diff --git a/usr/src/lib/pyzfs/Makefile.com b/usr/src/lib/pyzfs/Makefile.com index 29d0407cae..0c996d0711 100644 --- a/usr/src/lib/pyzfs/Makefile.com +++ b/usr/src/lib/pyzfs/Makefile.com @@ -48,7 +48,7 @@ LIBS = $(DYNLIB) LDLIBS += -lc -lnvpair -lpython2.6 -lzfs CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable -CPPFLAGS += -I/usr/include/python2.6 +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/python2.6 CPPFLAGS += -I../../../uts/common/fs/zfs CPPFLAGS += -I../../../common/zfs diff --git a/usr/src/tools/ctf/Makefile.ctf b/usr/src/tools/ctf/Makefile.ctf index ace863e89b..7c5b041746 100644 --- a/usr/src/tools/ctf/Makefile.ctf +++ b/usr/src/tools/ctf/Makefile.ctf @@ -40,7 +40,8 @@ HDRDIRS= \ -I../../common \ -I$(SRC) \ -I/usr/include \ - -I$(SRC)/uts/common + -I$(SRC)/uts/common \ + -I$(NATIVE_ADJUNCT)/include CPPFLAGS += $(HDRDIRS) CFLAGS += $(CCVERBOSE) diff --git a/usr/src/tools/ctf/cvt/Makefile.com b/usr/src/tools/ctf/cvt/Makefile.com index fb35379c3a..5385b3769f 100644 --- a/usr/src/tools/ctf/cvt/Makefile.com +++ b/usr/src/tools/ctf/cvt/Makefile.com @@ -73,6 +73,7 @@ DWARFLDFLAGS = \ -ldwarf DWARFCPPFLAGS = -I../../dwarf/common +LDFLAGS += -L$(NATIVE_ADJUNCT)/lib LDLIBS += -lz -lelf CPPFLAGS += -D_REENTRANT CFLAGS += $(CTF_FLAGS) diff --git a/usr/src/tools/ctf/dump/Makefile.com b/usr/src/tools/ctf/dump/Makefile.com index ca3e925d01..9877fa06a3 100644 --- a/usr/src/tools/ctf/dump/Makefile.com +++ b/usr/src/tools/ctf/dump/Makefile.com @@ -31,6 +31,7 @@ SRCS = dump.c utils.c symbol.c include ../../Makefile.ctf +LDFLAGS += -L$(NATIVE_ADJUNCT)/lib LDLIBS += -lelf -lz OBJS = $(SRCS:%.c=%.o) diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index aae7d97778..3336a3154a 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -1630,7 +1630,7 @@ ENVCPPFLAGS4= PARENT_ROOT= export ENVLDLIBS3 ENVCPPFLAGS1 ENVCPPFLAGS2 ENVCPPFLAGS3 ENVCPPFLAGS4 \ - PARENT_ROOT + ENVLDLIBS1 ENVLDLIBS2 PARENT_ROOT PKGARCHIVE_ORIG=$PKGARCHIVE IA32_IHV_PKGS_ORIG=$IA32_IHV_PKGS diff --git a/usr/src/uts/intel/tpm/Makefile b/usr/src/uts/intel/tpm/Makefile index 96e810cd4f..c87048cceb 100644 --- a/usr/src/uts/intel/tpm/Makefile +++ b/usr/src/uts/intel/tpm/Makefile @@ -61,7 +61,7 @@ CFLAGS += -xCC CPPFLAGS += -I$(ROOT)/usr/include # This is for /usr/include/tss/, which is not built in the ON consolidation -CPPFLAGS += -I/usr/include +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include CERRWARN += -_gcc=-Wno-parentheses diff --git a/usr/src/uts/sun4v/tpm/Makefile b/usr/src/uts/sun4v/tpm/Makefile index e36ed558a5..7a44ba61db 100644 --- a/usr/src/uts/sun4v/tpm/Makefile +++ b/usr/src/uts/sun4v/tpm/Makefile @@ -71,7 +71,7 @@ CFLAGS += -xCC CPPFLAGS += -I$(ROOT)/usr/include # This is for /usr/include/tss/, which is not built in the ON consolidation -CPPFLAGS += -I/usr/include +CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include LDFLAGS += -dy -Nmisc/kcf |