From 965673f91ba914944db43716a03f5dc41083429e Mon Sep 17 00:00:00 2001 From: mbr Date: Thu, 4 Jul 2002 22:31:20 +0000 Subject: 1) Change notice about a system patch. Matt did fix this in 4.6 STABLE. 2) Add another needed system patch notice to avoid deadlocks. Obtained from 1) Jesse Gross 2) Alexander Kabaev John Polstra --- editors/openoffice/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'editors/openoffice/Makefile') diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 5b066f3c22ee..cbefad374dc4 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -142,15 +142,25 @@ CONFIGURE_ARGS+= --enable-gcc3 .endif pre-fetch: -.if ${OSVERSION} < 500000 +.if ${OSVERSION} < 460001 @${ECHO} - @${ECHO} OO setup is currently broken on STABLE + @${ECHO} OO setup is broken on STABLE < 4.6 + @${ECHO} including 4.6 RELEASE. @${ECHO} You'll need a system patch to solve + @${ECHO} @${ECHO} this problem: @${ECHO} @${ECHO} http://people.freebsd.org/~mbr/patches/rtld-elf.diff @${ECHO} .endif + @${ECHO} + @${ECHO} OO.org build and also OO.org itself + @${ECHO} can deadlock. You can work around + @${ECHO} this problem with this patch: + @${ECHO} + @${ECHO} http://people.freebsd.org/~mbr/patches/rtld-elf-patch2.diff + @${ECHO} + @${ECHO} .if !defined(USE_GCC) || !defined(WITH_DEBUG) @${ECHO} @${ECHO} OPTIONS: -- cgit