Skip to content

Commit 3695f5d

Browse files
msprotzmsprotz
committed
Simplify HACL* build
1 parent c4722cd commit 3695f5d

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

‎Makefile.pre.in

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ ENSUREPIP= @ENSUREPIP@
216216
# Internal static libraries
217217
LIBMPDEC_A= Modules/_decimal/libmpdec/libmpdec.a
218218
LIBEXPAT_A= Modules/expat/libexpat.a
219-
LIBHACL_SHA2_A= Modules/_hacl/libHacl_Hash_SHA2.a
220219

221220
# Module state, compiler flags and linker flags
222221
# Empty CFLAGS and LDFLAGS are omitted.
@@ -636,9 +635,6 @@ LIBEXPAT_HEADERS= \
636635
##########################################################################
637636
# hashlib's HACL* library
638637

639-
LIBHACL_SHA2_OBJS= \
640-
Modules/_hacl/Hacl_Hash_SHA2.o
641-
642638
LIBHACL_HEADERS= \
643639
Modules/_hacl/include/krml/FStar_UInt128_Verified.h \
644640
Modules/_hacl/include/krml/FStar_UInt_8_16_32_64.h \
@@ -649,11 +645,6 @@ LIBHACL_HEADERS= \
649645
Modules/_hacl/Hacl_Streaming_Types.h \
650646
Modules/_hacl/python_hacl_namespaces.h
651647

652-
LIBHACL_SHA2_HEADERS= \
653-
Modules/_hacl/Hacl_Hash_SHA2.h \
654-
Modules/_hacl/internal/Hacl_Hash_SHA2.h \
655-
$(LIBHACL_HEADERS)
656-
657648
#########################################################################
658649
# Rules
659650

@@ -1321,16 +1312,6 @@ $(LIBEXPAT_A): $(LIBEXPAT_OBJS)
13211312
-rm -f $@
13221313
$(AR) $(ARFLAGS) $@ $(LIBEXPAT_OBJS)
13231314

1324-
##########################################################################
1325-
# Build HACL* static libraries for hashlib: libHacl_Hash_SHA2.a
1326-
LIBHACL_CFLAGS=-I$(srcdir)/Modules/_hacl/include -D_BSD_SOURCE -D_DEFAULT_SOURCE $(PY_STDMODULE_CFLAGS) $(CCSHARED)
1327-
1328-
Modules/_hacl/Hacl_Hash_SHA2.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c $(LIBHACL_SHA2_HEADERS)
1329-
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c
1330-
1331-
$(LIBHACL_SHA2_A): $(LIBHACL_SHA2_OBJS)
1332-
-rm -f $@
1333-
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA2_OBJS)
13341315

13351316
# create relative links from build/lib.platform/egg.so to Modules/egg.so
13361317
# pybuilddir.txt is created too late. We cannot use it in Makefile
@@ -3107,10 +3088,10 @@ MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h @LIBMPDEC_INTERNAL@
31073088
MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c @LIBEXPAT_INTERNAL@
31083089
MODULE__HASHLIB_DEPS=$(srcdir)/Modules/hashlib.h
31093090
MODULE__IO_DEPS=$(srcdir)/Modules/_io/_iomodule.h
3110-
MODULE__MD5_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HEADERS) Modules/_hacl/Hacl_Hash_MD5.h Modules/_hacl/Hacl_Hash_MD5.c
3111-
MODULE__SHA1_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HEADERS) Modules/_hacl/Hacl_Hash_SHA1.h Modules/_hacl/Hacl_Hash_SHA1.c
3112-
MODULE__SHA2_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_SHA2_HEADERS) $(LIBHACL_SHA2_A)
3113-
MODULE__SHA3_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HEADERS) Modules/_hacl/Hacl_Hash_SHA3.h Modules/_hacl/Hacl_Hash_SHA3.c
3091+
MODULE__MD5_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HEADERS) Modules/_hacl/Hacl_Hash_MD5.h Modules/_hacl/internal/Hacl_Hash_MD5.h Modules/_hacl/Hacl_Hash_MD5.c
3092+
MODULE__SHA1_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HEADERS) Modules/_hacl/Hacl_Hash_SHA1.h Modules/_hacl/internal/Hacl_Hash_SHA1.h Modules/_hacl/Hacl_Hash_SHA1.c
3093+
MODULE__SHA2_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HEADERS) Modules/_hacl/Hacl_Hash_SHA2.h Modules/_hacl/internal/Hacl_Hash_SHA2.h Modules/_hacl/Hacl_Hash_SHA2.c
3094+
MODULE__SHA3_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HEADERS) Modules/_hacl/Hacl_Hash_SHA3.h Modules/_hacl/internal/Hacl_Hash_SHA3.h Modules/_hacl/Hacl_Hash_SHA3.c
31143095
MODULE__SOCKET_DEPS=$(srcdir)/Modules/socketmodule.h $(srcdir)/Modules/addrinfo.h $(srcdir)/Modules/getaddrinfo.c $(srcdir)/Modules/getnameinfo.c
31153096
MODULE__SSL_DEPS=$(srcdir)/Modules/_ssl.h $(srcdir)/Modules/_ssl/cert.c $(srcdir)/Modules/_ssl/debughelpers.c $(srcdir)/Modules/_ssl/misc.c $(srcdir)/Modules/_ssl_data_111.h $(srcdir)/Modules/_ssl_data_300.h $(srcdir)/Modules/socketmodule.h
31163097
MODULE__TESTCAPI_DEPS=$(srcdir)/Modules/_testcapi/parts.h $(srcdir)/Modules/_testcapi/util.h

‎Modules/Setup.stdlib.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
# hashing builtins, can be disabled with --without-builtin-hashlib-hashes
8282
@MODULE__MD5_TRUE@_md5 md5module.c -I$(srcdir)/Modules/_hacl/include _hacl/Hacl_Hash_MD5.c -D_BSD_SOURCE -D_DEFAULT_SOURCE
8383
@MODULE__SHA1_TRUE@_sha1 sha1module.c -I$(srcdir)/Modules/_hacl/include _hacl/Hacl_Hash_SHA1.c -D_BSD_SOURCE -D_DEFAULT_SOURCE
84-
@MODULE__SHA2_TRUE@_sha2 sha2module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Hash_SHA2.a
84+
@MODULE__SHA2_TRUE@_sha2 sha2module.c -I$(srcdir)/Modules/_hacl/include _hacl/Hacl_Hash_SHA2.c -D_BSD_SOURCE -D_DEFAULT_SOURCE
8585
@MODULE__SHA3_TRUE@_sha3 sha3module.c -I$(srcdir)/Modules/_hacl/include _hacl/Hacl_Hash_SHA3.c -D_BSD_SOURCE -D_DEFAULT_SOURCE
8686
@MODULE__BLAKE2_TRUE@_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
8787

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy