Tcl Nano
Check-in [a8c730ce43]
Login
HomeTimelineDownloadsBrowse SourceSearchTickets
Overview
Comment:Improved work on static linking
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a8c730ce436e49c1fb0ab1a9647b5fc8d3c5066476f563360e28564dcc003854
User & Date: rkeene on 2018-07-02 07:36:53
Other Links: manifest | tags
Context
2018-07-02
11:29
Support using a different sized hash result from BLAKE2b check-in: 5b9fcbfff6 user: rkeene tags: trunk
07:36
Improved work on static linking check-in: a8c730ce43 user: rkeene tags: trunk
07:22
A bit more cleanup check-in: 795a02cd06 user: rkeene tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified Makefile.in from [b3643d35be] to [6e94ddc971]. 

1


2
3
4
5
6
7
8
9
10

11
12
13

14
15
16
17
18
19



20
21



22
23
24
25
26
27
28

1
2
3
4
5
6
7
8
9
10
11

12
13

14
15
16
17
18
19


20
21
22
23
24
25
26
27
28
29
30
31
32
33
34


+
+








-
+

-

+




-
-
+
+
+


+
+
+








CC            := @CC@
AR            := @AR@
RANLIB        := @RANLIB@
CFLAGS        := @CFLAGS@ @SHOBJFLAGS@
CPPFLAGS      := -I. -I@srcdir@/tweetnacl/ -I@srcdir@/blake2b/ -DNACL_ED25519_BLAKE2B=1 @CPPFLAGS@ @SHOBJCPPFLAGS@ @DEFS@
LDFLAGS       := @LDFLAGS@
LIBS          := @LIBS@
SHOBJLDFLAGS  := @SHOBJLDFLAGS@
srcdir        := @srcdir@
export CC CFLAGS CPPFLAGS

all: @EXTENSION_TARGET@
all: @EXTENSION_TARGET@ pkgIndex.tcl

ifeq (@TCLEXT_BUILD@,shared)
@EXTENSION_TARGET@: tweetnacl.o blake2b.o nano.o Makefile
ifeq (@TCLEXT_BUILD@,shared)
	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o @EXTENSION_TARGET@ nano.o tweetnacl.o blake2b.o $(LIBS)
	-@WEAKENSYMS@ @EXTENSION_TARGET@
	-@REMOVESYMS@ @EXTENSION_TARGET@
else
@EXTENSION_TARGET@: tweetnacl.o blake2b.o nano.o Makefile
	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o @EXTENSION_TARGET@ nano.o tweetnacl.o blake2b.o $(LIBS)
	rm -f @EXTENSION_TARGET@
	$(AR) rc @EXTENSION_TARGET@ nano.o blake2b.o tweetnacl.o
	-$(RANLIB) @EXTENSION_TARGET@
endif

pkgIndex.tcl: pkgIndex.tcl-@TCLEXT_BUILD@
	cp pkgIndex.tcl-@TCLEXT_BUILD@ pkgIndex.tcl

nano.o: @srcdir@/nano.c @srcdir@/tweetnacl/tweetnacl.h @srcdir@/blake2b/blake2.h nano.tcl.h Makefile
	$(CC) $(CPPFLAGS) $(CFLAGS) -o nano.o -c @srcdir@/nano.c

nano.tcl.h: @srcdir@/nano.tcl Makefile
	od -A n -v -t xC < '@srcdir@/nano.tcl' > nano.tcl.h.new.1
	sed 's@  *@@g;s@..@0x&, @g' < nano.tcl.h.new.1 > nano.tcl.h.new.2
	rm -f nano.tcl.h.new.1
︙
38
39
40
41
42
43
44


45
46


47
48
49
50
51
52
53

44
45
46
47
48
49
50
51
52


53
54
55
56
57
58
59
60
61








+
+
-
-
+
+








	@srcdir@/build/test/test.tcl

clean:
	rm -f @EXTENSION_TARGET@ nano.o
	rm -f blake2b.o tweetnacl.o

distclean: clean
	rm -f Makefile pkgIndex.tcl-shared pkgIndex.tcl-static nano.syms
	rm -f pkgIndex.tcl
	rm -f Makefile pkgIndex.tcl config.log config.status nano.syms
	rm -f nano.tcl.h
	rm -f config.log config.status
	rm -f nano.tcl.h nano.tcl.h.new.1 nano.tcl.h.new.2

mrproper: distclean
	rm -f configure aclocal.m4 config.guess config.sub install-sh
	rm -rf tweetnacl blake2b
	rm -rf build/tweetnacl/out build/blake2b/out

.PHONY: all test clean distclean mrproper

Modified configure.ac from [960aff5fc5] to [f696851fb3].

︙
75
76
77
78
79
80
81
82


75
76
77
78
79
80
81

82








-
+

DC_SETUP_STABLE_API([${srcdir}/nano.vers], nano.syms)
if test "$tcl_nano_debug" = 'true'; then
	WEAKENSYMS=':'
	REMOVESYMS=':'
fi

dnl Produce output
AC_OUTPUT(Makefile pkgIndex.tcl nano.syms)
AC_OUTPUT(Makefile pkgIndex.tcl-${TCLEXT_BUILD} nano.syms)

Renamed and modified pkgIndex.tcl.in [3e4b7e87f5] to pkgIndex.tcl-shared.in [ff89211977]. 

1



1

-
+

package ifneeded nano @PACKAGE_VERSION@ [list load [file join $dir nano.so]]
package ifneeded nano @PACKAGE_VERSION@ [list load [file join $dir @EXTENSION_TARGET@]]

Added pkgIndex.tcl-static.in version [5d0acdb8ab]. 



1

+

package ifneeded nano @PACKAGE_VERSION@ [list load {} Nano]

Powered by Fossil · RSS