libssp47, libobjc47: install headers
authorJohn Marino <draco@marino.st>
Fri, 26 Oct 2012 14:35:25 +0000 (16:35 +0200)
committerJohn Marino <draco@marino.st>
Fri, 26 Oct 2012 19:36:44 +0000 (21:36 +0200)
Headers for both libssp and libobjc were not getting installed for the
gcc47 library set.  As an aside, the gcc44 libobjc is also missing these
headers.  There installation required an mtree change, but it can be
built with quickworld.

Additionally, CFLAGS were moved to above an include for libobjc which
should ensure the local config.h is included before a different version
and this in turn likely improves libobjc functionality.

etc/mtree/BSD.usr.dist
gnu/lib/gcc47/libobjc/Makefile
gnu/lib/gcc47/libssp/Makefile

index 57ccec0..7e78ecd 100644 (file)
         gcc44
         ..
         gcc47
+            objc
+            ..
+            ssp
+            ..
         ..
         lint
         ..
index d272dcd..f04676c 100644 (file)
@@ -1,3 +1,5 @@
+CFLAGS+=       -I${.CURDIR}
+CFLAGS+=       -I${.OBJDIR}
 .include "../Makefile.inc"
 
 .PATH: ${GCCDIR}/libobjc
@@ -7,8 +9,6 @@
 .PATH: ${GCCDIR}/gcc/objc
 .PATH: ${GCCDIR}/libgcc
 
-CFLAGS+=       -I.
-CFLAGS+=       -I${GCCDIR}/libobjc/objc
 CFLAGS+=       -I${GCCDIR}/libcpp/include
 CFLAGS+=       -I${GCCDIR}/libgcc
 CFLAGS+=       -DIN_GCC
@@ -70,7 +70,18 @@ runtime-info.h:
        ${CC} -print-objc-runtime-info -S tmp-runtime.m >> ${.TARGET}
        rm -f tmp-runtime.m tmp-runtime.s
 
-CLEANFILES+=   unwind.h runtime-info.h gthr-default.h
+INCS=          NXConstStr.h \
+               Object.h \
+               Protocol.h \
+               message.h \
+               objc-decls.h \
+               objc-exception.h \
+               objc-sync.h \
+               objc.h \
+               runtime.h \
+               thr.h
+INCSDIR=       /usr/libdata/gcc${GCCSHORTVER}/objc
 
+CLEANFILES+=   unwind.h runtime-info.h gthr-default.h
 
 .include <bsd.lib.mk>
index 89692ea..e2a54c0 100644 (file)
@@ -22,13 +22,13 @@ SRCS=       ${libssp_la_SOURCES}
 # generated
 SRCS+= ssp.h
 
-sspdir:
-       mkdir -p ssp
-
-ssp.h: sspdir ${GCCDIR}/libssp/ssp/ssp.h.in
+ssp.h: ${GCCDIR}/libssp/ssp/ssp.h.in
        sed -e 's/@ssp_have_usable_vsnprintf@/define/' \
-           < ${.ALLSRC:Nsspdir} > ssp/${.TARGET}
+           < ${.ALLSRC:Nsspdir} > ${.TARGET}
+
+INCS+=         ssp.h
+INCSDIR=       /usr/libdata/gcc${GCCSHORTVER}/ssp
 
-CLEANDIRS+=    ssp
+CLEANFILES+= ssp.h
 
 .include <bsd.lib.mk>