diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2012-05-15 00:42:46 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2012-06-21 02:45:33 +0000 |
| commit | cafbe6d2d971c968aa866936806171786c219cc5 (patch) | |
| tree | 4270ed169484406b6192fa338099081087e1511c | |
| parent | 44487afb9d4785d91a89760b1e2225d7c9505871 (diff) | |
| download | illumos-joyent-cafbe6d2d971c968aa866936806171786c219cc5.tar.gz | |
smartos-live#51 No symlink for libusb.so to libusb.so.1 for -lusb
smartos-live#91 make world fails on trying to include zlib.h
OS-1303 smartos-live src_addon can die
OS-1306 non-bootstrappable runtime dependencies should be isolated
OS-1308 illumos-joyent should support using pkgsrc libraries for native ...
OS-1314 kvm.so is wrongly built as if it were a kmod
OS-1317 GZ crle configuration pollution
OS-1320 64-bit C++ objects in illumos are still getting gcc DT_RPATH
55 files changed, 104 insertions, 71 deletions
@@ -1225,7 +1225,6 @@ f lib/amd64/nss_files.so.1 0755 root bin f lib/amd64/nss_nis.so.1 0755 root bin f lib/amd64/nss_user.so.1 0755 root bin f lib/c_synonyms.so.1 0755 root bin -s lib/cpp=../usr/lib/cpp d lib/crypto 0755 root bin s lib/crypto/32=. s lib/crypto/64=amd64 @@ -2403,7 +2402,6 @@ s usr/ccs/lib/amd64/libpanel.so.1=../../../lib/amd64/libpanel.so.1 s usr/ccs/lib/amd64/libtermcap.so.1=../../../../lib/amd64/libtermcap.so.1 s usr/ccs/lib/amd64/libtermlib.so.1=../../../../lib/amd64/libcurses.so.1 s usr/ccs/lib/amd64/liby.so.1=../../../lib/amd64/liby.so.1 -s usr/ccs/lib/cpp=../../../lib/cpp s usr/ccs/lib/libcurses.so.1=../../../lib/libcurses.so.1 s usr/ccs/lib/libform.so.1=../../lib/libform.so.1 s usr/ccs/lib/libgen.so.1=../../../lib/libgen.so.1 @@ -5073,7 +5071,6 @@ f usr/lib/class/SDC/SDCpriocntl 0555 root bin d usr/lib/class/TS 0755 root bin f usr/lib/class/TS/TSdispadmin 0555 root bin f usr/lib/class/TS/TSpriocntl 0555 root bin -f usr/lib/cpp 0555 root bin s usr/lib/cron=../../etc/cron.d f usr/lib/crt1.o 0644 root bin f usr/lib/crti.o 0644 root bin @@ -6303,7 +6300,6 @@ s usr/lib/librcm.so.1=../../lib/librcm.so.1 s usr/lib/librcm.so=../../lib/librcm.so.1 f usr/lib/librdc.so.1 0755 root bin s usr/lib/librdc.so=librdc.so.1 -f usr/lib/libreadline.so.5 0555 root bin f usr/lib/libreparse.so.1 0755 root bin s usr/lib/libreparse.so=libreparse.so.1 s usr/lib/libresolv.so.1=../../lib/libresolv.so.1 @@ -6403,7 +6399,6 @@ s usr/lib/libumem.so.1=../../lib/libumem.so.1 s usr/lib/libumem.so=../../lib/libumem.so.1 f usr/lib/libunistat.so.1 0755 root bin s usr/lib/libunistat.so=libunistat.so.1 -f usr/lib/libusb.so.1 0555 root bin s usr/lib/libuuid.so.1=../../lib/libuuid.so.1 s usr/lib/libuuid.so=../../lib/libuuid.so.1 s usr/lib/libuutil.so.1=../../lib/libuutil.so.1 @@ -10183,7 +10178,6 @@ s usr/sbin/devnm=df f usr/sbin/df 0555 root bin f usr/sbin/dfmounts 0555 root bin h usr/sbin/dfshares=usr/sbin/dfmounts -f usr/sbin/dig 0555 root bin h usr/sbin/disks=usr/sbin/devfsadm f usr/sbin/dispadmin 0555 root bin s usr/sbin/dladm=../../sbin/dladm @@ -10234,7 +10228,6 @@ f usr/sbin/grub 0555 root bin f usr/sbin/gsscred 0555 root sys f usr/sbin/halt 0755 root bin f usr/sbin/hextoalabel 0555 root sys -f usr/sbin/host 0555 root bin s usr/sbin/hostconfig=../../sbin/hostconfig f usr/sbin/hotplug 0555 root bin f usr/sbin/htable 0555 root bin @@ -10294,7 +10287,6 @@ f usr/sbin/ipdadm 0555 root bin h usr/sbin/ipf=usr/lib/isaexec h usr/sbin/ipfs=usr/lib/isaexec h usr/sbin/ipfstat=usr/lib/isaexec -f usr/sbin/ipmitool 0555 root bin h usr/sbin/ipmon=usr/lib/isaexec s usr/sbin/ipmpstat=../../sbin/ipmpstat h usr/sbin/ipnat=usr/lib/isaexec @@ -10340,7 +10332,6 @@ f usr/sbin/newkey 0555 root sys f usr/sbin/nfsref 0555 root bin f usr/sbin/nlsadmin 0755 root adm f usr/sbin/nscd 0555 root bin -f usr/sbin/nslookup 0555 root bin f usr/sbin/nwamadm 0555 root bin f usr/sbin/nwamcfg 0555 root bin h usr/sbin/pbind=usr/lib/isaexec @@ -16805,7 +16796,6 @@ d var/inet 0755 root sys d var/krb5 0755 root sys d var/krb5/rcache 1777 root sys d var/krb5/rcache/root 0700 root sys -f var/ld/ld.config 0644 root root d var/ldap 0755 root sys d var/lib 0755 root other d var/lib/sgml 0755 root sys diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index b2c8f750a6..c818962f62 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -28,6 +28,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. # @@ -531,8 +542,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 @@ -642,6 +655,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) # diff --git a/usr/src/Makefile.master.64 b/usr/src/Makefile.master.64 index db5a45031b..c70dd75860 100644 --- a/usr/src/Makefile.master.64 +++ b/usr/src/Makefile.master.64 @@ -47,6 +47,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 # @@ -81,7 +82,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)$(__GNUC3)CCNEEDED += -lgcc_s_$(MACH64) $(__GNUC64)$(__GNUC4)CCNEEDED += -lgcc_s diff --git a/usr/src/cmd/availdevs/Makefile b/usr/src/cmd/availdevs/Makefile index 571c88cd3d..1ca23b0fe9 100644 --- a/usr/src/cmd/availdevs/Makefile +++ b/usr/src/cmd/availdevs/Makefile @@ -32,7 +32,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 1f3349bf2b..f5da5be4d6 100644 --- a/usr/src/cmd/avs/dsstat/Makefile +++ b/usr/src/cmd/avs/dsstat/Makefile @@ -40,7 +40,7 @@ OBJS= dsstat.o ii_stats.o sndr_stats.o sdbc_stats.o \ SRCS= $(OBJS:%.o=%.c) CFLAGS += -v -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..2200fcc0d7 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 7e94f51d21..d0430a4107 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 5f4c3e8095..4e9364a9c7 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 1609232d57..5a53739a25 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 354f7b475e..260d1c466f 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 f3dc5d53fa..1eaf479984 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 49eada657b..b46f7dd15b 100644 --- a/usr/src/cmd/isns/isnsd/Makefile +++ b/usr/src/cmd/isns/isnsd/Makefile @@ -47,7 +47,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 6fd2f83b66..a50d7a1c76 100644 --- a/usr/src/cmd/latencytop/Makefile.com +++ b/usr/src/cmd/latencytop/Makefile.com @@ -32,7 +32,8 @@ include ../../Makefile.cmd CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) -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..8581a74bca 100644 --- a/usr/src/cmd/lvm/metassist/controller/Makefile +++ b/usr/src/cmd/lvm/metassist/controller/Makefile @@ -36,7 +36,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..1a3963030a 100644 --- a/usr/src/cmd/lvm/metassist/xml/Makefile +++ b/usr/src/cmd/lvm/metassist/xml/Makefile @@ -35,7 +35,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/common/modules/conf/mapfile-extern b/usr/src/cmd/mdb/common/modules/conf/mapfile-extern index 8dc39bb019..c035d3fe55 100644 --- a/usr/src/cmd/mdb/common/modules/conf/mapfile-extern +++ b/usr/src/cmd/mdb/common/modules/conf/mapfile-extern @@ -46,6 +46,7 @@ SYMBOL_SCOPE { _mdb_ks_ncpu { FLAGS = EXTERN }; _mdb_ks_pageshift { FLAGS = EXTERN }; _mdb_ks_pagesize { FLAGS = EXTERN }; + _mdb_ks_pageoffset { FLAGS = EXTERN }; mdb { FLAGS = EXTERN }; mdb_add_walker { FLAGS = EXTERN }; 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 66836e15eb..6f4da5b248 100644 --- a/usr/src/cmd/svc/configd/Makefile +++ b/usr/src/cmd/svc/configd/Makefile @@ -69,7 +69,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 092d3a2253..6d613ffa7a 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) @@ -106,6 +106,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 c5b574f0a4..d8a13af002 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 b8c56e1542..020ab170bb 100644 --- a/usr/src/lib/efcode/interpreter/Makefile +++ b/usr/src/lib/efcode/interpreter/Makefile @@ -39,7 +39,8 @@ CPPFLAGS += -I ../include -I $(ROOT)/usr/platform/sun4u/include 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 2ce06f3a49..e01f062c10 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 4e16288540..180aa2a49b 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..0fceb70aac 100644 --- a/usr/src/lib/libbrand/Makefile.com +++ b/usr/src/lib/libbrand/Makefile.com @@ -34,7 +34,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 7bb53957bb..bbf6f26209 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 .KEEP_STATE: diff --git a/usr/src/lib/libkmf/libkmf/Makefile.com b/usr/src/lib/libkmf/libkmf/Makefile.com index a969f92bf4..c5aa4f8db8 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) .KEEP_STATE: diff --git a/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_nss/Makefile.com index 973aded814..3034f44bc6 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 c6182dde43..abcbd6173a 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 PICS= $(OBJECTS:%=pics/%) diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_pkcs11/Makefile.com index e748463a41..a81e2515a0 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 PICS= $(OBJECTS:%=pics/%) diff --git a/usr/src/lib/libldap5/Makefile.com b/usr/src/lib/libldap5/Makefile.com index e63c755ce7..4761f423c9 100644 --- a/usr/src/lib/libldap5/Makefile.com +++ b/usr/src/lib/libldap5/Makefile.com @@ -59,7 +59,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..abf5a7d5f8 100644 --- a/usr/src/lib/libldap5/amd64/Makefile +++ b/usr/src/lib/libldap5/amd64/Makefile @@ -10,7 +10,7 @@ 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..b9e154c6fc 100644 --- a/usr/src/lib/libldap5/i386/Makefile +++ b/usr/src/lib/libldap5/i386/Makefile @@ -11,7 +11,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..dcfe21adce 100644 --- a/usr/src/lib/libldap5/sparc/Makefile +++ b/usr/src/lib/libldap5/sparc/Makefile @@ -11,7 +11,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..b3b78410e5 100644 --- a/usr/src/lib/libldap5/sparcv9/Makefile +++ b/usr/src/lib/libldap5/sparcv9/Makefile @@ -12,7 +12,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 2468ac3cb2..ffad924f32 100644 --- a/usr/src/lib/libpool/Makefile.com +++ b/usr/src/lib/libpool/Makefile.com @@ -50,7 +50,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 .KEEP_STATE: diff --git a/usr/src/lib/libshare/Makefile.com b/usr/src/lib/libshare/Makefile.com index 9efcf9887e..92d1b89000 100644 --- a/usr/src/lib/libshare/Makefile.com +++ b/usr/src/lib/libshare/Makefile.com @@ -42,7 +42,8 @@ $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) -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 e5bbb262b5..65fc6fc379 100644 --- a/usr/src/lib/libshare/autofs/Makefile.com +++ b/usr/src/lib/libshare/autofs/Makefile.com @@ -46,7 +46,8 @@ LDLIBS += -lshare -lscf -lumem -lc -lxml2 #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) -CPPFLAGS += -D_REENTRANT -I$(AUTOFSSMFLIB_DIR) -I/usr/include/libxml2 \ +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 7c70784c03..fa7a7e3aaf 100644 --- a/usr/src/lib/libshare/nfs/Makefile.com +++ b/usr/src/lib/libshare/nfs/Makefile.com @@ -46,8 +46,8 @@ LDLIBS += -lshare -lnsl -lscf -lumem -lc -lxml2 #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) -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 f82f1c65b5..1a9ce5a652 100644 --- a/usr/src/lib/libshare/smb/Makefile.com +++ b/usr/src/lib/libshare/smb/Makefile.com @@ -47,7 +47,7 @@ LDLIBS += -lshare -ldlpi -lnsl -lnvpair -lscf -lumem -lc all install := LDLIBS += -lxml2 CFLAGS += $(CCVERBOSE) -CPPFLAGS += -D_REENTRANT -I/usr/include/libxml2 \ +CPPFLAGS += -D_REENTRANT -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ -I$(SRCDIR)/../common .KEEP_STATE: diff --git a/usr/src/lib/libshare/smbfs/Makefile.com b/usr/src/lib/libshare/smbfs/Makefile.com index d63255f09c..501ebcfe52 100644 --- a/usr/src/lib/libshare/smbfs/Makefile.com +++ b/usr/src/lib/libshare/smbfs/Makefile.com @@ -43,8 +43,8 @@ LIBS = $(DYNLIB) LDLIBS += -lshare -lscf -lumem -luuid -lc -lxml2 -lsmbfs CFLAGS += $(CCVERBOSE) -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 425567b6cc..3eb70828f3 100644 --- a/usr/src/lib/libsldap/Makefile.com +++ b/usr/src/lib/libsldap/Makefile.com @@ -50,7 +50,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 5b8baff813..62565705ef 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 $(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: diff --git a/usr/src/lib/lvm/libsvm/Makefile.com b/usr/src/lib/lvm/libsvm/Makefile.com index 7df4a4b39f..2457a10b69 100644 --- a/usr/src/lib/lvm/libsvm/Makefile.com +++ b/usr/src/lib/lvm/libsvm/Makefile.com @@ -46,7 +46,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 7db7923384..4a18468622 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..eca0c0d026 100644 --- a/usr/src/lib/policykit/Makefile.policykit +++ b/usr/src/lib/policykit/Makefile.policykit @@ -29,8 +29,11 @@ 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 6fa379ddcc..1c99148eca 100644 --- a/usr/src/lib/pylibbe/Makefile.com +++ b/usr/src/lib/pylibbe/Makefile.com @@ -42,7 +42,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 6aae6f949a..0dbd77826e 100644 --- a/usr/src/lib/pysolaris/Makefile.com +++ b/usr/src/lib/pysolaris/Makefile.com @@ -44,7 +44,7 @@ C99LMODE= -Xc99=%all LIBS = $(DYNLIB) LDLIBS += -lc -lsec -lidmap -lpython2.6 CFLAGS += $(CCVERBOSE) -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 948ad13cc0..20e1c59171 100644 --- a/usr/src/lib/pyzfs/Makefile.com +++ b/usr/src/lib/pyzfs/Makefile.com @@ -47,7 +47,7 @@ C99LMODE= -Xc99=%all LIBS = $(DYNLIB) LDLIBS += -lc -lnvpair -lpython2.6 -lzfs CFLAGS += $(CCVERBOSE) -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 7b42b93bb6..e8fee40a21 100644 --- a/usr/src/tools/ctf/Makefile.ctf +++ b/usr/src/tools/ctf/Makefile.ctf @@ -42,7 +42,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 051751ec5a..43b507bb3e 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 2fbbeb1415..3aa6caf47c 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 a7af995caa..9ecb8f471b 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -1700,7 +1700,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 6e35775765..a970b4768e 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 # # Default build targets. 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 |