[Git][java-team/hyperic-sigar][master] 6 commits: Renaming no-m64-mips-arm.diff -> no-m64.patch.

[Andrius Merkys (@merkys)]

Andrius Merkys pushed to branch master at Debian Java Maintainers / hyperic-sigar


Commits:
cda0ab40 by Andrius Merkys at 2021-10-25T01:56:40-04:00
Renaming no-m64-mips-arm.diff -> no-m64.patch.

- - - - -
74656a23 by Andrius Merkys at 2021-10-25T01:58:36-04:00
Disabling cc -m64 cc flag on all architectures (Closes: #997807).

- - - - -
8e37ebac by Andrius Merkys at 2021-10-25T02:02:02-04:00
Describing no-m64.patch.

- - - - -
c1cdeb58 by Andrius Merkys at 2021-10-25T02:03:04-04:00
Update changelog for 1.6.4+dfsg-6 release

- - - - -
6d6a3a03 by Andrius Merkys at 2021-11-09T01:28:20-05:00
Switching to version 4 for debian/watch.

- - - - -
fb720ecc by Andrius Merkys at 2021-11-09T01:30:14-05:00
Update changelog for 1.6.4+dfsg-7 release

- - - - -


5 changed files:

- debian/changelog
- − debian/patches/no-m64-mips-arm.diff
- + debian/patches/no-m64.patch
- debian/patches/series
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+hyperic-sigar (1.6.4+dfsg-7) unstable; urgency=medium
+
+  * Team upload.
+  * Upload to unstable.
+  * Switching to version 4 for debian/watch.
+
+ -- Andrius Merkys <merkys at debian.org>  Tue, 09 Nov 2021 01:30:02 -0500
+
+hyperic-sigar (1.6.4+dfsg-6) experimental; urgency=medium
+
+  * Team upload.
+  * Disabling cc -m64 cc flag on all architectures (Closes: #997807).
+  * Renaming no-m64-mips-arm.diff -> no-m64.patch.
+
+ -- Andrius Merkys <merkys at debian.org>  Mon, 25 Oct 2021 02:02:47 -0400
+
 hyperic-sigar (1.6.4+dfsg-5) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/no-m64-mips-arm.diff deleted
=====================================
@@ -1,14 +0,0 @@
-Index: hyperic-sigar-1.6.4+dfsg/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
-===================================================================
---- hyperic-sigar-1.6.4+dfsg.orig/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java	2014-11-03 13:25:30.620030459 +0800
-+++ hyperic-sigar-1.6.4+dfsg/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java	2014-11-03 13:25:30.608030459 +0800
-@@ -75,7 +75,8 @@
-         if (ArchName.is64()) {
-             getProject().setProperty("jni.arch64", "true");
-             if (ArchLoader.IS_LINUX) {
--                if (!osArch.equals("ia64")) {
-+                if (!osArch.equals("ia64") && !osArch.equals("mips64el")
-+                      && !osArch.equals("mips64") && !osArch.equals("aarch64")) {
-                     getProject().setProperty("jni.gccm", "-m64");
-                 }
-             }


=====================================
debian/patches/no-m64.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Removing cc -m64 flag to fix build on mips64el, mips64, aarch64
+ and riscv64 (Closes: #997807). Thanks Aurelien Jarno.
+Author: Andrius Merkys <merkys at debian.org>
+--- a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
++++ b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
+@@ -74,11 +74,11 @@
+ 
+         if (ArchName.is64()) {
+             getProject().setProperty("jni.arch64", "true");
+-            if (ArchLoader.IS_LINUX) {
++            /* if (ArchLoader.IS_LINUX) {
+                 if (!osArch.equals("ia64")) {
+                     getProject().setProperty("jni.gccm", "-m64");
+                 }
+-            }
++            } */
+         }
+         else {
+             if (ArchLoader.IS_LINUX && osArch.equals("s390")) {


=====================================
debian/patches/series
=====================================
@@ -2,7 +2,7 @@
 0002-bindings-java-fix-java-build-script.patch
 0003-bindings-java-Use-sane-name-for-JNI-library.patch
 0004-make-the-package-compile-on-MIPS.patch
-no-m64-mips-arm.diff
+no-m64.patch
 ftbfs-glibc-2.28.diff
 fix-undefined-symbols.patch
 rpc.patch


=====================================
debian/watch
=====================================
@@ -1,5 +1,3 @@
-version=3
-
-opts=dversionmangle=s/\+dfsg.*$// \
-    http://sf.net/sigar/hyperic-sigar-(.*)-src\.tar\.gz
-
+version=4
+opts=dversionmangle=auto \
+ http://sf.net/sigar/hyperic-sigar-(.*)-src\.tar\.gz



View it on GitLab: https://salsa.debian.org/java-team/hyperic-sigar/-/compare/0e45ae775e1c3c7a04accc6038e86ca5896504ae...fb720ecc3deca56ef361716065937b1f0555674e

-- 
View it on GitLab: https://salsa.debian.org/java-team/hyperic-sigar/-/compare/0e45ae775e1c3c7a04accc6038e86ca5896504ae...fb720ecc3deca56ef361716065937b1f0555674e
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/20211109/c4dd7bfb/attachment.htm>