48277ec915
This required a bit work to get working, compared to other versions. So,
some things have changed a bit more significantly.
Some highlights:
* there is no longer a pgen executable, seems this is now part of
libpython; let's see what this means for us in the future
* blake2 hash (from OpenSSL) detection needs some fixing; will upstream
added patch 002-fix-blake2-detection.patch
* removed all bpo patches; those should be fixed in upstream
* some needed to be manually re-applied as stuff changed:
- 001-enable-zlib.patch - file changed
- 004-do-not-write-bytes-codes.patch - file changed
- 015-abort-on-failed-modules.patch - variable was renamed
cross_compiling -> CROSS_COMPILING
* 017_lib2to3_fix_pyc_search.patch - the code changed, it does not seem to
have the original problem with respect to file-extension, as there
does not seem to be any special extension logic anymore there
* 006-remove-multi-arch-and-local-paths.patch - dropped patch; I can't
remember the full-details of this issue; it was something with
Debian/Ubuntu's multi-arch stuff; it was probably added maybe due to
some overzealous (on my part) thingy caused by some weird reports,
that I could never solve; let's have this patch dropped and see
* make package/python3/refresh to reduce fuzz for the rest
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
--- a/Makefile.pre.in
|
|
+++ b/Makefile.pre.in
|
|
@@ -735,6 +735,16 @@ regen-all: regen-opcode regen-opcode-tar
|
|
############################################################################
|
|
# Special rules for object files
|
|
|
|
+DATE_FMT = %b %d %Y
|
|
+TIME_FMT = %H:%M:%S
|
|
+ifdef SOURCE_DATE_EPOCH
|
|
+ BUILD_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)")
|
|
+ BUILD_TIME ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(TIME_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(TIME_FMT)" 2>/dev/null || date -u "+$(TIME_FMT)")
|
|
+else
|
|
+ BUILD_DATE ?= $(shell date "+$(DATE_FMT)")
|
|
+ BUILD_TIME ?= $(shell date "+$(TIME_FMT)")
|
|
+endif
|
|
+
|
|
Modules/getbuildinfo.o: $(PARSER_OBJS) \
|
|
$(OBJECT_OBJS) \
|
|
$(PYTHON_OBJS) \
|
|
@@ -743,6 +753,8 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
|
|
$(DTRACE_OBJS) \
|
|
$(srcdir)/Modules/getbuildinfo.c
|
|
$(CC) -c $(PY_CORE_CFLAGS) \
|
|
+ -DDATE="\"$(BUILD_DATE)\"" \
|
|
+ -DTIME="\"$(BUILD_TIME)\"" \
|
|
-DGITVERSION="\"`LC_ALL=C $(GITVERSION)`\"" \
|
|
-DGITTAG="\"`LC_ALL=C $(GITTAG)`\"" \
|
|
-DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \
|