components/python/python34/patches/05-studio-profile.patch
branchs11-update
changeset 3876 da37433d5103
parent 3786 fa9d2da4d216
child 5229 b7b91ddbbdce
--- a/components/python/python34/patches/05-studio-profile.patch	Fri Feb 20 13:26:28 2015 -0800
+++ b/components/python/python34/patches/05-studio-profile.patch	Wed Feb 25 20:44:31 2015 -0800
@@ -4,9 +4,9 @@
 that the profiling options be used at all steps of the build -- not just
 compilation.  As it is Solaris-specific, it is not suitable for upstream.
 
---- Python-3.4.2/Makefile.pre.in.~2~	2014-09-22 14:03:21.153426271 -0700
-+++ Python-3.4.2/Makefile.pre.in	2014-09-22 14:03:21.234552368 -0700
-@@ -477,30 +477,39 @@
+--- Python-3.4.3/Makefile.pre.in.~2~	2015-02-25 08:04:46.338074390 -0800
++++ Python-3.4.3/Makefile.pre.in	2015-02-25 08:04:46.418252956 -0800
+@@ -478,30 +478,39 @@
  profile-opt:
  	@echo "Building with support for profile generation:"
  	$(MAKE) clean
@@ -20,9 +20,9 @@
  	$(MAKE) build_all_use_profile
  
  build_all_generate_profile:
--	$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
+-	$(MAKE) all CFLAGS_NODIST="$(CFLAGS) -fprofile-generate" LDFLAGS="-fprofile-generate" LIBS="$(LIBS) -lgcov"
 +	$(MAKE) all CC="$(CC) -xprofile=collect:$(XPROFILE_DIR)" \
-+	    CFLAGS="$(CFLAGS) -xprofile=collect:$(XPROFILE_DIR)" \
++	    CFLAGS_NODIST="$(CFLAGS) -xprofile=collect:$(XPROFILE_DIR)" \
 +	    LDFLAGS="$(LDFLAGS) -xprofile=collect:$(XPROFILE_DIR)" \
 +	    BLDSHARED="$(BLDSHARED) -xprofile=collect:$(XPROFILE_DIR)"
  
@@ -32,9 +32,9 @@
 +	LD_LIBRARY_PATH=. $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK)
  
  build_all_use_profile:
--	$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use -fprofile-correction"
+-	$(MAKE) all CFLAGS_NODIST="$(CFLAGS) -fprofile-use -fprofile-correction"
 +	$(MAKE) all CC="$(CC) -xprofile=use:$(XPROFILE_DIR)" \
-+	    CFLAGS="$(CFLAGS) -xprofile=use:$(XPROFILE_DIR)" \
++	    CFLAGS_NODIST="$(CFLAGS) -xprofile=use:$(XPROFILE_DIR)" \
 +	    LDFLAGS="$(LDFLAGS) -xprofile=use:$(XPROFILE_DIR)" \
 +	    BLDSHARED="$(BLDSHARED) -xprofile=use:$(XPROFILE_DIR)"
  
@@ -51,7 +51,7 @@
  
  coverage-lcov:
  	@echo "Creating Coverage HTML report with LCOV:"
-@@ -571,13 +580,9 @@
+@@ -572,13 +581,9 @@
  # -s, --silent or --quiet is always the first char.
  # Under BSD make, MAKEFLAGS might be " -s -v x=y".
  sharedmods: $(BUILDPYTHON) pybuilddir.txt
@@ -66,7 +66,7 @@
  
  # Build static library
  # avoid long command lines, same as LIBRARY_OBJS
-@@ -1591,7 +1596,7 @@
+@@ -1595,7 +1600,7 @@
  	-rm -f Modules/_testembed Modules/_freeze_importlib
  
  profile-removal: