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 /usr/src/lib | |
| 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
Diffstat (limited to 'usr/src/lib')
28 files changed, 50 insertions, 36 deletions
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 |