Overview
| Comment: | Fixed weird asymmetry in build of tls.tcl.h, which was required for out-of-tree builds |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
05099e9a1ee3b05f060a4bb6a229ac41 |
| User & Date: | rkeene on 2016-12-13 16:11:17 |
| Other Links: | manifest | tags |
Context
|
2016-12-13
| ||
| 16:12 | Disable fastpath by default check-in: 7032f97f3d user: rkeene tags: trunk | |
| 16:11 | Fixed weird asymmetry in build of tls.tcl.h, which was required for out-of-tree builds check-in: 05099e9a1e user: rkeene tags: trunk | |
| 16:00 | Updated to return soft errors on during SSL negotiation retries on reads and hard errors on SSL negotiation during writes or handshake commands check-in: b9557ba691 user: rkeene tags: trunk | |
Changes
Modified Makefile.in from [f8ea5f6abc] to [d927180c14].
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 .. 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 .. 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 .. 75 76 77 78 79 80 81 82 83 |
LDFLAGS = @[email protected] @[email protected] LIBS = @[email protected] INSTALL = @[email protected] PACKAGE_VERSION = @[email protected] TCL_PACKAGE_PATH = @[email protected] PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tcltls$(PACKAGE_VERSION) VPATH = @[email protected] srcdir = @[email protected] all: @[email protected] # The shared object target [email protected]@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o [email protected]@ tls.o tlsBIO.o tlsIO.o tlsX509.o $(LIBS) ................................................................................ tlsBIO.o: @[email protected]/tlsBIO.c @[email protected]/tlsInt.h Makefile tlsIO.o: @[email protected]/tlsIO.c @[email protected]/tlsInt.h Makefile tlsX509.o: @[email protected]/tlsX509.c @[email protected]/tlsInt.h Makefile # Create a C-source-ified version of the script resources # for TclTLS so that we only need a single file to enable # this extension tls.tcl.h: $(srcdir)/tls.tcl od -A n -v -t xC < '$(srcdir)/tls.tcl' > tls.tcl.h.new.1 sed '[email protected] *@@g;[email protected]@0x&, @g' < tls.tcl.h.new.1 > tls.tcl.h.new.2 rm -f tls.tcl.h.new.1 mv tls.tcl.h.new.2 tls.tcl.h # Create default DH parameters dh_params.h: @[email protected]/gen_dh_params Makefile @[email protected]/gen_dh_params @[email protected] > dh_params.h.new ................................................................................ cd tests && @[email protected] all.tcl # Clean the local build directory for rebuild against the same configuration clean: rm -f tls.o tlsBIO.o tlsIO.o tlsX509.o rm -f [email protected]@ rm -f tcltls.a.new tcltls.a rm -f tls.tcl.h tls.tcl.h.new.1 tls.tcl.h.new.2 # Clean the local build directory back to what it was after unpacking the # distribution tarball distclean: clean rm -f config.log config.status rm -f dh_params.h.new dh_params.h rm -f Makefile pkgIndex.tcl ................................................................................ # Clean the local build directory back to only thing things that exist in # version control system mrproper: distclean rm -f @[email protected]/configure @[email protected]/config.sub @[email protected]/config.guess @[email protected]/install-sh rm -f @[email protected]/aclocal.m4 rm -rf @[email protected]/autom4te.cache .PHONY: all install clean distclean mrproper test |
< | | | > > |
6 7 8 9 10 11 12 13 14 15 16 17 18 19 .. 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 .. 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 .. 75 76 77 78 79 80 81 82 83 84 |
LDFLAGS = @[email protected] @[email protected] LIBS = @[email protected] INSTALL = @[email protected] PACKAGE_VERSION = @[email protected] TCL_PACKAGE_PATH = @[email protected] PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tcltls$(PACKAGE_VERSION) VPATH = @[email protected] all: @[email protected] # The shared object target [email protected]@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o [email protected]@ tls.o tlsBIO.o tlsIO.o tlsX509.o $(LIBS) ................................................................................ tlsBIO.o: @[email protected]/tlsBIO.c @[email protected]/tlsInt.h Makefile tlsIO.o: @[email protected]/tlsIO.c @[email protected]/tlsInt.h Makefile tlsX509.o: @[email protected]/tlsX509.c @[email protected]/tlsInt.h Makefile # Create a C-source-ified version of the script resources # for TclTLS so that we only need a single file to enable # this extension tls.tcl.h: @srcdir@/tls.tcl od -A n -v -t xC < '@srcdir@/tls.tcl' > tls.tcl.h.new.1 sed '[email protected] *@@g;[email protected]@0x&, @g' < tls.tcl.h.new.1 > tls.tcl.h.new.2 rm -f tls.tcl.h.new.1 mv tls.tcl.h.new.2 tls.tcl.h # Create default DH parameters dh_params.h: @[email protected]/gen_dh_params Makefile @[email protected]/gen_dh_params @[email protected] > dh_params.h.new ................................................................................ cd tests && @[email protected] all.tcl # Clean the local build directory for rebuild against the same configuration clean: rm -f tls.o tlsBIO.o tlsIO.o tlsX509.o rm -f [email protected]@ rm -f tcltls.a.new tcltls.a rm -f tls.tcl.h.new.1 tls.tcl.h.new.2 @if [ '@[email protected]' != '.' ]; then echo rm -f tls.tcl.h; rm -f tls.tcl.h; fi # Clean the local build directory back to what it was after unpacking the # distribution tarball distclean: clean rm -f config.log config.status rm -f dh_params.h.new dh_params.h rm -f Makefile pkgIndex.tcl ................................................................................ # Clean the local build directory back to only thing things that exist in # version control system mrproper: distclean rm -f @[email protected]/configure @[email protected]/config.sub @[email protected]/config.guess @[email protected]/install-sh rm -f @[email protected]/aclocal.m4 rm -rf @[email protected]/autom4te.cache rm -f @[email protected]/tls.tcl.h .PHONY: all install clean distclean mrproper test |
Modified build/post.sh from [f54d16cc5c] to [cb645c3205].
1 2 3 4 5 6 7 8 9 |
#! /usr/bin/env bash
set -e
rm -rf build
rm -f autogen.sh
make -f Makefile.in srcdir=. tls.tcl.h
exit 0
|
< |
1 2 3 4 5 6 7 8 |
#! /usr/bin/env bash set -e rm -rf build rm -f autogen.sh exit 0 |