Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make-rules/makemaker.mk
changeset 4746 8e237ffd0a48
parent 4393 963a977eeb62
child 5577 09a6352d52ad 
--- a/make-rules/makemaker.mk	Thu Aug 06 15:11:29 2015 -0700
+++ b/make-rules/makemaker.mk	Fri Aug 07 13:43:38 2015 -0700
@@ -40,6 +40,9 @@
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.configured:	BITS=32
 $(BUILD_DIR)/$(MACH64)-5.16/.configured:	PERL_VERSION=5.16
 $(BUILD_DIR)/$(MACH64)-5.16/.configured:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.20/.configured:	PERL_VERSION=5.20
+$(BUILD_DIR)/$(MACH64)-5.20/.configured:	BITS=64
+
 
 $(BUILD_DIR)/$(MACH32)-5.12/.tested:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.tested:	BITS=32
@@ -47,6 +50,9 @@
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.tested:	BITS=32
 $(BUILD_DIR)/$(MACH64)-5.16/.tested:	PERL_VERSION=5.16
 $(BUILD_DIR)/$(MACH64)-5.16/.tested:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.20/.tested:	PERL_VERSION=5.20
+$(BUILD_DIR)/$(MACH64)-5.20/.tested:	BITS=64
+
 
 $(BUILD_DIR)/$(MACH32)-5.12/.tested-and-compared:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.tested-and-compared:	BITS=32
@@ -54,6 +60,9 @@
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.tested-and-compared:	BITS=32
 $(BUILD_DIR)/$(MACH64)-5.16/.tested-and-compared:	PERL_VERSION=5.16
 $(BUILD_DIR)/$(MACH64)-5.16/.tested-and-compared:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared:	PERL_VERSION=5.20
+$(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared:	BITS=64
+
 
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested:	BITS=32
@@ -61,6 +70,9 @@
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested:	BITS=32
 $(BUILD_DIR)/$(MACH64)-5.16/.system-tested:	PERL_VERSION=5.16
 $(BUILD_DIR)/$(MACH64)-5.16/.system-tested:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.20/.system-tested:	PERL_VERSION=5.20
+$(BUILD_DIR)/$(MACH64)-5.20/.system-tested:	BITS=64
+
 
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested-and-compared:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested-and-compared:	BITS=32
@@ -68,14 +80,19 @@
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested-and-compared:	BITS=32
 $(BUILD_DIR)/$(MACH64)-5.16/.system-tested-and-compared:	PERL_VERSION=5.16
 $(BUILD_DIR)/$(MACH64)-5.16/.system-tested-and-compared:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.20/.system-tested-and-compared:	PERL_VERSION=5.20
+$(BUILD_DIR)/$(MACH64)-5.20/.system-tested-and-compared:	BITS=64
+
 
 BUILD_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.built
 BUILD_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.built
 BUILD_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.built
+BUILD_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.built
 
 INSTALL_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.installed
 INSTALL_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.installed
 INSTALL_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.installed
+INSTALL_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.installed
 
 COMPONENT_CONFIGURE_ENV +=	$(COMMON_PERL_ENV)
 COMPONENT_CONFIGURE_ENV +=	PERL="$(PERL)"
@@ -129,20 +146,24 @@
 TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.tested
 TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.tested
 TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.tested
+TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.tested
 else
 TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.tested-and-compared
 TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.tested-and-compared
 TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.tested-and-compared
+TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared
 endif
 
 ifeq ($(strip $(wildcard $(COMPONENT_TEST_RESULTS_DIR)/results-*.master)),)
 SYSTEM_TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.system-tested
 SYSTEM_TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested
 SYSTEM_TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.system-tested
+SYSTEM_TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.system-tested
 else
 SYSTEM_TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.system-tested-and-compared
 SYSTEM_TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested-and-compared
 SYSTEM_TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.system-tested-and-compared
+SYSTEM_TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.system-tested-and-compared
 endif
 
 # test the built source
@@ -220,3 +241,6 @@
 ifneq ($(findstring 5.16, $(PERL_VERSIONS)),)
 REQUIRED_PACKAGES += runtime/perl-516
 endif
+ifneq ($(findstring 5.20, $(PERL_VERSIONS)),)
+REQUIRED_PACKAGES += runtime/perl-520
+endif
upstream/oracle/userland-gate