Projects
home:binsz
pulsar
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 19
View file
_service:tar_scm:pulsar.spec
Changed
@@ -26,7 +26,8 @@ Patch0006: 0006-Bump-maven-plugin-os-maven-plugin.patch Patch1000: 1000-Added-support-for-building-the-riscv64-protoc-binari.patch Patch1001: 1001-Added-support-for-building-the-riscv64-protoc-gen-gr.patch -patch1002: 1002-Added-support-for-building-the-riscv64-protoc-binari.patch +Patch1002: 1002-Add-Huawei-Maven-repository.patch +patch1003: 1003-Added-support-for-building-the-riscv64-protoc-binari.patch %endif BuildRoot: /root/rpmbuild/BUILDROOT/ @@ -61,7 +62,7 @@ tar xzf %{SOURCE4} -C %{_tmppath}/source tar -mxf %{SOURCE5} -C ${HOME}/%{name}-prep_dir pushd ${HOME}/%{name}-prep_dir/protobuf-3.19.2 -%patch1002 -p1 +%patch1003 -p1 ./autogen.sh ./protoc-artifacts/build-protoc.sh linux riscv64 protoc mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.19.2 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=protoc-artifacts/target/linux/riscv64/protoc.exe @@ -71,6 +72,7 @@ tar -mxf %{SOURCE2} -C ${HOME}/%{name}-prep_dir pushd ${HOME}/%{name}-prep_dir/grpc-java-1.45.1 %patch1001 -p1 +%patch1002 -p1 sed -i "s,@HOME@,${HOME},g" build.gradle sed -i 's|https\\://services.gradle.org/distributions|file://%{_tmppath}/source|g' gradle/wrapper/gradle-wrapper.properties SKIP_TESTS=true ARCH=riscv64 ./buildscripts/kokoro/unix.sh
View file
_service:tar_scm:1002-Add-Huawei-Maven-repository.patch
Added
@@ -0,0 +1,83 @@ +From 797fc4515e2c3ea458eaf9280c7ea0ff68cf241e Mon Sep 17 00:00:00 2001 +From: IZUMI-Zu <274620705z@gmail.com> +Date: Wed, 16 Oct 2024 16:53:16 +0800 +Subject: PATCH Add Huawei Maven repository + +--- + binder/build.gradle | 1 + + cronet/build.gradle | 1 + + examples/settings.gradle | 1 + + gae-interop-testing/gae-jdk8/build.gradle | 2 ++ + settings.gradle | 1 + + 5 files changed, 6 insertions(+) + +diff --git a/binder/build.gradle b/binder/build.gradle +index dc3da4c..467d743 100644 +--- a/binder/build.gradle ++++ b/binder/build.gradle +@@ -40,6 +40,7 @@ android { + } + + repositories { ++ maven { url "https://mirrors.huaweicloud.com/repository/maven/" } + google() + mavenCentral() + } +diff --git a/cronet/build.gradle b/cronet/build.gradle +index d66eaf3..5efa29b 100644 +--- a/cronet/build.gradle ++++ b/cronet/build.gradle +@@ -8,6 +8,7 @@ plugins { + description = "gRPC: Cronet Android" + + repositories { ++ maven { url "https://mirrors.huaweicloud.com/repository/maven/" } + google() + mavenCentral() + } +diff --git a/examples/settings.gradle b/examples/settings.gradle +index 0473750..427f822 100644 +--- a/examples/settings.gradle ++++ b/examples/settings.gradle +@@ -1,5 +1,6 @@ + pluginManagement { + repositories { ++ maven { url "https://mirrors.huaweicloud.com/repository/maven/" } + maven { // The google mirror is less flaky than mavenCentral() + url "https://maven-central.storage-download.googleapis.com/maven2/" + } +diff --git a/gae-interop-testing/gae-jdk8/build.gradle b/gae-interop-testing/gae-jdk8/build.gradle +index 325e465..4d8f26a 100644 +--- a/gae-interop-testing/gae-jdk8/build.gradle ++++ b/gae-interop-testing/gae-jdk8/build.gradle +@@ -15,6 +15,7 @@ + buildscript { + // Configuration for building + repositories { ++ maven { url "https://mirrors.huaweicloud.com/repository/maven/" } + maven { // The google mirror is less flaky than mavenCentral() + url "https://maven-central.storage-download.googleapis.com/maven2/" } + } +@@ -34,6 +35,7 @@ description = 'gRPC: gae interop testing (jdk8)' + repositories { + // repositories for Jar's you access in your code + mavenLocal() ++ maven { url "https://mirrors.huaweicloud.com/repository/maven/" } + maven { // The google mirror is less flaky than mavenCentral() + url "https://maven-central.storage-download.googleapis.com/maven2/" } + } +diff --git a/settings.gradle b/settings.gradle +index 8612f3c..3e98d0f 100644 +--- a/settings.gradle ++++ b/settings.gradle +@@ -20,6 +20,7 @@ pluginManagement { + } + } + repositories { ++ maven { url "https://mirrors.huaweicloud.com/repository/maven/" } + gradlePluginPortal() + google() + } +-- +2.47.0 +
View file
_service:tar_scm:1002-Added-support-for-building-the-riscv64-protoc-binari.patch
Deleted
@@ -1,60 +0,0 @@ -From 78ca33b7b7424fb7b80dbcbf3034cd266a8bee66 Mon Sep 17 00:00:00 2001 -From: IZUMI-Zu <274620705z@gmail.com> -Date: Wed, 16 Oct 2024 14:50:28 +0800 -Subject: PATCH Added support for building the riscv64 protoc binaries with - Kokoro - ---- - kokoro/release/protoc/linux/build.sh | 3 +++ - protoc-artifacts/build-protoc.sh | 7 +++++++ - 2 files changed, 10 insertions(+) - -diff --git a/kokoro/release/protoc/linux/build.sh b/kokoro/release/protoc/linux/build.sh -index 44a95aa..13be7b2 100755 ---- a/kokoro/release/protoc/linux/build.sh -+++ b/kokoro/release/protoc/linux/build.sh -@@ -22,6 +22,9 @@ protoc-artifacts/build-protoc.sh linux aarch_64 protoc - sudo apt install -y g++-powerpc64le-linux-gnu - protoc-artifacts/build-protoc.sh linux ppcle_64 protoc - -+sudo apt install -y g++-riscv64-linux-gnu -+protoc-artifacts/build-protoc.sh linux riscv64 protoc -+ - sudo apt install -y g++-s390x-linux-gnu - protoc-artifacts/build-protoc.sh linux s390_64 protoc - -diff --git a/protoc-artifacts/build-protoc.sh b/protoc-artifacts/build-protoc.sh -index 4602842..20ca057 100755 ---- a/protoc-artifacts/build-protoc.sh -+++ b/protoc-artifacts/build-protoc.sh -@@ -93,6 +93,8 @@ checkArch () - assertEq $format "elf64-x86-64" $LINENO - elif "$ARCH" == aarch_64 ; then - assertEq $format "elf64-little" $LINENO -+ elif "$ARCH" == riscv64 ; then -+ assertEq $format "elf64-littleriscv" $LINENO - elif "$ARCH" == s390_64 ; then - if $host_machine == s390x ;then - assertEq $format "elf64-s390" $LINENO -@@ -162,6 +164,9 @@ checkDependencies () - elif "$ARCH" == aarch_64 ; then - dump_cmd='objdump -p '"$1"' | grep NEEDED' - white_list="libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-aarch64\.so\.1" -+ elif "$ARCH" == riscv64 ; then -+ dump_cmd='objdump -p '"$1"' | grep NEEDED' -+ white_list="libz\.so\.1\|libm\.so\.6\|libc\.so\.6\|ld-linux-riscv64-lp64d\.so\.1" - fi - elif "$OS" == osx ; then - dump_cmd='otool -L '"$1"' | fgrep dylib' -@@ -226,6 +231,8 @@ elif "$(uname)" == Linux* ; then - elif "$ARCH" == ppcle_64 ; then - CXXFLAGS="$CXXFLAGS -m64" - CONFIGURE_ARGS="$CONFIGURE_ARGS --host=powerpc64le-linux-gnu" -+ elif "$ARCH" == riscv64 ; then -+ CONFIGURE_ARGS="$CONFIGURE_ARGS --host=riscv64-linux-gnu" - elif "$ARCH" == s390_64 ; then - CXXFLAGS="$CXXFLAGS -m64" - CONFIGURE_ARGS="$CONFIGURE_ARGS --host=s390x-linux-gnu" --- -2.47.0 -
View file
_service:tar_scm:1003-Added-support-for-building-the-riscv64-protoc-binari.patch
Added
@@ -0,0 +1,60 @@ +From 78ca33b7b7424fb7b80dbcbf3034cd266a8bee66 Mon Sep 17 00:00:00 2001 +From: IZUMI-Zu <274620705z@gmail.com> +Date: Wed, 16 Oct 2024 14:50:28 +0800 +Subject: PATCH Added support for building the riscv64 protoc binaries with + Kokoro + +--- + kokoro/release/protoc/linux/build.sh | 3 +++ + protoc-artifacts/build-protoc.sh | 7 +++++++ + 2 files changed, 10 insertions(+) + +diff --git a/kokoro/release/protoc/linux/build.sh b/kokoro/release/protoc/linux/build.sh +index 44a95aa..13be7b2 100755 +--- a/kokoro/release/protoc/linux/build.sh ++++ b/kokoro/release/protoc/linux/build.sh +@@ -22,6 +22,9 @@ protoc-artifacts/build-protoc.sh linux aarch_64 protoc + sudo apt install -y g++-powerpc64le-linux-gnu + protoc-artifacts/build-protoc.sh linux ppcle_64 protoc + ++sudo apt install -y g++-riscv64-linux-gnu ++protoc-artifacts/build-protoc.sh linux riscv64 protoc ++ + sudo apt install -y g++-s390x-linux-gnu + protoc-artifacts/build-protoc.sh linux s390_64 protoc + +diff --git a/protoc-artifacts/build-protoc.sh b/protoc-artifacts/build-protoc.sh +index 4602842..20ca057 100755 +--- a/protoc-artifacts/build-protoc.sh ++++ b/protoc-artifacts/build-protoc.sh +@@ -93,6 +93,8 @@ checkArch () + assertEq $format "elf64-x86-64" $LINENO + elif "$ARCH" == aarch_64 ; then + assertEq $format "elf64-little" $LINENO ++ elif "$ARCH" == riscv64 ; then ++ assertEq $format "elf64-littleriscv" $LINENO + elif "$ARCH" == s390_64 ; then + if $host_machine == s390x ;then + assertEq $format "elf64-s390" $LINENO +@@ -162,6 +164,9 @@ checkDependencies () + elif "$ARCH" == aarch_64 ; then + dump_cmd='objdump -p '"$1"' | grep NEEDED' + white_list="libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-aarch64\.so\.1" ++ elif "$ARCH" == riscv64 ; then ++ dump_cmd='objdump -p '"$1"' | grep NEEDED' ++ white_list="libz\.so\.1\|libm\.so\.6\|libc\.so\.6\|ld-linux-riscv64-lp64d\.so\.1" + fi + elif "$OS" == osx ; then + dump_cmd='otool -L '"$1"' | fgrep dylib' +@@ -226,6 +231,8 @@ elif "$(uname)" == Linux* ; then + elif "$ARCH" == ppcle_64 ; then + CXXFLAGS="$CXXFLAGS -m64" + CONFIGURE_ARGS="$CONFIGURE_ARGS --host=powerpc64le-linux-gnu" ++ elif "$ARCH" == riscv64 ; then ++ CONFIGURE_ARGS="$CONFIGURE_ARGS --host=riscv64-linux-gnu" + elif "$ARCH" == s390_64 ; then + CXXFLAGS="$CXXFLAGS -m64" + CONFIGURE_ARGS="$CONFIGURE_ARGS --host=s390x-linux-gnu" +-- +2.47.0 +
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2