Fix nasty template-instantiation problem that, while it compiled,

prevented it from running.  The only fix (until FreeBSD goes elf)
is to build the executeable statically.  I really dislike that, but
it's a linker problem that's not likely to be fixed.

Much thanks to Victor Balden <victor@eng.uct.ac.za> for pointing
me at this bug.
This commit is contained in:
Chuck Robey 1998-05-20 02:17:20 +00:00
parent 81be7119fb
commit e032aff81a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=11073
4 changed files with 10 additions and 20 deletions

View file

@ -3,7 +3,7 @@
# Date created: 19 April 1998 # Date created: 19 April 1998
# Whom: chuckr@freebsd.org # Whom: chuckr@freebsd.org
# #
# $Id: Makefile,v 1.13 1998/05/05 20:37:57 chuckr Exp $ # $Id: Makefile,v 1.14 1998/05/15 18:44:53 chuckr Exp $
# #
DISTNAME= octave-2.0.12 DISTNAME= octave-2.0.12
@ -16,14 +16,15 @@ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_ENV= ${SETENV} "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_SCRIPT)" CONFIGURE_ENV= ${SETENV} "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_SCRIPT)"
CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX} --with-f2c --enable-shared --host=i386-unknown-freebsd CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX} --with-f2c --disable-shared --host=i386-unknown-freebsd
USE_GMAKE= yes USE_GMAKE= yes
MAN1= octave.1 MAN1= octave.1
BROKEN= "core dump problem on startup, working on it."
LIBOCTAVE-INFO= liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3 LIBOCTAVE-INFO= liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3
post-build:
/usr/bin/strip $(WRKSRC)/src/octave
post-install: post-install:
.ifndef NOPORTDOCS .ifndef NOPORTDOCS
install-info --defentry='* Octave: (octave). Interactive language for numerical computations.' $(WRKSRC)/doc/interpreter/octave.info $(PREFIX)/info/dir install-info --defentry='* Octave: (octave). Interactive language for numerical computations.' $(WRKSRC)/doc/interpreter/octave.info $(PREFIX)/info/dir
@ -43,6 +44,5 @@ post-install:
$(RM) -rf $(PREFIX)/libexec/octave/site/oct/i386-unknown-freebsd? $(RM) -rf $(PREFIX)/libexec/octave/site/oct/i386-unknown-freebsd?
$(RM) -rf $(PREFIX)/libexec/octave/site/exec/i386-unknown-freebsd? $(RM) -rf $(PREFIX)/libexec/octave/site/exec/i386-unknown-freebsd?
.endif .endif
${LDCONFIG} -m $(PREFIX)/lib
.include <bsd.port.mk> .include <bsd.port.mk>

View file

@ -4,13 +4,8 @@ include/octave-2.0.12/config.h
include/octave-2.0.12/f77-fcn.h include/octave-2.0.12/f77-fcn.h
include/octave-2.0.12/lo-error.h include/octave-2.0.12/lo-error.h
lib/libcruft.a lib/libcruft.a
lib/libcruft.so.2.0
lib/liboctave.a lib/liboctave.a
lib/liboctave.so.2.0
lib/liboctinterp.a lib/liboctinterp.a
lib/liboctinterp.so.2.0
@exec /sbin/ldconfig -m %B
@unexec /sbin/ldconfig -R %B
include/octave-2.0.12/Bounds.h include/octave-2.0.12/Bounds.h
include/octave-2.0.12/CollocWt.h include/octave-2.0.12/CollocWt.h
include/octave-2.0.12/DAE.h include/octave-2.0.12/DAE.h

View file

@ -3,7 +3,7 @@
# Date created: 19 April 1998 # Date created: 19 April 1998
# Whom: chuckr@freebsd.org # Whom: chuckr@freebsd.org
# #
# $Id: Makefile,v 1.13 1998/05/05 20:37:57 chuckr Exp $ # $Id: Makefile,v 1.14 1998/05/15 18:44:53 chuckr Exp $
# #
DISTNAME= octave-2.0.12 DISTNAME= octave-2.0.12
@ -16,14 +16,15 @@ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_ENV= ${SETENV} "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_SCRIPT)" CONFIGURE_ENV= ${SETENV} "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_SCRIPT)"
CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX} --with-f2c --enable-shared --host=i386-unknown-freebsd CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX} --with-f2c --disable-shared --host=i386-unknown-freebsd
USE_GMAKE= yes USE_GMAKE= yes
MAN1= octave.1 MAN1= octave.1
BROKEN= "core dump problem on startup, working on it."
LIBOCTAVE-INFO= liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3 LIBOCTAVE-INFO= liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3
post-build:
/usr/bin/strip $(WRKSRC)/src/octave
post-install: post-install:
.ifndef NOPORTDOCS .ifndef NOPORTDOCS
install-info --defentry='* Octave: (octave). Interactive language for numerical computations.' $(WRKSRC)/doc/interpreter/octave.info $(PREFIX)/info/dir install-info --defentry='* Octave: (octave). Interactive language for numerical computations.' $(WRKSRC)/doc/interpreter/octave.info $(PREFIX)/info/dir
@ -43,6 +44,5 @@ post-install:
$(RM) -rf $(PREFIX)/libexec/octave/site/oct/i386-unknown-freebsd? $(RM) -rf $(PREFIX)/libexec/octave/site/oct/i386-unknown-freebsd?
$(RM) -rf $(PREFIX)/libexec/octave/site/exec/i386-unknown-freebsd? $(RM) -rf $(PREFIX)/libexec/octave/site/exec/i386-unknown-freebsd?
.endif .endif
${LDCONFIG} -m $(PREFIX)/lib
.include <bsd.port.mk> .include <bsd.port.mk>

View file

@ -4,13 +4,8 @@ include/octave-2.0.12/config.h
include/octave-2.0.12/f77-fcn.h include/octave-2.0.12/f77-fcn.h
include/octave-2.0.12/lo-error.h include/octave-2.0.12/lo-error.h
lib/libcruft.a lib/libcruft.a
lib/libcruft.so.2.0
lib/liboctave.a lib/liboctave.a
lib/liboctave.so.2.0
lib/liboctinterp.a lib/liboctinterp.a
lib/liboctinterp.so.2.0
@exec /sbin/ldconfig -m %B
@unexec /sbin/ldconfig -R %B
include/octave-2.0.12/Bounds.h include/octave-2.0.12/Bounds.h
include/octave-2.0.12/CollocWt.h include/octave-2.0.12/CollocWt.h
include/octave-2.0.12/DAE.h include/octave-2.0.12/DAE.h