Skip to content

Commit

Permalink
BitKeeper: fix tommath build in tcl
Browse files Browse the repository at this point in the history
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
  • Loading branch information
wscott committed Aug 23, 2016
1 parent 4e5728b commit c123e57
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions bitkeeper/distinfo
Expand Up @@ -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
16 changes: 16 additions & 0 deletions 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@

0 comments on commit c123e57

Please sign in to comment.