From ba71248fc7a6da7cee2b1284907dd872e12bc9f5 Mon Sep 17 00:00:00 2001 From: fgsch Date: Sat, 5 Oct 2002 19:41:17 +0000 Subject: [PATCH] more workarounds for sha1.c on sparc64; this works fine now. --- net/silc-client/Makefile | 11 ++++------- .../patches/gcc-patch-lib_silcsim_Makefile_in | 13 +++++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 net/silc-client/patches/gcc-patch-lib_silcsim_Makefile_in diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile index 71831a0e2a1..d29c70f7686 100644 --- a/net/silc-client/Makefile +++ b/net/silc-client/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2002/10/04 13:22:25 brad Exp $ +# $OpenBSD: Makefile,v 1.14 2002/10/05 19:41:17 fgsch Exp $ COMMENT= "Secure Live Internet Conferencing (SILC) client" @@ -28,13 +28,10 @@ USE_LIBTOOL= yes MODULES= iconv -.if ${MACHINE_ARCH:Msparc64} -BROKEN= "compiler bug" -.endif # XXX workaround gcc bugs on sparc64 -#.if ${MACHINE_ARCH:Msparc64} -#PATCH_LIST= gcc-* patch-* -#.endif +.if ${MACHINE_ARCH:Msparc64} +PATCH_LIST= gcc-* patch-* +.endif CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ diff --git a/net/silc-client/patches/gcc-patch-lib_silcsim_Makefile_in b/net/silc-client/patches/gcc-patch-lib_silcsim_Makefile_in new file mode 100644 index 00000000000..f67f5733f77 --- /dev/null +++ b/net/silc-client/patches/gcc-patch-lib_silcsim_Makefile_in @@ -0,0 +1,13 @@ +$OpenBSD: gcc-patch-lib_silcsim_Makefile_in,v 1.1 2002/10/05 19:41:17 fgsch Exp $ +--- lib/silcsim/Makefile.in.orig Sat Sep 7 14:04:47 2002 ++++ lib/silcsim/Makefile.in Sat Oct 5 07:59:27 2002 +@@ -440,6 +440,9 @@ uninstall-am: uninstall-includeHEADERS u + + @SILC_SIM_TRUE@all: $(SIM_CIPHER_OBJS) $(SIM_HASH_OBJS) + ++sha1.o: ++ $(LTCOMPILE) -O0 -c $(srcdir)/../silccrypt/$*.c ++ + $(SIM_CIPHER_OBJS): ../silccrypt/libsilccrypt.a + $(LTCOMPILE) -c $(srcdir)/../silccrypt/$*.c + $(LIBTOOL) --mode=link $(LINK) -rpath $(silc_modulesdir) -o lib$*.la $*.lo