Mercurial > hg > icedtea11
changeset 2633:061fc39249dd
PR2873: Fix make distcheck
2016-03-04 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR2873: Fix make distcheck
* Makefile.am:
(VERSION_SETTINGS_FILE_BACKUP): Added.
(versioning): Use VERSION_SETTINGS_FILE_BACKUP
rather than hardcoding a name.
(clean-versioning): Replace the outdated Defs.gmk
usage with VERSION_SETTINGS_FILE and
VERSION_SETTINGS_FILE_BACKUP.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 14 Mar 2016 13:13:16 +0000 |
| parents | db6287c26b47 |
| children | af008bbfeeae |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Mar 05 02:06:23 2016 +0000 +++ b/ChangeLog Mon Mar 14 13:13:16 2016 +0000 @@ -1,3 +1,15 @@ +2016-03-04 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR2873: Fix make distcheck + * Makefile.am: + (VERSION_SETTINGS_FILE_BACKUP): Added. + (versioning): Use VERSION_SETTINGS_FILE_BACKUP + rather than hardcoding a name. + (clean-versioning): Replace the outdated Defs.gmk + usage with VERSION_SETTINGS_FILE and + VERSION_SETTINGS_FILE_BACKUP. + * NEWS: Updated. + 2016-03-04 Andrew John Hughes <gnu.andrew@member.fsf.org> PR2826: Provide option to disable SystemTap tests
--- a/Makefile.am Sat Mar 05 02:06:23 2016 +0000 +++ b/Makefile.am Mon Mar 14 13:13:16 2016 +0000 @@ -86,6 +86,8 @@ VERSION_SETTINGS_FILE = openjdk/jdk/make/ProfileNames.gmk +VERSION_SETTINGS_FILE_BACKUP = $$(basename $(VERSION_SETTINGS_FILE)).bak + JDK_CACERTS_FILE = $(SYSTEM_JDK_DIR)/jre/lib/security/cacerts CACERTS_FILE = \ @@ -1323,8 +1325,8 @@ fi stamps/versioning.stamp: stamps/patch.stamp - mv $(VERSION_SETTINGS_FILE) ProfileNames.gmk.bak - cat ProfileNames.gmk.bak > $(VERSION_SETTINGS_FILE) + mv $(VERSION_SETTINGS_FILE) $(VERSION_SETTINGS_FILE_BACKUP) + cat $(VERSION_SETTINGS_FILE_BACKUP) > $(VERSION_SETTINGS_FILE) icedtea_version="$(PACKAGE_VERSION)$(ICEDTEA_REV)" ; \ if test "x$(ENABLE_CACAO)" = "xyes" || \ test "x$(ENABLE_JAMVM)" = "xyes"; then \ @@ -1358,8 +1360,8 @@ touch $@ clean-versioning: - if [ -e Defs.gmk.bak ] ; then \ - mv Defs.gmk.bak openjdk/jdk/make/common/shared/Defs.gmk ; \ + if [ -e $(VERSION_SETTINGS_FILE_BACKUP) ] ; then \ + mv $(VERSION_SETTINGS_FILE_BACKUP) $(VERSION_SETTINGS_FILE) ; \ fi rm -f stamps/versioning.stamp
--- a/NEWS Sat Mar 05 02:06:23 2016 +0000 +++ b/NEWS Mon Mar 14 13:13:16 2016 +0000 @@ -146,6 +146,7 @@ - PR2853: Revert AArch64 jvm.cfg divergence - PR2853: Revert changes to libpng source code now 8078245 is in place. - PR2865: Handle uninstallation. + - PR2873: Fix make distcheck. - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build. - Remove jcheck