diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-07-04 22:31:20 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-07-04 22:31:20 +0000 |
| commit | 16b7ea478da32bfc10b24a62208ce0f067c14794 (patch) | |
| tree | e964a4a3f595add72e93f75122974c6e268ae7b0 /editors | |
| parent | ethereal 0.9.5 (diff) | |
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 <jesse_gross@yahoo.com>
2) Alexander Kabaev <ak03@gte.com>
John Polstra <jdp@polstra.com>
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 14 | ||||
| -rw-r--r-- | editors/openoffice.org-1.0/Makefile | 14 | ||||
| -rw-r--r-- | editors/openoffice/Makefile | 14 |
3 files changed, 36 insertions, 6 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 5b066f3c22ee..cbefad374dc4 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/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: diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 5b066f3c22ee..cbefad374dc4 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/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: 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: |