diff options
author | Maho Nakata <maho@FreeBSD.org> | 2004-12-17 09:17:37 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2004-12-17 09:17:37 +0000 |
commit | f9a954880cb89721637c9f7626e31b7c9af2c4f2 (patch) | |
tree | 41f1132c3b59c6c8d48cd721bfb5c5929a73362e /lang | |
parent | Fix plist. (diff) |
(1) a fix to -pthread
(2) clean up parts from gcc34 we don't need
Submitted by: lofi(1) and obrien (1), (2)
Notes
Notes:
svn path=/head/; revision=124292
Diffstat (limited to 'lang')
-rw-r--r-- | lang/gcc-ooo/Makefile | 31 | ||||
-rw-r--r-- | lang/gcc-ooo/files/extrapatch-gcc__config__freebsd-spec.h | 13 | ||||
-rw-r--r-- | lang/gcc-ooo/pkg-plist | 20 |
3 files changed, 22 insertions, 42 deletions
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile index 49826f3fd04e..401866f1146f 100644 --- a/lang/gcc-ooo/Makefile +++ b/lang/gcc-ooo/Makefile @@ -8,7 +8,8 @@ PORTNAME= gcc-ooo PORTVERSION= 3.4.1 -CATEGORIES= lang java +PORTREVISION= 1 +CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GCC} \ ${MASTER_SITE_LOCAL} DISTFILES= \ @@ -42,7 +43,10 @@ CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .else CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} .endif -WITHOUT_LIBJAVA= yes + +.if ${OSVERSION} > 502101 +EXTRA_PATCHES= ${FILESDIR}/extrapatch-gcc__config__freebsd-spec.h +.endif SRCDIR= ${WRKDIR}/gcc-${PORTVERSION} PATCH_WRKSRC= ${SRCDIR} @@ -73,18 +77,8 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals gcc gccinstall gccint -.if defined(WITHOUT_LIBJAVA) -CONFIGURE_ARGS+= --disable-libgcj -PLIST_SUB+= LIBJAVA="@comment " -.else -PLIST_SUB+= LIBJAVA="" -.endif - pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} target=${CONFIGURE_TARGET}" -.if defined(WITHOUT_LIBJAVA) - @${ECHO_MSG} "(without libgcj)" -.endif post-patch: @${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \ @@ -104,8 +98,7 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: fake-manpages -.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry - # gij and jv-convert, for example, are not built on all platforms. +.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ fi @@ -120,12 +113,11 @@ post-install: fake-manpages ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} .endfor # -${MV} -f ${PREFIX}/lib/ieee ${TARGLIB} -# -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} ${RM} -f ${PREFIX}/lib/libiberty.a ${RM} -f ${TARGLIB}/*.la - # Handle target libraries and GCJ include files. + # Handle target libraries. ${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}\///} include/gnu cd ${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ ${FIND} $d -type d | ${SORT} -r \ @@ -141,11 +133,6 @@ post-install: fake-manpages ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre cd ${WRKDIR} ; ex < ex.script -cklatest: -.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/ - @-ncftpls -l ${SITE} | ${GREP} 'LATEST.*3\.4' -.endfor - fake-manpages: # man pages can only be generated if Perl >= 5.6 is installed, so # fake them on 4.x systems. diff --git a/lang/gcc-ooo/files/extrapatch-gcc__config__freebsd-spec.h b/lang/gcc-ooo/files/extrapatch-gcc__config__freebsd-spec.h new file mode 100644 index 000000000000..1011be4e1b28 --- /dev/null +++ b/lang/gcc-ooo/files/extrapatch-gcc__config__freebsd-spec.h @@ -0,0 +1,13 @@ +--- gcc-3.4.1/gcc/config/freebsd-spec.h.orig Sat Nov 6 23:39:36 2004 ++++ gcc-3.4.1/gcc/config/freebsd-spec.h Sat Nov 6 23:39:59 2004 +@@ -132,8 +132,8 @@ + #if FBSD_MAJOR >= 5 + #define FBSD_LIB_SPEC " \ + %{!shared: \ +- %{!pg: %{pthread:-lc_r} -lc} \ +- %{pg: %{pthread:-lc_r_p} -lc_p} \ ++ %{!pg: %{pthread:-lpthread} -lc} \ ++ %{pg: %{pthread:-lpthread_p} -lc_p} \ + }" + #else + #define FBSD_LIB_SPEC " \ diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist index 33d22e26fbbf..87ee6a88f42f 100644 --- a/lang/gcc-ooo/pkg-plist +++ b/lang/gcc-ooo/pkg-plist @@ -9,25 +9,6 @@ bin/%%GNU_HOST%%-gcc-%%GCC_VER%% bin/%%GNU_HOST%%-gcc-ooo bin/%%GNU_HOST%%-g++-ooo bin/gccbug-ooo -%%LIBJAVA%%bin/gij-ooo -%%LIBJAVA%%bin/jv-convert-ooo -%%LIBJAVA%%bin/rmic-ooo -%%LIBJAVA%%bin/rmiregistry-ooo -%%LIBJAVA%%bin/addr2name.awk-ooo -%%LIBJAVA%%include/ffi.h -%%LIBJAVA%%include/jni.h -%%LIBJAVA%%include/jvmpi.h -%%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 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2 @@ -38,7 +19,6 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @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%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- |