Projects
home:zhangxiang:branches:Mega:23.03
netty
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 26
View file
_service:tar_scm:netty.spec
Changed
@@ -30,7 +30,9 @@ Patch0019: CVE-2021-43797-pre.patch Patch0020: CVE-2021-43797.patch Patch0021: fix-strip.patch - +%if "%toolchain" == "clang" +Patch0022: fix-clang.patch +%endif BuildRequires: maven-local mvn(ant-contrib:ant-contrib) BuildRequires: mvn(com.jcraft:jzlib) mvn(commons-logging:commons-logging) BuildRequires: mvn(kr.motd.maven:os-maven-plugin) mvn(log4j:log4j:1.2.17) @@ -138,6 +140,10 @@ rm -f codec/src/*/java/io/netty/handler/codec/compression/Lz4*.java %build +%if "%toolchain" == "clang" +export CFLAGS= +export LDFLAGS= +%endif export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %mvn_build -f
View file
_service:tar_scm:fix-build-error.patch
Changed
@@ -16,7 +16,7 @@ <env key="OBJ_DIR" value="${nativeObjsOnlyDir}" /> <env key="JNI_PLATFORM" value="${jni.platform}" /> - <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> -+ <env key="CFLAGS" value="-O3 -Werror -Wno-error=stringop-overflow -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> ++ <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" /> <env key="LIB_NAME" value="${nativeLibName}" /> <!-- support for __attribute__((weak_import)) by the linker was added in 10.2 so ensure we @@ -25,7 +25,7 @@ <env key="OBJ_DIR" value="${nativeObjsOnlyDir}" /> <env key="JNI_PLATFORM" value="${jni.platform}" /> - <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> -+ <env key="CFLAGS" value="-O3 -Werror -Wno-error=stringop-overflow -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> ++ <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" /> <env key="LIB_NAME" value="${nativeLibName}" /> </exec> @@ -34,7 +34,7 @@ <env key="OBJ_DIR" value="${nativeObjsOnlyDir}" /> <env key="JNI_PLATFORM" value="${jni.platform}" /> - <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> -+ <env key="CFLAGS" value="-O3 -Werror -Wno-error=stringop-overflow -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> ++ <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" /> <env key="LIB_NAME" value="${nativeLibName}" /> </exec> @@ -43,7 +43,7 @@ <env key="OBJ_DIR" value="${nativeObjsOnlyDir}" /> <env key="JNI_PLATFORM" value="${jni.platform}" /> - <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> -+ <env key="CFLAGS" value="-O3 -Werror -Wno-error=stringop-overflow -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> ++ <env key="CFLAGS" value="-O3 -Werror -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable" /> <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" /> <env key="LIB_NAME" value="${nativeLibName}" /> </exec>
View file
_service:tar_scm:fix-clang.patch
Added
@@ -0,0 +1,24 @@ +diff -ur netty-netty-4.1.13.Final/transport-native-epoll/src/main/c/netty_epoll_linuxsocket.c netty-netty-4.1.13.Final-copy/transport-native-epoll/src/main/c/netty_epoll_linuxsocket.c +--- netty-netty-4.1.13.Final/transport-native-epoll/src/main/c/netty_epoll_linuxsocket.c 2017-07-06 11:23:51.000000000 +0000 ++++ netty-netty-4.1.13.Final-copy/transport-native-epoll/src/main/c/netty_epoll_linuxsocket.c 2023-05-31 13:23:32.566313659 +0000 +@@ -183,7 +183,7 @@ + if (netty_unix_socket_getOption(env, fd, IPPROTO_TCP, TCP_INFO, &tcp_info, sizeof(tcp_info)) == -1) { + return; + } +- unsigned int cArray32; ++ int cArray32; + cArray0 = tcp_info.tcpi_state; + cArray1 = tcp_info.tcpi_ca_state; + cArray2 = tcp_info.tcpi_retransmits; +diff -ur netty-netty-4.1.13.Final/transport-native-unix-common/pom.xml netty-netty-4.1.13.Final-copy/transport-native-unix-common/pom.xml +--- netty-netty-4.1.13.Final/transport-native-unix-common/pom.xml 2017-07-06 11:23:51.000000000 +0000 ++++ netty-netty-4.1.13.Final-copy/transport-native-unix-common/pom.xml 2023-05-31 11:01:27.545622740 +0000 +@@ -31,7 +31,7 @@ + + <properties> + <exe.make>make</exe.make> +- <exe.compiler>gcc</exe.compiler> ++ <exe.compiler>clang</exe.compiler> + <exe.archiver>ar</exe.archiver> + <nativeLibName>libnetty-unix-common</nativeLibName> + <nativeIncludeDir>${project.basedir}/src/main/c</nativeIncludeDir>
View file
_service:tar_scm:fix-strip.patch
Changed
@@ -24,7 +24,7 @@ <!-- If glibc and linux kernel are both not sufficient...then define the CFLAGS --> <regex>^((?!CFLAGS=).)*$</regex> - <replacement>CFLAGS=-O3 -Werror -fno-omit-frame-pointer -Wunused-variable -I${unix.common.include.unpacked.dir}</replacement> -+ <replacement>CFLAGS=-O3 -Werror -fno-omit-frame-pointer -Wunused-variable -Wl,-s -I${unix.common.include.unpacked.dir}</replacement> ++ <replacement>CFLAGS=-O3 -Werror -Werror=deprecated-non-prototype -Wpointer-sign -fno-omit-frame-pointer -Wunused-variable -I${unix.common.include.unpacked.dir}</replacement> <failIfNoMatch>false</failIfNoMatch> </configuration> </execution>
View file
_service
Changed
@@ -2,7 +2,7 @@ <service name="tar_scm"> <param name="url">git@gitee.com:a-xiang-and-shanhaijing/netty.git</param> <param name="scm">git</param> - <param name="revision">master</param> + <param name="revision">temp</param> <param name="exclude">*</param> <param name="extract">*</param> </service>
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