Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
20045498 Upgrade Parallel to latest version
authorRich Burridge <rich.burridge@oracle.com>
Tue, 02 Feb 2016 07:59:10 -0800
changeset 5383 daa35fd7ea40
parent 5382 92181ac6984c
child 5384 17f39f2a1119
20045498 Upgrade Parallel to latest version
components/parallel/Makefile file | annotate | diff | comparison | revisions
components/parallel/parallel.license file | annotate | diff | comparison | revisions
components/parallel/parallel.p5m file | annotate | diff | comparison | revisions
components/parallel/patches/src.sql.patch file | annotate | diff | comparison | revisions 
--- a/components/parallel/Makefile	Mon Feb 01 05:47:49 2016 -0800
+++ b/components/parallel/Makefile	Tue Feb 02 07:59:10 2016 -0800
@@ -20,37 +20,53 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		parallel
-COMPONENT_VERSION=	20121122
+COMPONENT_VERSION=	20151222
 # A leading "0." is included to make it easier to upgrade the package, should
 # the maintainers decide to go to a more standard version numbering system.
-IPS_COMPONENT_VERSION=  0.2012.11.22
+IPS_COMPONENT_VERSION=  0.2015.12.22
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/parallel/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:0315336141612ba2ec1f76e6c8c58a72f4531777c96b79b91ef64b3980be584f
+    sha256:ae927c260fb86c24e0a2717d3b214996a9547d1a2be4ff3bfebd9f23b5bd9f0d
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/parallel
 
-TPNO=			8651
+TPNO=			26424
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-# Set PATH to find /usr/perl5/bin/pod2man, so that the man pages can be
+# Version of Perl to use in the Perl scripts in the parallel package.
+PERL_VERSION =	5.20
+
+# Set PATH to find the correct pod2man, so that the man pages can be
 # automatically generated
-COMPONENT_BUILD_ENV +=    PATH="/usr/bin:/usr/gnu/bin:/usr/perl5/bin"
+COMPONENT_BUILD_ENV += \
+	PATH="/usr/bin:/usr/gnu/bin:/usr/perl5/$(PERL_VERSION)/bin"
+
+# Adjust the '#!/usr/bin/env perl' and '#!/usr/bin/perl' at the beginning of
+# the Perl scripts to use '#!/usr/perl5/$(PERL_VERSION)/bin/perl'
+COMPONENT_POST_INSTALL_ACTION += \
+	$(GSED) -i -e 's?/usr/bin/perl?/usr/perl5/$(PERL_VERSION)/bin/perl?' \
+		$(PROTOUSRBINDIR64)/niceload;
+COMPONENT_POST_INSTALL_ACTION += \
+	$(GSED) -i -e \
+		's?/usr/bin/env perl?/usr/perl5/$(PERL_VERSION)/bin/perl?' \
+		$(PROTOUSRBINDIR64)/parallel;
+COMPONENT_POST_INSTALL_ACTION += \
+	$(GSED) -i -e 's?/usr/bin/perl?/usr/perl5/$(PERL_VERSION)/bin/perl?' \
+		$(PROTOUSRBINDIR64)/sql;
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# common targets
 configure:	$(CONFIGURE_64)
 
 build:		$(BUILD_64)
@@ -62,6 +78,6 @@
 system-test:    $(NO_TESTS)
 
 
-REQUIRED_PACKAGES += runtime/perl-512
 REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/which
+REQUIRED_PACKAGES += system/core-os
--- a/components/parallel/parallel.license	Mon Feb 01 05:47:49 2016 -0800
+++ b/components/parallel/parallel.license	Tue Feb 02 07:59:10 2016 -0800
@@ -1,4 +1,4 @@
-                    GNU GENERAL PUBLIC LICENSE
+			GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
--- a/components/parallel/parallel.p5m	Mon Feb 01 05:47:49 2016 -0800
+++ b/components/parallel/parallel.p5m	Tue Feb 02 07:59:10 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -38,16 +38,28 @@
 file usr/bin/$(MACH64)/sem path=usr/bin/sem
 file usr/bin/$(MACH64)/sql path=usr/bin/sql
 file path=usr/share/doc/parallel/niceload.html
+file path=usr/share/doc/parallel/niceload.pdf
 file path=usr/share/doc/parallel/niceload.texi
 file path=usr/share/doc/parallel/parallel.html
+file path=usr/share/doc/parallel/parallel.pdf
 file path=usr/share/doc/parallel/parallel.texi
+file path=usr/share/doc/parallel/parallel_design.html
+file path=usr/share/doc/parallel/parallel_design.pdf
+file path=usr/share/doc/parallel/parallel_design.texi
+file path=usr/share/doc/parallel/parallel_tutorial.html
+file path=usr/share/doc/parallel/parallel_tutorial.pdf
+file path=usr/share/doc/parallel/parallel_tutorial.texi
 file path=usr/share/doc/parallel/sem.html
+file path=usr/share/doc/parallel/sem.pdf
 file path=usr/share/doc/parallel/sem.texi
 file path=usr/share/doc/parallel/sql.html
+file path=usr/share/doc/parallel/sql.pdf
 file path=usr/share/doc/parallel/sql.texi
 file path=usr/share/man/man1/niceload.1
 file path=usr/share/man/man1/parallel.1
 file path=usr/share/man/man1/sem.1
 file path=usr/share/man/man1/sql.1
+file path=usr/share/man/man7/parallel_design.7
+file path=usr/share/man/man7/parallel_tutorial.7
 license parallel.license license=GPLv3
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/which
--- a/components/parallel/patches/src.sql.patch	Mon Feb 01 05:47:49 2016 -0800
+++ b/components/parallel/patches/src.sql.patch	Tue Feb 02 07:59:10 2016 -0800
@@ -1,8 +1,10 @@
-This patch is needed because the sql script is expecting the which 
+This patch is needed because the sql script is expecting the which
 command to return errors on stderr, not stdout and assumes anything
-on stdout is an actual path.   (And since /bin/which starts a new 
+on stdout is an actual path.   (And since /bin/which starts a new
 csh, it only checks .cshrc $PATH not current $PATH settings.)
 
+This patch will not be sent upstream.
+
 --- parallel-20120422/src/sql.orig	2012-12-11 13:21:20.855778203 -0800
 +++ parallel-20120422/src/sql	2012-12-11 13:22:33.870295549 -0800
 @@ -890,7 +890,7 @@
upstream/oracle/userland-gate