CVS commit: pkgsrc/lang/python37

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jul 13 17:14:43 UTC 2018

Modified Files:
        pkgsrc/lang/python37: distinfo
        pkgsrc/lang/python37/patches: patch-Makefile.pre.in

Log Message:
python37: Fix DTrace build.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python37/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python37/patches/patch-Makefile.pre.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python37/distinfo
diff -u pkgsrc/lang/python37/distinfo:1.1 pkgsrc/lang/python37/distinfo:1.2
--- pkgsrc/lang/python37/distinfo:1.1   Tue Jul  3 03:55:40 2018
+++ pkgsrc/lang/python37/distinfo       Fri Jul 13 17:14:43 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2018/07/03 03:55:40 adam Exp $
+$NetBSD: distinfo,v 1.2 2018/07/13 17:14:43 jperkin Exp $
 
 SHA1 (Python-3.7.0.tar.xz) = 653cffa5b9f2a28150afe4705600d2e55d89b564
 RMD160 (Python-3.7.0.tar.xz) = dfd13505dcd274e3307cd5ad3d233952ed90fa90
@@ -8,7 +8,7 @@ SHA1 (patch-Lib_distutils_command_instal
 SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 2e65a8dd5dd3fe25957206c062106fa7a6fc4e69
 SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c
-SHA1 (patch-Makefile.pre.in) = c91aac5b238dbfe149be63a2486b6f4c5b959280
+SHA1 (patch-Makefile.pre.in) = 719905b47024a3d3095077d3ea6e28564114c105
 SHA1 (patch-Modules___uuidmodule.c) = fe66366866a924653b3d97625e8ef20be8766d25
 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d

Index: pkgsrc/lang/python37/patches/patch-Makefile.pre.in
diff -u pkgsrc/lang/python37/patches/patch-Makefile.pre.in:1.1 pkgsrc/lang/python37/patches/patch-Makefile.pre.in:1.2
--- pkgsrc/lang/python37/patches/patch-Makefile.pre.in:1.1      Tue Jul  3 03:55:40 2018
+++ pkgsrc/lang/python37/patches/patch-Makefile.pre.in  Fri Jul 13 17:14:43 2018
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.pre.in,v 1.1 2018/07/03 03:55:40 adam Exp $
+$NetBSD: patch-Makefile.pre.in,v 1.2 2018/07/13 17:14:43 jperkin Exp $
 
 Use only one optimisation level; needed for PLIST and setuptools compatibility.
 Do not build/install libpython3.so.
 Simplify _sysconfigdata to include only platform name.
 Swap targets libinstall and libainstall, to byte-compile python-config.py.
 
---- Makefile.pre.in.orig       2017-12-19 04:53:56.000000000 +0000
+--- Makefile.pre.in.orig       2018-06-27 03:07:35.000000000 +0000
 +++ Makefile.pre.in
 @@ -96,7 +96,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI
  # be able to build extension modules using the directories specified in the
@@ -16,7 +16,7 @@ Swap targets libinstall and libainstall,
  NO_AS_NEEDED= @NO_AS_NEEDED@
  LDLAST=               @LDLAST@
  SGI_ABI=      @SGI_ABI@
-@@ -207,7 +207,7 @@ DIST=              $(DISTFILES) $(DISTDIRS)
+@@ -213,7 +213,7 @@ DIST=              $(DISTFILES) $(DISTDIRS)
  LIBRARY=      @LIBRARY@
  LDLIBRARY=      @LDLIBRARY@
  BLDLIBRARY=     @BLDLIBRARY@
@@ -25,16 +25,16 @@ Swap targets libinstall and libainstall,
  DLLLIBRARY=   @DLLLIBRARY@
  LDLIBRARYDIR=   @LDLIBRARYDIR@
  INSTSONAME=   @INSTSONAME@
-@@ -432,7 +432,7 @@ LIBRARY_OBJS=      \
+@@ -443,7 +443,7 @@ LIBRARY_OBJS=      \
  # On some systems, object files that reference DTrace probes need to be modified
  # in-place by dtrace(1).
  DTRACE_DEPS = \
 -      Python/ceval.o
-+      Python/ceval.o Modules/gcmodule.o
++      Python/ceval.o Python/import.o Modules/gcmodule.o
  # XXX: should gcmodule, etc. be here, too?
  
  #########################################################################
-@@ -886,7 +886,6 @@ regen-opcode-targets:
+@@ -904,7 +904,6 @@ regen-opcode-targets:
                $(srcdir)/Python/opcode_targets.h.new
        $(UPDATE_FILE) $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/opcode_targets.h.new
  
@@ -42,7 +42,7 @@ Swap targets libinstall and libainstall,
  
  Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_external.h
  
-@@ -895,13 +894,13 @@ Python/frozen.o: $(srcdir)/Python/import
+@@ -913,13 +912,13 @@ Python/frozen.o: $(srcdir)/Python/import
  # an include guard, so we can't use a pipeline to transform its output.
  Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
        $(MKDIR_P) Include
@@ -58,7 +58,7 @@ Swap targets libinstall and libainstall,
  
  Objects/typeobject.o: Objects/typeslots.inc
  
-@@ -1102,7 +1101,7 @@ altinstall: commoninstall
+@@ -1127,7 +1126,7 @@ altinstall: commoninstall
        fi
  
  commoninstall:  check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
@@ -67,7 +67,7 @@ Swap targets libinstall and libainstall,
                sharedinstall oldsharedinstall altmaninstall \
                @FRAMEWORKALTINSTALLLAST@
  
-@@ -1161,7 +1160,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
+@@ -1186,7 +1185,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
                if test -n "$(PY3LIBRARY)"; then \
                        $(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
                fi; \
@@ -77,7 +77,7 @@ Swap targets libinstall and libainstall,
        fi
        if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
                rm -f $(DESTDIR)$(BINDIR)python$(VERSION)-32$(EXE); \
-@@ -1338,7 +1338,7 @@ libinstall:      build_all $(srcdir)/Modules/
+@@ -1378,7 +1378,7 @@ libinstall:      build_all $(srcdir)/Modules/
                        esac; \
                done; \
        done
@@ -86,7 +86,7 @@ Swap targets libinstall and libainstall,
                $(DESTDIR)$(LIBDEST); \
        $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
        if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
-@@ -1356,11 +1356,6 @@ libinstall:     build_all $(srcdir)/Modules/
+@@ -1396,11 +1396,6 @@ libinstall:     build_all $(srcdir)/Modules/
                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
                $(DESTDIR)$(LIBDEST)
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -98,7 +98,7 @@ Swap targets libinstall and libainstall,
                $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
                -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-@@ -1369,10 +1364,6 @@ libinstall:     build_all $(srcdir)/Modules/
+@@ -1409,10 +1404,6 @@ libinstall:     build_all $(srcdir)/Modules/
                -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -109,7 +109,7 @@ Swap targets libinstall and libainstall,
                $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
                $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
-@@ -1473,7 +1464,7 @@ sharedinstall: sharedmods
+@@ -1511,7 +1502,7 @@ sharedinstall: sharedmods
                --install-scripts=$(BINDIR) \
                --install-platlib=$(DESTSHARED) \
                --root=$(DESTDIR)/