diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2004-11-05 19:48:46 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2004-11-05 19:48:46 +0000 |
| commit | 6ee371136c4209db63927f6ced69c2dab08b3072 (patch) | |
| tree | 246571219531e04dd5c9e01d49d6a532715e4ccc /lang/gcc | |
| parent | 4be841cecd01aaba3745336ce37d1685fa64aa9d (diff) | |
| download | ports-6ee371136c4209db63927f6ced69c2dab08b3072.tar.gz ports-6ee371136c4209db63927f6ced69c2dab08b3072.zip | |
Notes
Diffstat (limited to 'lang/gcc')
| -rw-r--r-- | lang/gcc/Makefile | 6 | ||||
| -rw-r--r-- | lang/gcc/pkg-plist | 23 |
2 files changed, 8 insertions, 21 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 1c88756199cf..16e2b8745717 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -138,9 +138,10 @@ post-install: fake-manpages -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} ${RM} -f ${PREFIX}/lib/libiberty.a ${RM} -f ${TARGLIB}/*.la - # Handle target libraries and GCJ include files. + ${RM} -f ${PREFIX}/lib/lib-org-*.la + # Handle target libraries, libexec binaries, and GCJ include files. ${RM} -f ${WRKDIR}/PLIST.lib -.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax +.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ ${FIND} $d -type d | ${SORT} -r \ @@ -148,6 +149,7 @@ post-install: fake-manpages fi .endfor (${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib + (${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist index b9f9e044d303..aa0121de78ef 100644 --- a/lang/gcc/pkg-plist +++ b/lang/gcc/pkg-plist @@ -25,32 +25,17 @@ bin/jcf-dump40 %%LIBJAVA%%include/ffi.h %%LIBJAVA%%include/jni.h %%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.a %%LIBJAVA%%lib/libffi.la %%LIBJAVA%%lib/libffi.a %%LIBJAVA%%lib/logging.properties -%%LIBJAVA%%libdata/pkgconfig/libgcj.pc %%LIBJAVA%%lib/security/classpath.security %%LIBJAVA%%lib/security/libgcj.security %%LIBJAVA%%@dirrm lib/security -%%LIBJAVA%%lib/lib-org-xml-sax.la -%%LIBJAVA%%lib/lib-org-xml-sax.a -%%LIBJAVA%%lib/lib-org-w3c-dom.la -%%LIBJAVA%%lib/lib-org-w3c-dom.a -include/mf-runtime.h -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1 -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2 -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders -@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools -@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true -@unexec rmdir %D/libexec/gcc 2>/dev/null || true +%%LIBJAVA%%libdata/pkgconfig/libgcj.pc %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar +include/mf-runtime.h @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- |