From owner-svn-ports-all@FreeBSD.ORG Tue Apr 22 12:14:27 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7BB1C251; Tue, 22 Apr 2014 12:14:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 66D8E1DE4; Tue, 22 Apr 2014 12:14:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3MCERGD010304; Tue, 22 Apr 2014 12:14:27 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3MCEQd4010298; Tue, 22 Apr 2014 12:14:26 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201404221214.s3MCEQd4010298@svn.freebsd.org> From: Kubilay Kocak Date: Tue, 22 Apr 2014 12:14:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351815 - in head/lang: python27/files python31/files python32/files python33/files python34/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2014 12:14:27 -0000 Author: koobs Date: Tue Apr 22 12:14:26 2014 New Revision: 351815 URL: http://svnweb.freebsd.org/changeset/ports/351815 QAT: https://qat.redports.org/buildarchive/r351815/ Log: lang/python{31,32,33}: Fix stage/package as non-root Copy the second part of a change previously made to python27 [1], to python31, python32 and python33. This fixes staging and packaging of these ports by a non-root user by running ranlib on the archive prior to it being installed read-only. While I'm here: - python27: Add breadcrumbs and references to the patch header - python34: Update breadcrumbs and references to the patch header [1] https://svnweb.freebsd.org/ports?view=revision&revision=350207 Submitted by: antoine Reviewed by: kwm, sbz Added: head/lang/python31/files/patch-Makefile.pre.in (contents, props changed) Modified: head/lang/python27/files/patch-Makefile.pre.in head/lang/python32/files/patch-Makefile.pre.in head/lang/python33/files/patch-Makefile.pre.in head/lang/python34/files/patch-Makefile.pre.in Modified: head/lang/python27/files/patch-Makefile.pre.in ============================================================================== --- head/lang/python27/files/patch-Makefile.pre.in Tue Apr 22 12:12:45 2014 (r351814) +++ head/lang/python27/files/patch-Makefile.pre.in Tue Apr 22 12:14:26 2014 (r351815) @@ -1,3 +1,15 @@ +# Description: Fix out-of-tree build as a result of upstream #15819 +# Submitted by: rm (r318353) +# Issue ID: http://bugs.python.org/issue15819#msg203348 + +# Description: Run pycompile only once +# Submitted by: antoine (r350207) +# TODO: ? + +# Description: Run ranlib before installing the library read-only +# Submitted by: antoine@ (r350207) +# TODO: Upstream + --- ./Makefile.pre.in.orig 2013-11-10 07:36:41.000000000 +0000 +++ ./Makefile.pre.in 2014-04-04 09:16:00.000000000 +0000 @@ -285,9 +285,9 @@ Added: head/lang/python31/files/patch-Makefile.pre.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python31/files/patch-Makefile.pre.in Tue Apr 22 12:14:26 2014 (r351815) @@ -0,0 +1,16 @@ +# Description: Run ranlib before installing the library read-only +# Submitted by: antoine@ (r350207) +# TODO: Upstream + +--- ./Makefile.pre.in.orig 2014-04-20 23:22:37.435954278 +1000 ++++ ./Makefile.pre.in 2014-04-20 23:23:10.767071278 +1000 +@@ -985,8 +985,8 @@ + if test "$(SO)" = .dll; then \ + $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ + else \ ++ $(RANLIB) $(LIBRARY) ; \ + $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ +- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ + fi; \ + else \ + echo Skip install of $(LIBRARY) - use make frameworkinstall; \ Modified: head/lang/python32/files/patch-Makefile.pre.in ============================================================================== --- head/lang/python32/files/patch-Makefile.pre.in Tue Apr 22 12:12:45 2014 (r351814) +++ head/lang/python32/files/patch-Makefile.pre.in Tue Apr 22 12:14:26 2014 (r351815) @@ -1,5 +1,17 @@ ---- Makefile.pre.in.orig 2013-05-16 02:33:51.000000000 +1000 -+++ Makefile.pre.in 2013-09-05 23:42:32.910025692 +1000 +# Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_* +# Submitted by: koobs (r326729) +# TODO: Upstream + +# Description: Fix out-of-tree build as a result of upstream #15819 +# Submitted by: rm (r318353) +# Issue ID: http://bugs.python.org/issue15819#msg203348 + +# Description: Run ranlib before installing the library read-only +# Submitted by: antoine@ (r350207) +# TODO: Upstream + +--- ./Makefile.pre.in.orig 2013-05-16 02:33:51.000000000 +1000 ++++ ./Makefile.pre.in 2014-04-20 23:27:06.346079817 +1000 @@ -70,18 +70,18 @@ OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ @@ -69,3 +81,13 @@ ############################################################################ # Header files +@@ -1108,8 +1108,8 @@ + if test "$(SHLIB_SUFFIX)" = .dll; then \ + $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ + else \ ++ $(RANLIB) $(LIBRARY) ; \ + $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ +- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ + fi; \ + else \ + echo Skip install of $(LIBRARY) - use make frameworkinstall; \ Modified: head/lang/python33/files/patch-Makefile.pre.in ============================================================================== --- head/lang/python33/files/patch-Makefile.pre.in Tue Apr 22 12:12:45 2014 (r351814) +++ head/lang/python33/files/patch-Makefile.pre.in Tue Apr 22 12:14:26 2014 (r351815) @@ -1,5 +1,17 @@ ---- Makefile.pre.in.orig 2013-05-16 02:32:57.000000000 +1000 -+++ Makefile.pre.in 2013-09-05 23:48:22.439871947 +1000 +# Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_* +# Submitted by: koobs (r326729) +# TODO: Upstream + +# Description: Fix out-of-tree build as a result of upstream #15819 +# Submitted by: rm (r318353) +# Issue ID: http://bugs.python.org/issue15819#msg203348 + +# Description: Run ranlib before installing the library read-only +# Submitted by: antoine@ (r350207) +# TODO: Upstream + +--- ./Makefile.pre.in.orig 2014-03-09 19:40:23.000000000 +1100 ++++ ./Makefile.pre.in 2014-04-20 23:28:30.086226530 +1000 @@ -70,18 +70,18 @@ OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ @@ -25,7 +37,7 @@ NO_AS_NEEDED= @NO_AS_NEEDED@ LDLAST= @LDLAST@ SGI_ABI= @SGI_ABI@ -@@ -306,21 +306,21 @@ +@@ -310,21 +310,21 @@ ########################################################################## # AST @@ -51,7 +63,7 @@ OPCODETARGETGEN= \ $(srcdir)/Python/makeopcodetargets.py -@@ -742,7 +742,7 @@ +@@ -747,7 +747,7 @@ Objects/setobject.o: $(srcdir)/Objects/stringlib/eq.h $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES) @@ -60,7 +72,7 @@ Python/ceval.o: $(OPCODETARGETS_H) $(srcdir)/Python/ceval_gil.h -@@ -753,7 +753,7 @@ +@@ -758,7 +758,7 @@ Objects/typeobject.o: Objects/typeslots.inc Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py @@ -69,3 +81,13 @@ ############################################################################ # Header files +@@ -1205,8 +1205,8 @@ + if test "$(SHLIB_SUFFIX)" = .dll; then \ + $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ + else \ ++ $(RANLIB) $(LIBRARY) ; \ + $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ +- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ + fi; \ + else \ + echo Skip install of $(LIBRARY) - use make frameworkinstall; \ Modified: head/lang/python34/files/patch-Makefile.pre.in ============================================================================== --- head/lang/python34/files/patch-Makefile.pre.in Tue Apr 22 12:12:45 2014 (r351814) +++ head/lang/python34/files/patch-Makefile.pre.in Tue Apr 22 12:14:26 2014 (r351815) @@ -1,11 +1,9 @@ # Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_* -# Changeset: https://svnweb.freebsd.org/ports?view=revision&revision=326729 -# Submitted by: koobs@ +# Submitted by: koobs (r326729) # TODO: Upstream # Description: Run ranlib before installing the library read-only -# Changeset: https://svnweb.freebsd.org/ports?view=revision&revision=350207 -# Submitted by: antoine@ +# Submitted by: antoine@ (r350207) # TODO: Upstream --- ./Makefile.pre.in.orig 2014-03-17 13:31:30.000000000 +1100