Created attachment 218569 [details] patch for devel/bazel to update to 3.6.0 Update devel/bazel to 3.6.0 Release notes: https://blog.bazel.build/2020/10/06/bazel-3-6.html
Hi Klaus, Thanks for the update and patch. 'portlint -AC' warns about patches in files/, which were not generated using 'make makepatch': WARN: /poudriere/ports/default/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format. WARN: /poudriere/ports/default/devel/bazel/files/patch-src__main__tools__procress-tools-linux.cc: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format. WARN: /poudriere/ports/default/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format. WARN: /poudriere/ports/default/devel/bazel/files/patch-src_tools_singlejar_port.h: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format. WARN: /poudriere/ports/default/devel/bazel/files/patch-tools__jdk__default_java_toolchain.bzl: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format. It is not a real problem, but should be standardized, I think. Poudriere (on amd64 and i386) builds fine so far.
Hi Rainer, thanks for looking at my PR. The I reason, I have not used 'make makepatch' is that it does not interact well with the changes introduced by the 'post-patch' target; doing it naively, I get, for example, the absolute path to my python interpreter in the refreshed patch for src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java instead of the placeholder string '%%PYTHON_CMD%%'. Do you know I way of refreshing the patches that is less error-prone than 'make clean patch && make makepatch' and manually undoing the algorithmic changes in the generated patches? I would really to have a safe way to (re)generate the patches, as it would make maintaining the port a lot easier. Thanks, Klaus
(In reply to Klaus Aehlig from comment #2) Hi Klaus, From time to time, I also have my 'bad' experiences with some patch files generated via 'make makepatch', which are not well suited. Unfortunately, I am not aware about any automatic way to solve this. What I do in cases like this is, that I create the patch files via 'make makepatch' and afterwards correct the wanted issues within them manually. This is not perfect, but works and 'portlint -AC' does not complain afterwards :) In your special case, it could be also ok to leave everything as it is. HTH, Rainer
Created attachment 218601 [details] Patch to update devel/bazel to 3.6.0 New patch to update devel/bazel to 3.6.0 that also refreshes the patches with 'make makepatch'. More precisely, I ran 'make clean patch && make makepatch' after disabling 'post-patch' in the Makefile (and undoing the Makefile changes afterwards). portlint seems to be happy and I manually inspected the patches and tried that the binary built from the port updated that way behaves properly.
Hi Klaus, Thanks for the renewal of the patches. Poudriere and portlint seem fine with them. I just opened a review to get approval for a commit[1]. [1] https://reviews.freebsd.org/D26715
A commit references this bug: Author: rhurlin Date: Thu Oct 8 09:43:06 UTC 2020 New revision: 551699 URL: https://svnweb.freebsd.org/changeset/ports/551699 Log: devel/bazel: Update to 3.6.0 Minor release with several bug fixes and some incompatible changes[1]. [1] https://blog.bazel.build/2020/10/06/bazel-3-6.html Renewed almost all patches under files/ (via make makepatch). PR: 250164 Submitted by: Klaus Aehlig <aehlig@linta.de> (maintainer) Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D26715 Changes: head/devel/bazel/Makefile head/devel/bazel/distinfo head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh head/devel/bazel/files/patch-scripts_bootstrap_buildenv.sh head/devel/bazel/files/patch-src__main__tools__procress-tools-linux.cc head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt head/devel/bazel/files/patch-src_main_tools_process-tools-linux.cc head/devel/bazel/files/patch-src_tools_singlejar_port.h head/devel/bazel/files/patch-tools__jdk__default_java_toolchain.bzl
Committed, thanks :)