From cafbe6d2d971c968aa866936806171786c219cc5 Mon Sep 17 00:00:00 2001 From: Keith M Wesolowski Date: Tue, 15 May 2012 00:42:46 +0000 Subject: 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 --- usr/src/lib/fm/libldom/Makefile.com | 2 +- usr/src/lib/fm/topo/libtopo/Makefile.com | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'usr/src/lib/fm') 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) -- cgit v1.2.3