--- a/components/perl512/Makefile Fri Mar 22 10:28:14 2013 -0500
+++ b/components/perl512/Makefile Fri Mar 22 12:37:36 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -29,18 +29,18 @@
# can't call it.
COMPONENT_NAME= perl
-COMPONENT_VERSION= 5.12.4
+COMPONENT_VERSION= 5.12.5
PERL_VERSION= 5.12
COMPONENT_PROJECT_URL= http://www.perl.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH= \
- sha256:c920fa01a34b7752e8cbbc99c6921b908df60611d84a29c4377e4a798604767e
+ sha256:10749417fd3010aae320a34181ad4cd6a4855c1fc63403b87fa4d630b18e966c
COMPONENT_ARCHIVE_URL= http://www.cpan.org/src/5.0/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/perl
include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
+include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
#
@@ -69,11 +69,10 @@
# That last bit re-runs bison to regenerate perly.h.
-COMPONENT_PRE_BUILD_ACTION= \
- (cd $(@D); $(ENV) -i \
- MAKE=$(GMAKE) \
- PATH=$(dir $(CC.studio.32)):$(PATH) \
- $(CONFIG_SHELL) ./Configure \
+CONFIGURE_SCRIPT = $(SOURCE_DIR)/Configure
+CONFIGURE_ENV += MAKE=$(GMAKE)
+CONFIGURE_ENV += PATH=$(dir $(CC)):$(PATH)
+CONFIGURE_OPTIONS = \
-Dprefix=/usr/perl5/$(PERL_VERSION) \
-Dprivlib=/usr/perl5/$(PERL_VERSION)/lib \
-Dsitelib=/usr/perl5/site_perl/$(PERL_VERSION) \
@@ -88,8 +87,11 @@
-Dcf_email="[email protected]" \
-Dcf_by="perl-bugs" \
-Dmyhostname="localhost" \
+ -Dmksymlinks \
-O \
- -de ) ; \
+ -de
+
+COMPONENT_POST_CONFIGURE_ACTION = \
(cd $(@D); \
cp config.sh config.sh_orig ; \
gawk \
@@ -120,14 +122,12 @@
test: $(TEST_32)
#
- # 2 expected failures because of the use of cloney in this build.
- # Without cloney all tests pass.
+ #
+ # All tests should pass.
#
- # Failed 2 tests out of 1697, 99.88% okay.
- # ../cpan/Archive-Tar/t/02_methods.t
- # ../lib/File/stat.t
#
+
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
include ../../make-rules/depend.mk