--- a/components/parallel/Makefile Wed Mar 30 10:16:56 2016 -0700
+++ b/components/parallel/Makefile Wed Mar 30 13:33:31 2016 -0700
@@ -22,7 +22,7 @@
#
# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
-
+BUILD_BITS= 64
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= parallel
@@ -30,51 +30,35 @@
# 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.2016.2.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:8dfbe539036a6ff02f9f542751e8621f42d285b3c9a7d9245042a6cc6ddc55ea
-COMPONENT_ARCHIVE_URL= http://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB= utility/parallel
TPNO= 27217
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+TEST_TARGET= $(NO_TESTS)
+include $(WS_MAKE_RULES)/gnu-component.mk
# 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/$(PERL_VERSION)/bin"
+ PATH="$(USRBINDIR):$(GNUBIN):$(USRDIR)/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;
+ $(PROTOUSRBINDIR)/niceload;
COMPONENT_POST_INSTALL_ACTION += \
$(GSED) -i -e \
's?/usr/bin/env perl?/usr/perl5/$(PERL_VERSION)/bin/perl?' \
- $(PROTOUSRBINDIR64)/parallel;
+ $(PROTOUSRBINDIR)/parallel;
COMPONENT_POST_INSTALL_ACTION += \
$(GSED) -i -e 's?/usr/bin/perl?/usr/perl5/$(PERL_VERSION)/bin/perl?' \
- $(PROTOUSRBINDIR64)/sql;
+ $(PROTOUSRBINDIR)/sql;
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-configure: $(CONFIGURE_64)
-
-build: $(BUILD_64)
-
-install: $(INSTALL_64)
-
-test: $(NO_TESTS)
-
-system-test: $(NO_TESTS)
-
-
REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += shell/which
REQUIRED_PACKAGES += system/core-os