From 57619bf57bb9ed8ca5b0cd764d2c549d0fe1be90 Mon Sep 17 00:00:00 2001 From: fgsch Date: Fri, 18 Jul 2003 17:53:19 +0000 Subject: [PATCH] make this compile on sparc64; report and help by marc@ --- security/pgp5/Makefile | 7 ++++++- .../pgp5/patches/gcc-patch-lib_pgp_hash_Makefile_in | 10 ++++++++++ .../pgp5/patches/patch-lib_pgp_include_pgpUsuals_h | 11 +++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 security/pgp5/patches/gcc-patch-lib_pgp_hash_Makefile_in create mode 100644 security/pgp5/patches/patch-lib_pgp_include_pgpUsuals_h diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile index fb0d7573663..57e9c30fced 100644 --- a/security/pgp5/Makefile +++ b/security/pgp5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2002/10/05 21:11:09 fgsch Exp $ +# $OpenBSD: Makefile,v 1.30 2003/07/18 17:53:19 fgsch Exp $ COMMENT= "Pretty Good Privacy 5.0i (world wide use)" @@ -34,6 +34,11 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/config WRKDIST= ${WRKDIR}/pgp50i/src +# XXX workaround gcc bugs on sparc64 +.if ${MACHINE_ARCH:Msparc64} +PATCH_LIST= patch-* gcc-* +.endif + post-patch: @mv ${WRKSRC}/man/pgp.1 ${WRKSRC}/man/pgp5.1 diff --git a/security/pgp5/patches/gcc-patch-lib_pgp_hash_Makefile_in b/security/pgp5/patches/gcc-patch-lib_pgp_hash_Makefile_in new file mode 100644 index 00000000000..0a77602b893 --- /dev/null +++ b/security/pgp5/patches/gcc-patch-lib_pgp_hash_Makefile_in @@ -0,0 +1,10 @@ +$OpenBSD: gcc-patch-lib_pgp_hash_Makefile_in,v 1.1 2003/07/18 17:53:19 fgsch Exp $ +--- lib/pgp/hash/Makefile.in.orig Fri Jul 18 12:01:53 2003 ++++ lib/pgp/hash/Makefile.in Fri Jul 18 12:02:23 2003 +@@ -10,3 +10,6 @@ OBJS= pgpHash.o pgpMD5.o pgpSHA.o pgpRIP + SHAREDHDRS= pgpHash.h + + all:: DONE ++ ++pgpSHA.o: ++ $(CC) $(CFLAGS) -O0 -c $< diff --git a/security/pgp5/patches/patch-lib_pgp_include_pgpUsuals_h b/security/pgp5/patches/patch-lib_pgp_include_pgpUsuals_h new file mode 100644 index 00000000000..c7e10d980f8 --- /dev/null +++ b/security/pgp5/patches/patch-lib_pgp_include_pgpUsuals_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-lib_pgp_include_pgpUsuals_h,v 1.1 2003/07/18 17:53:19 fgsch Exp $ +--- lib/pgp/include/pgpUsuals.h.orig Sat Aug 9 18:44:58 1997 ++++ lib/pgp/include/pgpUsuals.h Thu Jul 17 20:55:40 2003 +@@ -52,7 +52,6 @@ typedef long int32; + #if ULONG_MAX == 0xfffffffffffffffful + typedef ulong bnword64; + #define BNWORD64 bnword64 +-#define HAVE64 1 + #endif + #endif +