diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-04-17 07:24:29 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-04-17 07:24:29 +0000 |
| commit | ce41446c2776ac9dcab0d1d406ce933ce28f7b92 (patch) | |
| tree | cabd22e90ccd80fc3609c42e954f3a89a04c2a6a /editors/openoffice.org-3-RC | |
| parent | 9f11fc7d6635d1415c9aae79faa9396cec3f8c2d (diff) | |
| download | ports-ce41446c2776ac9dcab0d1d406ce933ce28f7b92.tar.gz ports-ce41446c2776ac9dcab0d1d406ce933ce28f7b92.zip | |
Now buildable with GNU GCJ for openoffice.org-2.0.
Preparation of GCJ compilation for openoffice.org-2.0-devel
Notes
Notes:
svn path=/head/; revision=159773
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 19 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/Makefile.knobs | 13 |
2 files changed, 19 insertions, 13 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 072aa4baf065..33dcf07cfd96 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -80,10 +80,11 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX} .endif .if defined(WITH_GNUGCJ) -#BUILD_DEPENDS+= gcj41:${PORTSDIR}/lang/gcc41-with_gcj -#BUILD_DEPENDS+= gjdoc:${PORTSDIR}/java/gjdoc -#RUN_DEPENDS+= gcj41:${PORTSDIR}/lang/gcc41-with_gcj -BROKEN= "Still work in progress" +#this wired part must be rewritten +GCCVER=4.1.1 +BUILD_DEPENDS+= ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt +BUILD_DEPENDS+= gjdoc:${PORTSDIR}/java/gjdoc +RUN_DEPENDS+= ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt .else BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo .endif @@ -176,8 +177,14 @@ pre-everything:: post-extract: .if defined(WITH_GNUGCJ) @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf - -# #iXXXXX# xmerge doesn't support gjdoc - @${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc + @${RM} -Rf ${WRKDIR}/gnugcj + @${MKDIR} ${WRKDIR}/gnugcj/bin + @${MKDIR} ${WRKDIR}/gnugcj/lib + @${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj + @${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij + @${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc # #iXXXXX# xmerge doesn't support gjdoc + @${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar + @${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib .endif .if defined(WITH_GPC) @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs index 11c71d6d6909..7cd35078b44b 100644 --- a/editors/openoffice.org-3-RC/files/Makefile.knobs +++ b/editors/openoffice.org-3-RC/files/Makefile.knobs @@ -6,7 +6,7 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant .endif .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ) -CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" +CONFIGURE_ARGS+= --with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" .endif .if defined(WITHOUT_JAVA) CONFIGURE_ARGS+= --without-java @@ -98,12 +98,11 @@ pre-fetch: # @${ECHO} "You can compile OOo without Java support with" # @${ECHO} "make -DWITHOUT_JAVA" #.endif -#XXX currently broken -#.if !defined(WITH_GNUGCJ) -# @${ECHO} -# @${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with" -# @${ECHO} "make -DWITH_GNUGCJ" -#.endif +.if !defined(WITH_GNUGCJ) + @${ECHO} + @${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with" + @${ECHO} "make -DWITH_GNUGCJ" +.endif .if !defined(WITH_CUPS) @${ECHO} @${ECHO} "You can compile OOo with CUPS support with" |