From owner-freebsd-ports@FreeBSD.ORG Sat Dec 4 09:50:31 2004 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3890F16A4CE for ; Sat, 4 Dec 2004 09:50:31 +0000 (GMT) Received: from smtp-vbr14.xs4all.nl (smtp-vbr14.xs4all.nl [194.109.24.34]) by mx1.FreeBSD.org (Postfix) with ESMTP id 638BF43D60 for ; Sat, 4 Dec 2004 09:50:30 +0000 (GMT) (envelope-from rsmith@xs4all.nl) Received: from slackbox.xs4all.nl (slackbox.xs4all.nl [213.84.242.160]) by smtp-vbr14.xs4all.nl (8.12.11/8.12.11) with ESMTP id iB49oSie026053 for ; Sat, 4 Dec 2004 10:50:29 +0100 (CET) (envelope-from rsmith@xs4all.nl) Received: by slackbox.xs4all.nl (Postfix, from userid 1001) id 3A407635E; Sat, 4 Dec 2004 10:50:44 +0100 (CET) Date: Sat, 4 Dec 2004 10:50:44 +0100 From: Roland Smith To: ports@FreeBSD.org Message-ID: <20041204095044.GA28227@slackbox.xs4all.nl> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="QKdGvSO+nmPlgiQ/" Content-Disposition: inline User-Agent: Mutt/1.4.2.1i X-GPG-Fingerprint: 1A2B 477F 9970 BA3C 2914 B7CE 1277 EFB0 C321 A725 Organization: Me, organized? X-Virus-Scanned: by XS4ALL Virus Scanner Subject: fix for math/octave on AMD64. X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2004 09:50:31 -0000 --QKdGvSO+nmPlgiQ/ Content-Type: multipart/mixed; boundary="7JfCtLOvnd9MIVvH" Content-Disposition: inline --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The attached patch allows octave to build on the amd64 platform. Basically, on amd64 octave is compiled with --disable-shared. Roland --=20 R.F. Smith /"\ ASCII Ribbon Campaign r s m i t h @ x s 4 a l l . n l \ / No HTML/RTF in email http://www.xs4all.nl/~rsmith/ X No Word docs in email / \ Respect for open standards --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="octave-mak.patch" Content-Transfer-Encoding: quoted-printable --- Makefile.orig Fri Dec 3 20:36:40 2004 +++ Makefile Sat Dec 4 10:43:13 2004 @@ -23,10 +23,6 @@ =20 .include =20 -.if ${ARCH} =3D=3D "amd64" -BROKEN=3D "Does not build on amd64 (Shared libraries must be compiled wit= h -fPIC)" -.endif - .if ${PORTOBJFORMAT} =3D=3D "elf" GNU_HOST=3D ${ARCH}-portbld-freebsd${OSREL} .else @@ -38,11 +34,16 @@ BLAS_LIBS=3D "-L${LOCALBASE}/lib -lf77blas -lcblas -latlas" USE_GMAKE=3D yes GNU_CONFIGURE=3D yes -USE_REINPLACE=3D yes =20 -CONFIGURE_ARGS=3D --host=3D${GNU_HOST} \ - --with-fftw --with-blas=3D${BLAS_LIBS} --with-lapack=3D-lalapack \ - --enable-shared +CONIGURE_ARGS=3D --host=3D${GNU_HOST} \ + --with-fftw --with-blas=3D${BLAS_LIBS} --with-lapack=3D-lalapack +.if ${ARCH} =3D=3D "amd64" +CONFIGURE_ARGS+=3D --disable-shared +.else +CONFIGURE_ARGS+=3D --enable-shared +USE_REINPLACE=3D yes +.endif + CONFIGURE_ENV=3D CFLAGS=3D"${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS=3D"${LDFLAGS} -L${LOCALBASE}/lib" \ CPPFLAGS=3D"${CPPFLAGS} -I${LOCALBASE}/include" \ @@ -62,12 +63,14 @@ @${RM} -f ${WRKSRC}/doc/interpreter/octave.info* @${RM} -f ${WRKSRC}/doc/liboctave/liboctave.info* post-install: +.if ${ARCH} !=3D "amd64" ${RM} ${PREFIX}/bin/octave @${CP} ${FILESDIR}/octave ${WRKDIR} @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g ; \ s,%%OCTAVE_VERSION%%,${OCTAVE_VERSION},g' \ ${WRKDIR}/octave ${INSTALL_SCRIPT} ${WRKDIR}/octave ${PREFIX}/bin +.endif ${INSTALL_DATA} ${WRKSRC}/doc/liboctave/liboctave.info ${PREFIX}/info install-info --entry=3D'* Octave: (octave). Interactive language for nume= rical computations.' $(PREFIX)/info/octave.info $(PREFIX)/info/dir install-info --entry=3D'* LibOctave: (liboctave). C++ class library for O= ctave.' $(PREFIX)/info/liboctave.info $(PREFIX)/info/dir --7JfCtLOvnd9MIVvH-- --QKdGvSO+nmPlgiQ/ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBsYh0EnfvsMMhpyURAtbQAJ45HKmJ1vqsS3Q5EMjs/AJIrTMTOwCgg8wn +ZT7PxtUP+nUH+4fTW5ZXfU= =IT94 -----END PGP SIGNATURE----- --QKdGvSO+nmPlgiQ/--