Date: Wed, 29 Dec 2004 19:02:30 -0500 From: Mikhail Teterin <mi+mx@aldan.algebra.com> To: openoffice@freebsd.org Cc: openoffice@gentoo.org Subject: OOo-1.1.4 and gcc-3.4 Message-ID: <200412291902.31047.mi%2Bmx@aldan.algebra.com>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Hello!
It appears, Gentoo has bitten the bullet and solved the problems related to
building OOo with gcc-3.4.x.
Attached are the diffs, that
1. make use of their work;
2. use system's nas, curl, zlib, freetype, mspack, and -- most importantly --
stlport;
3. build OOo-1.1.4.
My build is not over yet, but has already gone pretty far :-) Can you, please,
take a look at these too?
Once this works, I think, it is imperative to have the port use all other
components, that are installed already (Python, db4, icu, sablotron, expat,
etc.), and obey the system's CFLAGS/CXXFLAGS.
Thanks for your time. Yours,
-mi
[-- Attachment #2 --]
Index: Makefile
===================================================================
RCS file: /meow/ncvs/ports/editors/openoffice-1.1/Makefile,v
retrieving revision 1.171
diff -U2 -r1.171 Makefile
--- Makefile 23 Dec 2004 02:01:07 -0000 1.171
+++ Makefile 29 Dec 2004 23:46:19 -0000
@@ -7,6 +7,5 @@
PORTNAME= openoffice
-PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTVERSION= 1.1.4
CATEGORIES+= editors
MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
@@ -23,6 +22,9 @@
http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
MASTER_SITE_SUBDIR= stable/${PORTVERSION}
-DISTFILES+= OOo_${PORTVERSION}-1_source.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY= OOo_${PORTVERSION}-1_source.tar.gz
+# Almost verbatim from http://bugs.gentoo.org/show_bug.cgi?id=50233 :
+PATCHFILES= OOo-GCC-3.4.patch.bz2
+PATCH_SITES= http://virtual-estates.net/~mi/port-stuff/
+DISTFILES+= OOo_${PORTVERSION}_source.tar.gz gpc231.tar.Z:gpc
+EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.gz
MAINTAINER= openoffice@FreeBSD.org
@@ -86,14 +88,11 @@
.endif
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+#BUILD_DEPENDS+= dmake:${PORTSDIR}/devel/dmake
# FIXME (correctly add ccache before gcc and g++)
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
-CC= ccache gcc32
-CXX= ccache g++32
-.else
-CC= gcc32
-CXX= g++32
+CC:= ccache ${CC}
+CXX:= ccache ${CXX}
.endif
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
@@ -101,4 +100,5 @@
gcp:${PORTSDIR}/sysutils/coreutils \
xmkmf:${X_IMAKE_PORT} \
+ ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport \
${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
.if !defined(DISPLAY)
@@ -108,5 +108,13 @@
png.5:${PORTSDIR}/graphics/png \
mng.1:${PORTSDIR}/graphics/libmng \
+ mspack:${PORTSDIR}/archivers/libmspack \
+ audio:${PORTSDIR}/audio/nas \
+ curl:${PORTSDIR}/ftp/curl \
freetype.9:${PORTSDIR}/print/freetype2
+
+# OOs insists on neon-23 and rejects neon-24
+#LIB_DEPENDS+= neon:${PORTSDIR}/www/neon
+#CONFIGURE_ARGS+=--with-system-neon
+
.if defined(WITHOUT_JAVA)
LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt
@@ -117,6 +125,6 @@
USE_AUTOCONF_VER= 259
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
-WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}_src
-CONFIGURE_WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}_src/config_office
+WRKSRC= ${WRKDIR}
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
@@ -130,6 +138,14 @@
CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
+ CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/include" \
PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp
+CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \
+ --with-system-freetype \
+ --with-system-curl \
+ --with-system-nas \
+ --with-system-zlib \
+ --with-system-mspack \
+ --with-stlport4-home=${LOCALBASE}
.if defined(WITHOUT_JAVA)
@@ -210,7 +226,6 @@
post-extract:
- @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
- @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
- @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
+ @cd ${WRKDIR} ; ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z
+ @${MV} ${WRKDIR}/gpc231/gpc.[ch] ${WRKSRC}/external/gpc/
.if defined(L10NHELP)
@${ECHO_MSG} "===> Extracting L10NHELP sub project"
Index: distinfo
===================================================================
RCS file: /meow/ncvs/ports/editors/openoffice-1.1/distinfo,v
retrieving revision 1.41
diff -U2 -r1.41 distinfo
--- distinfo 12 Oct 2004 07:20:54 -0000 1.41
+++ distinfo 29 Dec 2004 23:26:27 -0000
@@ -1,4 +1,4 @@
-MD5 (openoffice1.1/OOo_1.1.3-1_source.tar.gz) = 9df288bb534964d4b96efdf7bf029456
-SIZE (openoffice1.1/OOo_1.1.3-1_source.tar.gz) = 215360913
+MD5 (openoffice1.1/OOo_1.1.4_source.tar.gz) = 20c10db97865ae4c51dc827d668b8939
+SIZE (openoffice1.1/OOo_1.1.4_source.tar.gz) = 219743530
MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice1.1/gpc231.tar.Z) = 27917
[-- Attachment #3 --]
Real checkdll will fail because OpenOffice uses cc instead of c++
to create shared libraries (which leaves libstdc++ out). It does not
matter at the end, because the whole executables are linked with c++
anyway.
--- solenv/bin/checkdll.sh Thu Mar 27 06:47:51 2003
+++ solenv/bin/checkdll.sh Wed Dec 29 15:38:38 2004
@@ -53,5 +53,6 @@
esac
- $checkdll "$*"
+ # $checkdll "$*"
+ echo "Cheating by skipping library checks"
if [ $? -ne 0 ]; then exit 1 ; fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412291902.31047.mi%2Bmx>