Date: Mon, 12 Mar 2001 04:27:51 -0800 From: Kris Kennaway <kris@obsecurity.org> To: current@FreeBSD.org Subject: Fix for OpenSSL -j build Message-ID: <20010312042751.A86103@mollari.cthul.hu>
next in thread | raw e-mail | index | archive | help
--a8Wt8u1KmwUX3Y2C
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Can everyone please test this patch against OpenSSL, which should fix
the problems observed with -j builds as well as cleaning out the
temporary ASM files.
This fix will need to be committed to -stable prior to the release, as
it shares the same code.
Kris
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /mnt/ncvs/src/secure/lib/libcrypto/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile 2001/03/08 07:57:49 1.36
+++ Makefile 2001/03/12 10:30:15
@@ -380,16 +380,12 @@
.include <bsd.lib.mk>
=20
.if !defined(NOPERL) && ${MACHINE_ARCH} =3D=3D "i386"
-.SUFFIXES: .o .pl
-.SUFFIXES: .po .pl
-.SUFFIXES: .So .pl
-.pl.o:
- perl -I${PERLPATH} $(.ALLSRC) elf ${CPUTYPE:Mi386:S/i//} > $(.PREFIX).pl.=
s ; ${AS} ${AFLAGS} $(.PREFIX).pl.s -o $(.TARGET)
+CLEANFILES+=3D ${SRCS:M*.pl:S/.pl$/.cmt/} ${SRCS:M*.pl:S/.pl$/.s/}
+.SUFFIXES: .pl .cmt
+.pl.cmt:
+ perl -I${PERLPATH} ${.ALLSRC} elf ${CPUTYPE:Mi386:S/i//} > ${.TARGET}
=20
-.pl.po:
- perl -I${PERLPATH} $(.ALLSRC) elf ${CPUTYPE:Mi386:S/i//} > $(.PREFIX).pl.=
s ; ${AS} ${AFLAGS} $(.PREFIX).pl.s -o $(.TARGET)
-
-.pl.So:
- perl -I${PERLPATH} $(.ALLSRC) elf ${CPUTYPE:Mi386:S/i//} > $(.PREFIX).pl.=
s ; ${AS} ${AFLAGS} $(.PREFIX).pl.s -o $(.TARGET)
+.cmt.s:
+ tr -d "'" < ${.ALLSRC} > ${.TARGET}
.endif
=20
--a8Wt8u1KmwUX3Y2C
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.4 (FreeBSD)
Comment: For info see http://www.gnupg.org
iD8DBQE6rMDHWry0BWjoQKURAmMPAJ9et/JaigwVpF9gI3eXdmVuesN4cgCdGnRP
VyjfpGqPsw/gEV9wkyLuOPs=
=wA22
-----END PGP SIGNATURE-----
--a8Wt8u1KmwUX3Y2C--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010312042751.A86103>