Date: Sat, 11 Dec 2004 12:32:47 +0900 (JST) From: NAKATA Maho <maho@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/74937: REPOCOPY REQUEST lang/gcc34 -> lang/gccc-ooo Message-ID: <200412110332.iBB3WlUR068886@satie.private.org> Resent-Message-ID: <200412110340.iBB3eNjt074940@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74937
>Category: ports
>Synopsis: REPOCOPY REQUEST lang/gcc34 -> lang/gccc-ooo
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 11 03:40:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: NAKATA Maho
>Release: FreeBSD 5.3-RELEASE-p1 i386
>Organization:
private
>Environment:
System: FreeBSD satie.private.org 5.3-RELEASE-p1 FreeBSD 5.3-RELEASE-p1 #0: Sat Nov 27 11:45:01 JST 2004 maho@satie.private.org:/usr/src/sys/i386/compile/MAHO i386
>Description:
Currently for OpenOffice.org port, we use gcc-3.2.3. However,
for upcoming OpenOffice.org 2.0, Hamburg team in SUN Microsystems,
who is actually managing source and developing code,
uses special gcc 3.4.1, namely gcc-3.4.1 with vislibilty patch and
enum fix. Since OpenOffice.org is HUGE port, the version of gcc affects
seriously not only object code but also compilation, To reduce maintainance
cost, we FreeBSD OpenOffice.org team decided to use `official' gcc that
Hamburg uses.
And this gcc is based on gcc-3.4.x port, so we also need repocopy to
lang/gcc34 -> lang/gcc-ooo
>How-To-Repeat:
We'll apply following patch after repocopy:
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/gcc34/Makefile,v
retrieving revision 1.183
diff -u -r1.183 Makefile
--- Makefile 22 Nov 2004 09:54:34 -0000 1.183
+++ Makefile 11 Dec 2004 03:23:56 -0000
@@ -6,34 +6,32 @@
# $FreeBSD: ports/lang/gcc34/Makefile,v 1.183 2004/11/22 09:54:34 gerald Exp $
#
-PORTNAME= gcc
-PORTVERSION= 3.4.4
-PORTREVISION= 20041119
+PORTNAME= gcc-ooo
+PORTVERSION= 3.4.1
CATEGORIES= lang java
-VERSIONSTRING= 3.4-${PORTREVISION}
MASTER_SITES= ${MASTER_SITE_GCC} \
- http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
-MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
+ ${MASTER_SITE_LOCAL}
DISTFILES= \
- gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-g77-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
+ gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
+ gcc-g++-${PORTVERSION}${EXTRACT_SUFX} \
+ gcc-testsuite-${PORTVERSION}${EXTRACT_SUFX}
-MAINTAINER?= gerald@FreeBSD.org
-COMMENT?= GNU Compiler Collection 3.4
+PATCH_DIST_STRIP= -p1
-LATEST_LINK?= gcc34${PKGNAMESUFFIX}
+MAINTAINER?= openoffice@FreeBSD.org
+COMMENT?= GNU Compiler Collection 3.4.1 for OpenOffice.org compilation
+LATEST_LINK?= No
+
+PATCHFILES+= GCC3.4.0VisibilityPatch2.diff
+PATCH_SITES+= http://www.nedprod.com/TnFOX/patches/
+PATCH_STRIP= -p1
USE_BISON= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
USE_REINPLACE= yes
-PATCH_WRKSRC= ${SRCDIR}
CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure
NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4
@@ -44,15 +42,13 @@
.else
CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.endif
-
-.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
-.endif
-SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
+SRCDIR= ${WRKDIR}/gcc-${PORTVERSION}
+PATCH_WRKSRC= ${SRCDIR}
WRKSRC= ${WRKDIR}/build
-SUFFIX= 34
-TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+SUFFIX= -ooo
+TARGLIB= ${PREFIX}/lib/gcc-ooo/${CONFIGURE_TARGET}/${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-nls \
--with-system-zlib \
@@ -72,19 +68,10 @@
PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
MAN1= cpp${SUFFIX}.1 \
g++${SUFFIX}.1 \
- g77-${SUFFIX}.1 \
gcc${SUFFIX}.1 \
- gcov${SUFFIX}.1 \
- gcj${SUFFIX}.1 \
- gcjh${SUFFIX}.1 \
- gij${SUFFIX}.1 \
- grepjar${SUFFIX}.1 \
- jar${SUFFIX}.1 \
- jcf-dump${SUFFIX}.1 \
- jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
- rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
+ gcov${SUFFIX}.1
MAN7= fsf-funding.7 gfdl.7 gpl.7
-INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
+INFO= cpp cppinternals gcc gccinstall gccint
.if defined(WITHOUT_LIBJAVA)
CONFIGURE_ARGS+= --disable-libgcj
@@ -117,7 +104,7 @@
cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
post-install: fake-manpages
-.for f in c++ g77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
+.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.
if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \
@@ -127,15 +114,13 @@
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
- ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX}
- -${MV} -f ${PREFIX}/man/man1/g77${SUFFIX}.1 ${PREFIX}/man/man1/g77-${SUFFIX}.1
# These libraries are moved from PREFIX/lib to avoid conflicts with
# the stock compiler.
-.for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
+.for f in libstdc++ libsupc++ ${EXTRA_SHLIB}
${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
.endfor
- -${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
- -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
+# -${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.
@@ -147,7 +132,7 @@
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
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/lib/gcc-ooo/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-ooo 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
@@ -161,11 +146,11 @@
@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*3\.4'
.endfor
-.include <bsd.port.post.mk>
-
fake-manpages:
# man pages can only be generated if Perl >= 5.6 is installed, so
# fake them on 4.x systems.
.for mp in ${_MANPAGES}
( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
.endfor
+
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/lang/gcc34/distinfo,v
retrieving revision 1.94
diff -u -r1.94 distinfo
--- distinfo 22 Nov 2004 09:54:34 -0000 1.94
+++ distinfo 11 Dec 2004 03:23:56 -0000
@@ -1,12 +1,8 @@
-MD5 (gcc-core-3.4-20041119.tar.bz2) = af6541e4972b5e01f5d03ea19cb465b1
-SIZE (gcc-core-3.4-20041119.tar.bz2) = 10969319
-MD5 (gcc-g++-3.4-20041119.tar.bz2) = 7fafc0ca1cf1034aea106e7b2157746a
-SIZE (gcc-g++-3.4-20041119.tar.bz2) = 2474028
-MD5 (gcc-g77-3.4-20041119.tar.bz2) = 96a52acdac537e37ea5584eed15c2021
-SIZE (gcc-g77-3.4-20041119.tar.bz2) = 892266
-MD5 (gcc-java-3.4-20041119.tar.bz2) = 1e315c116b90650749fa80ed40a38804
-SIZE (gcc-java-3.4-20041119.tar.bz2) = 4549105
-MD5 (gcc-objc-3.4-20041119.tar.bz2) = 924a98ac35897a315588fa8cb8da0f70
-SIZE (gcc-objc-3.4-20041119.tar.bz2) = 148716
-MD5 (gcc-testsuite-3.4-20041119.tar.bz2) = bf23c8d165d5418e7aff6a55f704e16c
-SIZE (gcc-testsuite-3.4-20041119.tar.bz2) = 2626096
+MD5 (gcc-core-3.4.1.tar.bz2) = 4b05b134baf92457494a0f4a28aa5213
+SIZE (gcc-core-3.4.1.tar.bz2) = 12862544
+MD5 (gcc-g++-3.4.1.tar.bz2) = 7517c88648883e3d92e1e8525ab823fa
+SIZE (gcc-g++-3.4.1.tar.bz2) = 2406501
+MD5 (gcc-testsuite-3.4.1.tar.bz2) = 641f45606e17db4a3079cb7364a9e295
+SIZE (gcc-testsuite-3.4.1.tar.bz2) = 2600275
+MD5 (GCC3.4.0VisibilityPatch2.diff) = d2b2e7d8e2eb265ce445e4e916d83708
+SIZE (GCC3.4.0VisibilityPatch2.diff) = 43952
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/lang/gcc34/pkg-descr,v
retrieving revision 1.5
diff -u -r1.5 pkg-descr
--- pkg-descr 14 Nov 2003 22:01:12 -0000 1.5
+++ pkg-descr 11 Dec 2004 03:23:56 -0000
@@ -1,6 +1,7 @@
-GCC, the GNU Compiler Collection includes gcc, g++, gcj, and g77.
+GCC, the GNU Compiler Collection includes gcc, g++
+for OpenOffice.org compilation
-This port installs the various front ends as gcc34, g++34, gcj34,
-and g77-34 into the ${PREFIX}/bin directory.
+This port installs the various front ends as gcc-ooo, and g++-ooo
+into the ${PREFIX}/bin directory.
WWW: http://gcc.gnu.org/
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/lang/gcc34/pkg-plist,v
retrieving revision 1.58
diff -u -r1.58 pkg-plist
--- pkg-plist 3 Sep 2004 17:42:11 -0000 1.58
+++ pkg-plist 11 Dec 2004 03:23:56 -0000
@@ -1,28 +1,19 @@
-@comment $FreeBSD: ports/lang/gcc34/pkg-plist,v 1.58 2004/09/03 17:42:11 vs Exp $
-bin/c++34
-bin/cpp34
-bin/g++34
-bin/g77-34
-bin/gcc34
-bin/gcov34
-bin/%%GNU_HOST%%-c++34
+@comment $FreeBSD: ports/lang/gcc-ooo/pkg-plist,v 1.58 2004/09/03 17:42:11 vs Exp $
+bin/c++-ooo
+bin/cpp-ooo
+bin/g++-ooo
+bin/gcc-ooo
+bin/gcov-ooo
+bin/%%GNU_HOST%%-c++-ooo
bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc34
-bin/%%GNU_HOST%%-g++34
-bin/%%GNU_HOST%%-gcj34
-bin/%%GNU_HOST%%-gcjh34
-bin/gccbug34
-bin/gcj34
-bin/gcjh34
-%%LIBJAVA%%bin/gij34
-bin/jv-scan34
-bin/jcf-dump34
-%%LIBJAVA%%bin/jv-convert34
-bin/jar34
-bin/grepjar34
-%%LIBJAVA%%bin/rmic34
-%%LIBJAVA%%bin/rmiregistry34
-%%LIBJAVA%%bin/addr2name.awk34
+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
@@ -39,10 +30,6 @@
%%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%%/f771
-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
cvs diff: Diffing files
cvs diff: cannot find files/patch-gengtype-yacc.y
cvs diff: cannot find files/patch-libjava::Makefile.in
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412110332.iBB3WlUR068886>