1 From a568c15ab17ad86878c2260ff8d4f8f6c64924d5 Mon Sep 17 00:00:00 2001 2 From: Alex Wilson <alex.wilson@joyent.com> 3 Date: Wed, 5 Aug 2015 10:57:08 -0700 4 Subject: [PATCH 23/36] Hack around umac_ctx name-punning 5 6 OpenSSH builds the file umac.c twice, once as is, and once using 7 the preprocessor to rename everything to umac128_*. 8 9 Unfortunately, it does not rename the struct umac_ctx, which ends 10 up being used by both .o files to talk about completely different 11 structs (the preprocessor macros change its size). 12 13 This only matters if you care about DWARF/CTF type information, 14 which we do, so we add an extra -D to rename the struct in the 15 second build of umac.c. 16 --- 17 Makefile.in | 2 +- 18 1 file changed, 1 insertion(+), 1 deletion(-) 19 20 diff --git a/Makefile.in b/Makefile.in 21 index 0148742..66c4585 100644 22 --- a/Makefile.in 23 +++ b/Makefile.in 24 @@ -228,7 +228,7 @@ umac128.o: umac.c 25 $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $(srcdir)/umac.c \ 26 -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \ 27 -Dumac_update=umac128_update -Dumac_final=umac128_final \ 28 - -Dumac_delete=umac128_delete 29 + -Dumac_delete=umac128_delete -Dumac_ctx=umac128_ctx 30 31 # dtrace sftp 32 sftp_provider.h: $(srcdir)/sftp_provider.d 33 -- 34 2.5.4 (Apple Git-61) 35