Skip to content

Commit 7b5c6f6

Browse files
nategraff-sifivenategraff-sifive
authored
Merge pull request #16 from sifive/py-compile-importlib
Fix deprecated imp module use in py-compile script during build
2 parents 136c7b9 + 691c11b commit 7b5c6f6

File tree

8 files changed

+1919
-1731
lines changed

8 files changed

+1919
-1731
lines changed

‎Makefile.in

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.15 from Makefile.am.
1+
# Makefile.in generated by automake 1.16.2 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -154,7 +154,7 @@ am__can_run_installinfo = \
154154
esac
155155
am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
156156
am__pep3147_tweak = \
157-
sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|'
157+
sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc __pycache__/&.*.pyo|'
158158
py_compile = $(top_srcdir)/py-compile
159159
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
160160
am__DIST_COMMON = $(srcdir)/Makefile.in config.guess config.sub \
@@ -301,8 +301,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
301301
echo ' $(SHELL) ./config.status'; \
302302
$(SHELL) ./config.status;; \
303303
*) \
304-
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
305-
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
304+
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
305+
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
306306
esac;
307307

308308
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -381,20 +381,15 @@ uninstall-pythonPYTHON:
381381
dir='$(DESTDIR)$(pythondir)'; \
382382
pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \
383383
pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \
384-
py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \
385-
echo "$$py_files_pep3147";\
386-
pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \
387-
pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \
388384
st=0; \
389-
for files in \
390-
"$$py_files" \
391-
"$$pyc_files" \
392-
"$$pyo_files" \
393-
"$$pyc_files_pep3147" \
394-
"$$pyo_files_pep3147" \
395-
; do \
385+
for files in "$$py_files" "$$pyc_files" "$$pyo_files"; do \
396386
$(am__uninstall_files_from_dir) || st=$$?; \
397387
done; \
388+
dir='$(DESTDIR)$(pythondir)'; \
389+
echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \
390+
while read files; do \
391+
$(am__uninstall_files_from_dir) || st=$$?; \
392+
done || exit $$?; \
398393
exit $$st
399394
tags TAGS:
400395

@@ -403,7 +398,10 @@ ctags CTAGS:
403398
cscope cscopelist:
404399

405400

406-
distdir: $(DISTFILES)
401+
distdir: $(BUILT_SOURCES)
402+
$(MAKE) $(AM_MAKEFLAGS) distdir-am
403+
404+
distdir-am: $(DISTFILES)
407405
$(am__remove_distdir)
408406
test -d "$(distdir)" || mkdir "$(distdir)"
409407
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -443,7 +441,7 @@ distdir: $(DISTFILES)
443441
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
444442
|| chmod -R a+r "$(distdir)"
445443
dist-gzip: distdir
446-
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
444+
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
447445
$(am__post_remove_distdir)
448446

449447
dist-bzip2: distdir
@@ -458,6 +456,10 @@ dist-xz: distdir
458456
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
459457
$(am__post_remove_distdir)
460458

459+
dist-zstd: distdir
460+
tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
461+
$(am__post_remove_distdir)
462+
461463
dist-tarZ: distdir
462464
@echo WARNING: "Support for distribution archives compressed with" \
463465
"legacy program 'compress' is deprecated." >&2
@@ -469,7 +471,7 @@ dist-shar: distdir
469471
@echo WARNING: "Support for shar distribution archives is" \
470472
"deprecated." >&2
471473
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
472-
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
474+
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
473475
$(am__post_remove_distdir)
474476

475477
dist-zip: distdir
@@ -487,7 +489,7 @@ dist dist-all:
487489
distcheck: dist
488490
case '$(DIST_ARCHIVES)' in \
489491
*.tar.gz*) \
490-
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
492+
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
491493
*.tar.bz2*) \
492494
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
493495
*.tar.lz*) \
@@ -497,9 +499,11 @@ distcheck: dist
497499
*.tar.Z*) \
498500
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
499501
*.shar.gz*) \
500-
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
502+
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
501503
*.zip*) \
502504
unzip $(distdir).zip ;;\
505+
*.tar.zst*) \
506+
zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
503507
esac
504508
chmod -R a-w $(distdir)
505509
chmod u+w $(distdir)
@@ -677,9 +681,9 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pythonPYTHON
677681
.PHONY: all all-am am--refresh check check-am clean clean-generic \
678682
clean-local cscopelist-am ctags-am dist dist-all dist-bzip2 \
679683
dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
680-
distcheck distclean distclean-generic distcleancheck distdir \
681-
distuninstallcheck dvi dvi-am html html-am info info-am \
682-
install install-am install-binSCRIPTS install-data \
684+
dist-zstd distcheck distclean distclean-generic distcleancheck \
685+
distdir distuninstallcheck dvi dvi-am html html-am info \
686+
info-am install install-am install-binSCRIPTS install-data \
683687
install-data-am install-dvi install-dvi-am install-exec \
684688
install-exec-am install-html install-html-am install-info \
685689
install-info-am install-man install-pdf install-pdf-am \

‎aclocal.m4

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# generated automatically by aclocal 1.15 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
22

3-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
3+
# Copyright (C) 1996-2020 Free Software Foundation, Inc.
44

55
# This file is free software; the Free Software Foundation
66
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
2020
If you have problems, you may need to regenerate the build system entirely.
2121
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
2222

23-
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
23+
# Copyright (C) 2002-2020 Free Software Foundation, Inc.
2424
#
2525
# This file is free software; the Free Software Foundation
2626
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
3232
# generated from the m4 files accompanying Automake X.Y.
3333
# (This private macro should not be called outside this file.)
3434
AC_DEFUN([AM_AUTOMAKE_VERSION],
35-
[am__api_version='1.15'
35+
[am__api_version='1.16'
3636
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
3737
dnl require some minimum version. Point them to the right macro.
38-
m4_if([$1], [1.15], [],
38+
m4_if([$1], [1.16.2], [],
3939
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
4040
])
4141

@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
5151
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
5252
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
5353
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54-
[AM_AUTOMAKE_VERSION([1.15])dnl
54+
[AM_AUTOMAKE_VERSION([1.16.2])dnl
5555
m4_ifndef([AC_AUTOCONF_VERSION],
5656
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
5757
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
5858

5959
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
6060

61-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
61+
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
6262
#
6363
# This file is free software; the Free Software Foundation
6464
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
110110

111111
# AM_CONDITIONAL -*- Autoconf -*-
112112

113-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
113+
# Copyright (C) 1997-2020 Free Software Foundation, Inc.
114114
#
115115
# This file is free software; the Free Software Foundation
116116
# gives unlimited permission to copy and/or distribute it,
@@ -143,7 +143,7 @@ fi])])
143143

144144
# Do all the work for Automake. -*- Autoconf -*-
145145

146-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
146+
# Copyright (C) 1996-2020 Free Software Foundation, Inc.
147147
#
148148
# This file is free software; the Free Software Foundation
149149
# gives unlimited permission to copy and/or distribute it,
@@ -230,8 +230,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
230230
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
231231
# For better backward compatibility. To be removed once Automake 1.9.x
232232
# dies out for good. For more background, see:
233-
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
234-
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
233+
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
234+
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
235235
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
236236
# We need awk for the "check" target (and possibly the TAP driver). The
237237
# system "awk" is bad on some platforms.
@@ -298,7 +298,7 @@ END
298298
Aborting the configuration process, to ensure you take notice of the issue.
299299
300300
You can download and install GNU coreutils to get an 'rm' implementation
301-
that behaves properly: <http://www.gnu.org/software/coreutils/>.
301+
that behaves properly: <https://www.gnu.org/software/coreutils/>.
302302
303303
If you want to complete the configuration process using your problematic
304304
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -340,7 +340,7 @@ for _am_header in $config_headers :; do
340340
done
341341
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
342342

343-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
343+
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
344344
#
345345
# This file is free software; the Free Software Foundation
346346
# gives unlimited permission to copy and/or distribute it,
@@ -361,7 +361,7 @@ if test x"${install_sh+set}" != xset; then
361361
fi
362362
AC_SUBST([install_sh])])
363363

364-
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
364+
# Copyright (C) 2003-2020 Free Software Foundation, Inc.
365365
#
366366
# This file is free software; the Free Software Foundation
367367
# gives unlimited permission to copy and/or distribute it,
@@ -383,7 +383,7 @@ AC_SUBST([am__leading_dot])])
383383
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
384384
# From Jim Meyering
385385

386-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
386+
# Copyright (C) 1996-2020 Free Software Foundation, Inc.
387387
#
388388
# This file is free software; the Free Software Foundation
389389
# gives unlimited permission to copy and/or distribute it,
@@ -418,7 +418,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
418418

419419
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
420420

421-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
421+
# Copyright (C) 1997-2020 Free Software Foundation, Inc.
422422
#
423423
# This file is free software; the Free Software Foundation
424424
# gives unlimited permission to copy and/or distribute it,
@@ -457,7 +457,7 @@ fi
457457

458458
# Helper functions for option handling. -*- Autoconf -*-
459459

460-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
460+
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
461461
#
462462
# This file is free software; the Free Software Foundation
463463
# gives unlimited permission to copy and/or distribute it,
@@ -486,7 +486,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
486486
AC_DEFUN([_AM_IF_OPTION],
487487
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
488488

489-
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
489+
# Copyright (C) 1999-2020 Free Software Foundation, Inc.
490490
#
491491
# This file is free software; the Free Software Foundation
492492
# gives unlimited permission to copy and/or distribute it,
@@ -520,8 +520,11 @@ AC_DEFUN([AM_PATH_PYTHON],
520520
dnl Find a Python interpreter. Python versions prior to 2.0 are not
521521
dnl supported. (2.0 was released on October 16, 2000).
522522
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
523-
[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
524-
python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
523+
[python python2 python3 dnl
524+
python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
525+
python3.2 python3.1 python3.0 dnl
526+
python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
527+
python2.0])
525528
526529
AC_ARG_VAR([PYTHON], [the Python interpreter])
527530
@@ -721,7 +724,7 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
721724
sys.exit(sys.hexversion < minverhex)"
722725
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
723726

724-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
727+
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
725728
#
726729
# This file is free software; the Free Software Foundation
727730
# gives unlimited permission to copy and/or distribute it,
@@ -740,7 +743,7 @@ AC_DEFUN([AM_RUN_LOG],
740743

741744
# Check to make sure that the build environment is sane. -*- Autoconf -*-
742745

743-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
746+
# Copyright (C) 1996-2020 Free Software Foundation, Inc.
744747
#
745748
# This file is free software; the Free Software Foundation
746749
# gives unlimited permission to copy and/or distribute it,
@@ -821,7 +824,7 @@ AC_CONFIG_COMMANDS_PRE(
821824
rm -f conftest.file
822825
])
823826

824-
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
827+
# Copyright (C) 2009-2020 Free Software Foundation, Inc.
825828
#
826829
# This file is free software; the Free Software Foundation
827830
# gives unlimited permission to copy and/or distribute it,
@@ -881,7 +884,7 @@ AC_SUBST([AM_BACKSLASH])dnl
881884
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
882885
])
883886

884-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
887+
# Copyright (C) 2001-2020 Free Software Foundation, Inc.
885888
#
886889
# This file is free software; the Free Software Foundation
887890
# gives unlimited permission to copy and/or distribute it,
@@ -909,7 +912,7 @@ fi
909912
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
910913
AC_SUBST([INSTALL_STRIP_PROGRAM])])
911914

912-
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
915+
# Copyright (C) 2006-2020 Free Software Foundation, Inc.
913916
#
914917
# This file is free software; the Free Software Foundation
915918
# gives unlimited permission to copy and/or distribute it,
@@ -928,7 +931,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
928931

929932
# Check how to create a tarball. -*- Autoconf -*-
930933

931-
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
934+
# Copyright (C) 2004-2020 Free Software Foundation, Inc.
932935
#
933936
# This file is free software; the Free Software Foundation
934937
# gives unlimited permission to copy and/or distribute it,

0 commit comments

Comments
 (0)