Date: Mon, 8 Apr 2024 09:36:35 GMT From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= <des@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b91036e9ace0 - main - devel/bazel029: Port has outlived its purpose. Message-ID: <202404080936.4389aZLo029718@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by des: URL: https://cgit.FreeBSD.org/ports/commit/?id=b91036e9ace0f281ba900c4f251d60aa1d97794e commit b91036e9ace0f281ba900c4f251d60aa1d97794e Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2024-04-08 09:34:26 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2024-04-08 09:34:26 +0000 devel/bazel029: Port has outlived its purpose. Approved by: maintainer --- MOVED | 1 + devel/Makefile | 1 - devel/bazel029/Makefile | 89 ---------------------- devel/bazel029/distinfo | 3 - .../extra-i386_tools_cpp_BUILD.static.freebsd | 16 ---- .../files/patch-scripts_bootstrap_bootstrap.sh | 11 --- .../files/patch-scripts_bootstrap_buildenv.sh | 11 --- ...b_bazel_rules_python_python__stub__template.txt | 11 --- .../files/patch-src_tools_singlejar_port.h | 14 ---- devel/bazel029/files/patch-third_party__BUILD | 11 --- .../patch-tools__jdk__default_java_toolchain.bzl | 37 --------- devel/bazel029/pkg-descr | 5 -- devel/bazel029/pkg-plist | 2 - 13 files changed, 1 insertion(+), 211 deletions(-) diff --git a/MOVED b/MOVED index 6717b094addd..b82e295a638c 100644 --- a/MOVED +++ b/MOVED @@ -3162,3 +3162,4 @@ devel/dmucs||2024-04-06|Has expired: Unmaintained, upstream last release was in multimedia/mjpg-streamer||2024-04-06|Has expired: Unmaintained for a long time and does not work irc/tircproxy||2024-04-06|Has expired: Unmaintained, dead upstream, vaporized from the net devel/ds2||2024-04-06|Has expired: Upstream deprecated and archived +deve/bazel029||2024-04-08|Removed diff --git a/devel/Makefile b/devel/Makefile index eee0d2d454a1..0eeb99d916cc 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -285,7 +285,6 @@ SUBDIR += bats-core SUBDIR += bazel SUBDIR += bazel-buildtools - SUBDIR += bazel029 SUBDIR += bazel5 SUBDIR += bbparse SUBDIR += bcc diff --git a/devel/bazel029/Makefile b/devel/bazel029/Makefile deleted file mode 100644 index ce95b77509e0..000000000000 --- a/devel/bazel029/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -PORTNAME= bazel -DISTVERSION= 0.29.0 -PORTREVISION= 2 -CATEGORIES= devel java -MASTER_SITES= https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/ -DISTNAME= bazel-${PORTVERSION}rc${FINALRC}-dist -PKGNAMESUFFIX= 029 - -MAINTAINER= aehlig@linta.de -COMMENT= Fast and correct build system -WWW= https://bazel.build/ - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE - -BROKEN_armv6= fails to package: cp: bazel: No such file or directory -BROKEN_armv7= fails to package: cp: bazel: No such file or directory - -BUILD_DEPENDS= bash:shells/bash \ - zip:archivers/zip - -CONFLICTS_INSTALL= bazel[0-9]* - -USES= cpe python shebangfix zip:infozip - -# In bazel, a release is always code-wise identical to the final release candidate. -# Hence we can also download that one and so have a simple way to also test earlier release -# candidates. -FINALRC= 8 - -CPE_VENDOR= google - -SHEBANG_REGEX= .*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so) -USE_JAVA= yes -JAVA_VENDOR= openjdk -JAVA_VERSION= 8 -JAVA_BUILD= yes -JAVA_RUN= yes - -NO_WRKSUBDIR= YES - -# The bazel binary is also a zip archive (extracted by the elf part), it must not be stripped -STRIP= - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" -EXTRA_PATCHES+= ${FILESDIR}/extra-i386_tools_cpp_BUILD.static.freebsd -.endif - -# Have the location of the system-wide rc file reside ${ETCDIR}. -# Also adapt the sample file to disable persistent java workers as they -# do not work reliably on FreeBSD. -post-patch: - @${REINPLACE_CMD} \ - -e "s|/etc/bazel.bazelrc|${ETCDIR}/bazel.bazelrc|" \ - ${WRKSRC}/src/main/cpp/blaze_util_posix.cc \ - ${WRKSRC}/src/main/cpp/BUILD - @${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/bazel.bazelrc - @${ECHO_CMD} build --host_javabase=@local_jdk//:jdk >> ${WRKSRC}/scripts/packages/bazel.bazelrc - @${ECHO_CMD} build --action_env=PATH=/bin:/usr/bin/:${LOCALBASE}/bin >> ${WRKSRC}/scripts/packages/bazel.bazelrc - @${REINPLACE_CMD} \ - -e 's|^\(PYTHON_BIN=.*\)|if [ "%VERSION%" = "3" ] ; then PYTHON_BIN=${PYTHON_CMD}; else \1 ; fi|' \ - ${WRKSRC}/tools/python/pywrapper_template.txt - @${REINPLACE_CMD} \ - -e 's|/usr/bin/env python|${PYTHON_CMD}|' \ - ${WRKSRC}/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java - -do-build: - @${MKDIR} ${WRKDIR}/bazel_tmp - (if [ -z "$${SOURCE_DATE_EPOCH}" ] ; \ - then SOURCE_DATE_EPOCH=`grep TIMESTAMP ${DISTINFO_FILE} \ - | ${SED} -e 's/[^0-9]//g'`; \ - fi ; \ - cd ${WRKSRC} && \ - ${SETENV} BAZEL_SH=${LOCALBASE}/bin/bash \ - TMPDIR=${WRKDIR}/bazel_tmp \ - EMBED_LABEL='${PORTVERSION}' \ - PATH=${LOCALBASE}/bin:$$PATH \ - SOURCE_DATE_EPOCH=$${SOURCE_DATE_EPOCH} \ - EXTRA_BAZEL_ARGS=--host_javabase=@local_jdk//:jdk \ - ${LOCALBASE}/bin/bash ./compile.sh) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/output/bazel ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/scripts/packages/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample - -.include <bsd.port.post.mk> diff --git a/devel/bazel029/distinfo b/devel/bazel029/distinfo deleted file mode 100644 index d0bbc2873622..000000000000 --- a/devel/bazel029/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1566883509 -SHA256 (bazel-0.29.0rc8-dist.zip) = d812e6fb46540b42fa8546c381f44728d3a27fcd8029faec05a7f8d14cfc7aa1 -SIZE (bazel-0.29.0rc8-dist.zip) = 265744572 diff --git a/devel/bazel029/files/extra-i386_tools_cpp_BUILD.static.freebsd b/devel/bazel029/files/extra-i386_tools_cpp_BUILD.static.freebsd deleted file mode 100644 index 1c70d376e68a..000000000000 --- a/devel/bazel029/files/extra-i386_tools_cpp_BUILD.static.freebsd +++ /dev/null @@ -1,16 +0,0 @@ ---- tools/cpp/BUILD.static.freebsd.orig 2019-07-10 15:47:44.533177000 +0000 -+++ tools/cpp/BUILD.static.freebsd 2019-07-10 15:48:07.637126000 +0000 -@@ -62,11 +62,11 @@ - toolchain( - name = "cc-toolchain-freebsd", - exec_compatible_with = [ -- "@platforms//cpu:x86_64", -+ "@platforms//cpu:x86_32", - "@platforms//os:freebsd", - ], - target_compatible_with = [ -- "@platforms//cpu:x86_64", -+ "@platforms//cpu:x86_32", - "@platforms//os:freebsd", - ], - toolchain = ":cc-compiler-freebsd", diff --git a/devel/bazel029/files/patch-scripts_bootstrap_bootstrap.sh b/devel/bazel029/files/patch-scripts_bootstrap_bootstrap.sh deleted file mode 100644 index 2fe060abacc3..000000000000 --- a/devel/bazel029/files/patch-scripts_bootstrap_bootstrap.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/bootstrap/bootstrap.sh.orig 2019-08-06 08:04:56.534744000 +0000 -+++ scripts/bootstrap/bootstrap.sh 2019-08-06 08:05:20.598434000 +0000 -@@ -35,7 +35,7 @@ - --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ - --spawn_strategy=standalone \ - --nojava_header_compilation \ -- --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \ -+ --strategy=Javac=standalone --ignore_unsupported_sandboxing --curses=no \ - --compilation_mode=opt \ - --distdir=derived/distdir \ - ${EXTRA_BAZEL_ARGS:-}" diff --git a/devel/bazel029/files/patch-scripts_bootstrap_buildenv.sh b/devel/bazel029/files/patch-scripts_bootstrap_buildenv.sh deleted file mode 100644 index c1a1d5202b89..000000000000 --- a/devel/bazel029/files/patch-scripts_bootstrap_buildenv.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/bootstrap/buildenv.sh.orig 1979-12-31 23:00:00 UTC -+++ scripts/bootstrap/buildenv.sh -@@ -215,7 +215,7 @@ function clear_log() { - rm -f ${phasefile} - } - --LEAVES="\xF0\x9F\x8D\x83" -+LEAVES="[LEAVES]" - INFO="\033[32mINFO\033[0m:" - WARNING="\033[31mWARN\033[0m:" - diff --git a/devel/bazel029/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt b/devel/bazel029/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt deleted file mode 100644 index 513c8e5604ec..000000000000 --- a/devel/bazel029/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig 2017-07-25 04:58:01 UTC -+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt -@@ -38,7 +38,7 @@ if IsWindows() and not PYTHON_BINARY.end - - # Find a file in a given search path. - def SearchPath(name): -- search_path = os.getenv('PATH', os.defpath).split(os.pathsep) -+ search_path = os.getenv('PATH', os.defpath + ":/usr/local/bin").split(os.pathsep) - for directory in search_path: - if directory == '': continue - path = os.path.join(directory, name) diff --git a/devel/bazel029/files/patch-src_tools_singlejar_port.h b/devel/bazel029/files/patch-src_tools_singlejar_port.h deleted file mode 100644 index 2010e26857f6..000000000000 --- a/devel/bazel029/files/patch-src_tools_singlejar_port.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/tools/singlejar/port.h.orig 2018-09-18 16:02:23.430634000 +0200 -+++ src/tools/singlejar/port.h 2018-09-18 16:03:58.961047000 +0200 -@@ -28,6 +28,11 @@ - #include <sys/types.h> - #include <time.h> - -+#ifndef _OFF64_T_DECLARED -+typedef off_t off64_t; -+#define _OFF64_T_DECLARED -+#endif -+ - #if defined(__APPLE__) - typedef off_t off64_t; - #elif defined(_WIN32) diff --git a/devel/bazel029/files/patch-third_party__BUILD b/devel/bazel029/files/patch-third_party__BUILD deleted file mode 100644 index 1d19aae4fd01..000000000000 --- a/devel/bazel029/files/patch-third_party__BUILD +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/BUILD.orig 2019-07-11 08:41:05.213918000 +0000 -+++ third_party/BUILD 2019-07-11 08:41:40.502181000 +0000 -@@ -536,7 +536,7 @@ - name = "filter_netty_dynamic_libs", - srcs = ["netty_tcnative/netty-tcnative-boringssl-static-2.0.24.Final.jar"], - outs = ["netty_tcnative/netty-tcnative-filtered.jar"], -- cmd = "cp $< $@ && zip -qd $@ " + UNNECESSARY_DYNAMIC_LIBRARIES, -+ cmd = "cp $< $@ && (zip -qd $@ " + UNNECESSARY_DYNAMIC_LIBRARIES + " || : )", - ) - - java_import( diff --git a/devel/bazel029/files/patch-tools__jdk__default_java_toolchain.bzl b/devel/bazel029/files/patch-tools__jdk__default_java_toolchain.bzl deleted file mode 100644 index 742616c05916..000000000000 --- a/devel/bazel029/files/patch-tools__jdk__default_java_toolchain.bzl +++ /dev/null @@ -1,37 +0,0 @@ ---- tools/jdk/default_java_toolchain.bzl.orig 2019-08-06 08:09:07.930962000 +0000 -+++ tools/jdk/default_java_toolchain.bzl 2019-08-06 08:16:15.674960000 +0000 -@@ -19,25 +19,6 @@ - ] - - JDK9_JVM_OPTS = [ -- # Allow JavaBuilder to access internal javac APIs. -- "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", -- "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", -- "--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED", -- "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", -- "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED", -- "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", -- "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", -- "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", -- -- # override the javac in the JDK. -- "--patch-module=java.compiler=$(location @bazel_tools//tools/jdk:java_compiler_jar)", -- "--patch-module=jdk.compiler=$(location @bazel_tools//tools/jdk:jdk_compiler_jar)", -- -- # quiet warnings from com.google.protobuf.UnsafeUtil, -- # see: https://github.com/google/protobuf/issues/3781 -- # and: https://github.com/bazelbuild/bazel/issues/5599 -- "--add-opens=java.base/java.nio=ALL-UNNAMED", -- "--add-opens=java.base/java.lang=ALL-UNNAMED", - ] - - DEFAULT_JAVACOPTS = [ -@@ -70,7 +51,7 @@ - "@bazel_tools//tools/jdk:jdk_compiler_jar", - ], - "javac_supports_workers": 1, -- "jvm_opts": JDK9_JVM_OPTS, -+ "jvm_opts": JDK8_JVM_OPTS, - "misc": DEFAULT_JAVACOPTS, - "compatible_javacopts": COMPATIBLE_JAVACOPTS, - "singlejar": ["@bazel_tools//tools/jdk:singlejar"], diff --git a/devel/bazel029/pkg-descr b/devel/bazel029/pkg-descr deleted file mode 100644 index af6e04cf3ec1..000000000000 --- a/devel/bazel029/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Bazel is Google's own build tool, now publicly available in Beta. -Bazel has built-in support for building both client and server -software, including client applications for both Android and iOS -platforms. It also provides an extensible framework that you can -use to develop your own build rules. diff --git a/devel/bazel029/pkg-plist b/devel/bazel029/pkg-plist deleted file mode 100644 index d157c119f36f..000000000000 --- a/devel/bazel029/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/bazel -@sample %%ETCDIR%%/bazel.bazelrc.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404080936.4389aZLo029718>