diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-04-21 07:59:03 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-04-21 07:59:03 +0000 |
commit | f4e43b6408289e88dd7e912de1cac188487957a4 (patch) | |
tree | b191509c467cd032c8799f69010c3d5941a1cf78 /lang/gcc-ooo | |
parent | Actually commit these changes to convert to new GNOME infrastructure. (diff) |
merge changes from gcc32 to gcc33 after testing
- Option WANT_SHAREDLIBS now uses ldconfig, so LIB_DEPENDS work.
- fix PLIST so critical file libgcc_s.so.1 is included.
- complete PLIST
- COMMENT can be overrritten by a slave port
- uncomment MANPAGES, as they are currently not installed.
Notes
Notes:
svn path=/head/; revision=79398
Diffstat (limited to 'lang/gcc-ooo')
-rw-r--r-- | lang/gcc-ooo/Makefile | 18 | ||||
-rw-r--r-- | lang/gcc-ooo/pkg-plist | 25 |
2 files changed, 36 insertions, 7 deletions
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile index ed2493a4d7e5..ab6e961bb930 100644 --- a/lang/gcc-ooo/Makefile +++ b/lang/gcc-ooo/Makefile @@ -26,7 +26,7 @@ DISTFILES= \ .endif MAINTAINER= ports@FreeBSD.org -COMMENT= GNU Compiler Collection 3.3 (inprogress version) +COMMENT?= GNU Compiler Collection 3.3 (inprogress version) NO_CDROM= 'dated material' LATEST_LINK?= gcc33${PKGNAMESUFFIX} @@ -69,6 +69,9 @@ CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared +INSTALLS_SHLIB= yes +LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} +EXTRA_SHLIB= libgcc_s .else CONFIGURE_ARGS+= --disable-shared .endif @@ -78,10 +81,11 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap -MAN1= cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \ - gcj33.1 gcjh33.1 gij33.1 grepjar33.1 jar33.1 \ - jcf-dump33.1 jv-scan33.1 jv-convert33.1 -MAN7= fsf-funding.7 gfdl.7 gpl.7 +#MAN1= cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \ +# gcj33.1 gcjh33.1 gij33.1 grepjar33.1 jar33.1 \ +# jcf-dump33.1 jv-scan33.1 jv-convert33.1 +MAN1= g++33.1 grepjar33.1 jar33.1 +#MAN7= fsf-funding.7 gfdl.7 gpl.7 pre-fetch: @${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -157,7 +161,7 @@ post-install: ${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION} # These 3 libraries are moved from PREFIX/lib to avoid conflicts # with the stock compiler. -.for file in libstdc++ libsupc++ libg2c libfrtbegin libobjc +.for file in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB} ${MV} -f ${PREFIX}/lib/${file}.* ${TARGLIB} .endfor -${MV} -f ${PREFIX}/lib/ieee ${TARGLIB} @@ -165,7 +169,7 @@ post-install: -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} ${RM} -f ${PREFIX}/lib/libiberty.a ${RM} -f ${TARGLIB}/*.la -.for info in cpp cppinternals g77 gcc gcj +.for info in cpp cppinternals g77 gcc gccint gcj fastjar install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir .endfor # I am sick and tired of the anonyance that man pages can only be generated if diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist index fb06926fd713..bfa050638746 100644 --- a/lang/gcc-ooo/pkg-plist +++ b/lang/gcc-ooo/pkg-plist @@ -20,6 +20,25 @@ bin/grepjar33 bin/rmic33 bin/rmiregistry33 bin/addr2name.awk +include/fficonfig.h +include/ffi.h +include/ffi_mips.h +include/jni.h +include/jvmpi.h +lib/libffi-2.00-beta.so +lib/libffi.la +lib/libffi.a +lib/security/classpath.security +lib/security/libgcj.security +@dirrm lib/security +lib/lib-org-xml-sax.so.0 +lib/lib-org-xml-sax.la +lib/lib-org-xml-sax.a +lib/lib-org-w3c-dom.so.0 +lib/lib-org-w3c-dom.la +lib/lib-org-w3c-dom.a +share/java/libgcj-3.3.jar +@dirrm share/java @comment not needed post-libstdc++-v3: %%GNU_HOST%%/include/_G_config.h @comment Insert PLIST.gcc-lib here @comment -=[ begin PLIST.gcc-lib ]=- @@ -31,16 +50,22 @@ bin/addr2name.awk @unexec install-info --delete %D/info/cppinternals.info %D/info/dir @unexec install-info --delete %D/info/g77.info %D/info/dir @unexec install-info --delete %D/info/gcc.info %D/info/dir +@unexec install-info --delete %D/info/gccint.info %D/info/dir @unexec install-info --delete %D/info/gcj.info %D/info/dir +@unexec install-info --delete %D/info/fastjar.info %D/info/dir info/cpp.info info/cppinternals.info info/g77.info info/gcc.info +info/gccint.info info/gcj.info +info/fastjar.info @exec install-info %D/info/cpp.info %D/info/dir @exec install-info %D/info/cppinternals.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir +@exec install-info %D/info/gccint.info %D/info/dir @exec install-info %D/info/gcj.info %D/info/dir +@exec install-info %D/info/fastjar.info %D/info/dir @comment @dirrm %%GNU_HOST%%/include @comment @dirrm %%GNU_HOST%% |