--- orig/jdk-6fa770f9f8ab/make/GenerateLinkOptData.gmk	2022-04-04 17:16:29.365930149 +0200
+++ jdk-6fa770f9f8ab/make/GenerateLinkOptData.gmk	2022-04-04 17:16:54.954624358 +0200
@@ -61,11 +61,12 @@
 	$(call MakeDir, $(LINK_OPT_DIR))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
-	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@ \
+	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.tmp \
 	    -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    build.tools.classlist.HelloClasslist \
 	    $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE)
+	sort $@.tmp > $@
 
 # The jli trace is created by the same recipe as classlist. By declaring these
 # dependencies, make will correctly rebuild both jli trace and classlist
--- orig/jdk-6fa770f9f8ab/make/gendata/Gendata-jdk.compiler.gmk	2022-04-13 19:24:10.191682716 +0200
+++ jdk-6fa770f9f8ab/make/gendata/Gendata-jdk.compiler.gmk	2022-04-13 20:58:57.891368216 +0200
@@ -83,6 +83,8 @@
 	    $(CT_MODULESOURCEPATH) \
 	    $(CT_MODULES) \
 	    >$(@D)/A/system-modules
+	# Make files reproducible
+	find $(@D) -exec $(TOUCH) -h -c -t 197001010000.01 {} \;
 	$(TOUCH) $@
 
 # Can't generate ct.sym directly into modules libs as the SetupJarArchive macro
k?id=cd836a65f0c84e4c05988f3d8ee2065b94b28edc'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/local.mk'>
<input type='hidden' name='id' value='cd836a65f0c84e4c05988f3d8ee2065b94b28edc'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=cd836a65f0c84e4c05988f3d8ee2065b94b28edc'>root</a>/<a href='/guix/log/nix?id=cd836a65f0c84e4c05988f3d8ee2065b94b28edc'>nix</a>/<a href='/guix/log/nix/local.mk?id=cd836a65f0c84e4c05988f3d8ee2065b94b28edc'>local.mk</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/local.mk?id=cd836a65f0c84e4c05988f3d8ee2065b94b28edc&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-06-26 22:59:55 +0200'>2024-06-26</span></td><td><a href='/guix/commit/nix/local.mk?id=d11b96eb5493231a5a35045505ff8ae8aa746b8e'>etc: Add explicit ‘--substitute-urls’ in guix-daemon service files.</a><span class='msg-avail'>...<span class='msg-tooltip'>Having substitute URLs explicitly listed in the service startup file
makes it clearer what should be modified to permanently change the list
of substitute URLs.

* config-daemon.ac: Rename ‘guix_substitute_urls’ to
‘GUIX_SUBSTITUTE_URLS’ and substitute it.
* nix/local.mk (etc/guix-%.service, etc/init.d/guix-daemon)
(etc/guix-%.conf): Substitute it.
* etc/guix-daemon.conf.in, etc/guix-daemon.service.in,
etc/init.d/guix-daemon.in: Add an explicit ‘--substitute-urls’ option.

Change-Id: Ie491b7fab5c42e54dca582801c03805a85de2bf9
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-09-24 02:00:00 +0200'>2023-09-24</span></td><td><a href='/guix/commit/nix/local.mk?id=0500af5556307d0a4c14a23864e9e4bccd2643d7'>Revert "build: Add missing guix-gc.timer file to binary tarball."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit 69f6edc1a8596d2cb4c67e0435d35633af6f3cbc.

The intention is good, but nodist_systemdservice_DATA are meant to be
disposable artefacts generated from corresponding ‘.in’ files.

etc/guix-gc.timer doesn't fit that description, breaking builds:

  $ make clean &amp;&amp; make
  …
  make[2]: *** No rule to make target 'etc/guix-gc.timer', needed by 'all-am'.  Stop.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-08-31 23:31:49 -0400'>2023-08-31</span></td><td><a href='/guix/commit/nix/local.mk?id=69f6edc1a8596d2cb4c67e0435d35633af6f3cbc'>build: Add missing guix-gc.timer file to binary tarball.</a><span class='msg-avail'>...<span class='msg-tooltip'>Partially fixes &lt;https://issues.guix.gnu.org/65117&gt;.

* nix/local.mk (nodist_systemdservice_DATA): Add etc/guix-gc.timer.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-10-01 08:58:06 +0000'>2021-10-01</span></td><td><a href='/guix/commit/nix/local.mk?id=8579304e8f4deaca33b816b2d56af1d814a03bde'>build: Don’t delete ‘guix-gc.timer’ file.</a><span class='msg-avail'>...<span class='msg-tooltip'>Without this invoking ‘make clean’ would remove ‘guix-gc.timer’, and ‘make’
would fail with.

  make[2]: *** No rule to make target 'etc/guix-gc.timer', needed by 'all-am'.  Stop.

* nix/local.mk (nodist_systemdservice_DATA): Remove ‘guix-gc.timer’.
</span></span></td><td>Xinglu Chen</td></tr>
<tr><td><span title='2021-09-20 14:18:21 +0000'>2021-09-20</span></td><td><a href='/guix/commit/nix/local.mk?id=5c4fd77097e2cecfd4780e099af7954f86779fe1'>etc: Add systemd files for running ‘guix gc’ periodically</a><span class='msg-avail'>...<span class='msg-tooltip'>* etc/guix-gc.service.in: New file.
* etc/guix-gc.timer: Likewise.
* .gitignore: Ignore generated ‘guix-gc.service’.
* nix/local.mk (nodist_systemdservice_DATA): Add ‘guix-gc.service’ and
‘guix-gc.timer’.
(EXTRA_DIST): Add ‘guix-gc.service.in’ and ‘guix-gc.timer’.
* doc/guix.texi (Binary Installation): Mention the new systemd files.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Thiago Jung Bauermann</td></tr>