[Git][java-team/netty][master] 5 commits: Add patch for FTBFS on 32-bit architecures (Closes: #923455)
Tony Mancill
gitlab at salsa.debian.org
Thu Jan 9 05:07:27 GMT 2020
Tony Mancill pushed to branch master at Debian Java Maintainers / netty
Commits:
a11dd3cc by tony mancill at 2020-01-08T17:30:25-08:00
Add patch for FTBFS on 32-bit architecures (Closes: #923455)
- - - - -
9c2f18e2 by tony mancill at 2020-01-08T20:32:05-08:00
Set "Rules-Requires-Root: no" in debian/control
- - - - -
68371e3b by tony mancill at 2020-01-08T20:32:06-08:00
Specify debhelper compat 12 via debhelper-compat dependency
- - - - -
53076e65 by tony mancill at 2020-01-08T20:41:11-08:00
Bump Standards-Version to 4.4.1
- - - - -
b07dfe15 by tony mancill at 2020-01-08T20:41:11-08:00
prepare changelog for upload to unstable
- - - - -
5 changed files:
- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/15-disable-Werror.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+netty (1:4.1.33-3) unstable; urgency=medium
+
+ * Team upload.
+ * Apply patch for FTBFS on 32-bit architectures. (Closes: #923455)
+ Thank you to Sjoerd Simons for the patch.
+ * Set "Rules-Requires-Root: no" in debian/control
+ * Specify debhelper compat 12 via debhelper-compat dependency
+ * Bump Standards-Version to 4.4.1
+
+ -- tony mancill <tmancill at debian.org> Wed, 08 Jan 2020 20:40:19 -0800
+
netty (1:4.1.33-2) unstable; urgency=high
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Uploaders:
Build-Depends:
ant,
ant-contrib (>= 1.0~b3+svn177-8~),
- debhelper (>= 11~),
+ debhelper-compat (= 12),
default-jdk,
groovy,
libbcpkix-java,
@@ -29,10 +29,11 @@ Build-Depends:
libprotobuf-java,
libxz-java,
maven-debian-helper (>= 1.5)
-Standards-Version: 4.3.0
+Standards-Version: 4.4.1
Vcs-Git: https://salsa.debian.org/java-team/netty.git
Vcs-Browser: https://salsa.debian.org/java-team/netty
Homepage: http://netty.io/
+Rules-Requires-Root: no
Package: libnetty-java
Architecture: all
=====================================
debian/patches/15-disable-Werror.patch
=====================================
@@ -0,0 +1,62 @@
+Description: Build native parts without Werror as that can cause build failures
+Author: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923455
+
+--- a/transport-native-unix-common/pom.xml
++++ b/transport-native-unix-common/pom.xml
+@@ -101,7 +101,7 @@
+ <env key="LIB_DIR" value="${nativeLibOnlyDir}" />
+ <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 -fvisibility=hidden" />
++ <env key="CFLAGS" value="-O3 -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
+ <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
+@@ -172,7 +172,7 @@
+ <env key="LIB_DIR" value="${nativeLibOnlyDir}" />
+ <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 -fvisibility=hidden" />
++ <env key="CFLAGS" value="-O3 -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
+ <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
+ <env key="LIB_NAME" value="${nativeLibName}" />
+ </exec>
+@@ -242,7 +242,7 @@
+ <env key="LIB_DIR" value="${nativeLibOnlyDir}" />
+ <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 -fvisibility=hidden" />
++ <env key="CFLAGS" value="-O3 -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
+ <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
+ <env key="LIB_NAME" value="${nativeLibName}" />
+ </exec>
+@@ -312,7 +312,7 @@
+ <env key="LIB_DIR" value="${nativeLibOnlyDir}" />
+ <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 -fvisibility=hidden" />
++ <env key="CFLAGS" value="-O3 -Wno-attributes -fPIC -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden" />
+ <env key="LDFLAGS" value="-Wl,--no-as-needed -lrt" />
+ <env key="LIB_NAME" value="${nativeLibName}" />
+ </exec>
+--- a/transport-native-epoll/pom.xml
++++ b/transport-native-epoll/pom.xml
+@@ -265,7 +265,7 @@
+ <value>${linux.sendmmsg.support}${glibc.sendmmsg.support}</value>
+ <!-- If glibc and linux kernel are both not sufficient...then define the CFLAGS -->
+ <regex>.*IO_NETTY_SENDMSSG_NOT_FOUND.*</regex>
+- <replacement>CFLAGS=-O3 -DIO_NETTY_SENDMMSG_NOT_FOUND -Werror -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden -I${unix.common.include.unpacked.dir}</replacement>
++ <replacement>CFLAGS=-O3 -DIO_NETTY_SENDMMSG_NOT_FOUND -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden -I${unix.common.include.unpacked.dir}</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+@@ -281,7 +281,7 @@
+ <value>${jni.compiler.args.cflags}</value>
+ <!-- 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 -fvisibility=hidden -I${unix.common.include.unpacked.dir}</replacement>
++ <replacement>CFLAGS=-O3 -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden -I${unix.common.include.unpacked.dir}</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
=====================================
debian/patches/series
=====================================
@@ -10,3 +10,4 @@
11-ignore-protobuf-nano.patch
13-ignore-conscrypt.patch
14-Correctly-handle-whitespaces-in-HTTP-header-names-as.patch
+15-disable-Werror.patch
View it on GitLab: https://salsa.debian.org/java-team/netty/compare/7d38f644111fe13dc001087ae790c83c8ac13a13...b07dfe153502477097e322f9141a87866cbfb346
--
View it on GitLab: https://salsa.debian.org/java-team/netty/compare/7d38f644111fe13dc001087ae790c83c8ac13a13...b07dfe153502477097e322f9141a87866cbfb346
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200109/116ba875/attachment.html>
More information about the pkg-java-commits
mailing list