From c123e579b2d55025407651b2a178ad7d9558228e Mon Sep 17 00:00:00 2001 From: Wayne Scott Date: Tue, 23 Aug 2016 14:03:26 +0000 Subject: [PATCH] BitKeeper: fix tommath build in tcl The include order in Tcl was incorrect when tommath.h is included in the system libraires. The fake tommath.h in tcl/generic must be found before the real tommath.h --- bitkeeper/distinfo | 1 + bitkeeper/patches/patch-tcl-include-order | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 bitkeeper/patches/patch-tcl-include-order diff --git a/bitkeeper/distinfo b/bitkeeper/distinfo index b9539137640..9ff5d44ef00 100644 --- a/bitkeeper/distinfo +++ b/bitkeeper/distinfo @@ -5,3 +5,4 @@ RMD160 (bk-7.3ce.src.tar.gz) = 6573ddcaef75dfa5b0c8578cbb3525754c351825 SHA512 (bk-7.3ce.src.tar.gz) = 671828afe094a2c834f70ea2e70070eec823e6c67e0e3eaa84fb7f7259caf026764194c04356ba5b6439f3813124a20eed7fc283f82de324b587c3bf779a8678 Size (bk-7.3ce.src.tar.gz) = 20257094 bytes SHA1 (patch-Ldoc-install) = f7d8f10d501240f08f7a27d058a700ce5b09a6d6 +SHA1 (patch-tcl-include-order) = 074cf665bf1e3d58958c83df10c84de33b8f16f4 diff --git a/bitkeeper/patches/patch-tcl-include-order b/bitkeeper/patches/patch-tcl-include-order new file mode 100644 index 00000000000..4f1d6751ab2 --- /dev/null +++ b/bitkeeper/patches/patch-tcl-include-order @@ -0,0 +1,16 @@ +$NetBSD$ + +Must see Tcl's tommath.h before the system version + +--- src/gui/tcltk/tcl/unix/Makefile.in.orig 2016-07-08 12:09:37 -04:00 ++++ src/gui/tcltk/tcl/unix/Makefile.in +@@ -107,7 +107,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ + #CFLAGS = $(CFLAGS_DEBUG) + #CFLAGS = $(CFLAGS_OPTIMIZE) + #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) +-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ ++CFLAGS = -I${GENERIC_DIR} @CFLAGS_DEFAULT@ @CFLAGS@ + + # Flags to pass to the linker + LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ +