开源软件构建与测试

_service:tar_scm:netty.spec Changed

_service:tar_scm:fix-clang.patch Added

@@ -0,0 +1,51 @@
+diff -ur netty-netty-4.1.13.Final/transport-native-epoll/pom.xml netty-netty-4.1.13.Final-copy/transport-native-epoll/pom.xml
+--- netty-netty-4.1.13.Final/transport-native-epoll/pom.xml	2017-07-06 19:23:51.000000000 +0800
++++ netty-netty-4.1.13.Final-copy/transport-native-epoll/pom.xml	2023-05-30 22:33:37.760412920 +0800
+@@ -33,7 +33,7 @@
+     <unix.common.lib.dir>${project.build.directory}/unix-common-lib</unix.common.lib.dir>
+     <unix.common.lib.unpacked.dir>${unix.common.lib.dir}/META-INF/native/lib</unix.common.lib.unpacked.dir>
+     <unix.common.include.unpacked.dir>${unix.common.lib.dir}/META-INF/native/include</unix.common.include.unpacked.dir>
+-    <jni.compiler.args.ldflags>LDFLAGS=-L${unix.common.lib.unpacked.dir} -Wl,--no-as-needed -lrt -Wl,--whole-archive -l${unix.common.lib.name} -Wl,--no-whole-archive</jni.compiler.args.ldflags>
++    <jni.compiler.args.ldflags>LDFLAGS=-L${unix.common.lib.unpacked.dir} -Wl,-z, relro,-z,now,--no-as-needed -lrt -Wl,--whole-archive -l${unix.common.lib.name} -Wl,--no-whole-archive</jni.compiler.args.ldflags>
+     <skipTests>true</skipTests>
+   </properties>
+ 
+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 19:23:51.000000000 +0800
++++ netty-netty-4.1.13.Final-copy/transport-native-unix-common/pom.xml	2023-05-30 22:17:28.825930398 +0800
+@@ -100,7 +100,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="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
++                      <env key="LDFLAGS" value="-Wl,-z, relro,-z,now,--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
+                            explicitly set the target platform. Otherwise we may get fatal link errors due to weakly linked
+@@ -171,7 +171,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="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
++                      <env key="LDFLAGS" value="-Wl,-z, relro,-z,now,--no-as-needed -lrt" />
+                       <env key="LIB_NAME" value="${nativeLibName}" />
+                     </exec>
+                   </target>
+@@ -241,7 +241,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="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
++                      <env key="LDFLAGS" value="-Wl,-z, relro,-z,now,--no-as-needed -lrt" />
+                       <env key="LIB_NAME" value="${nativeLibName}" />
+                     </exec>
+                   </target>
+@@ -311,7 +311,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="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
++                      <env key="LDFLAGS" value="-Wl,-z, relro,-z,now,--no-as-needed -lrt" />
+                       <env key="LIB_NAME" value="${nativeLibName}" />
+                     </exec>
+                   </target>

_service Changed

Changes of Revision 9