commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [commons-daemon] branch master updated: psupport.m4: remove incorrect definition
Date Thu, 20 Feb 2020 13:48:34 GMT
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git


The following commit(s) were added to refs/heads/master by this push:
     new d725d2f  psupport.m4: remove incorrect definition
d725d2f is described below

commit d725d2feb64681d38ce0eb9794872729abe2c4f5
Author: Ray Wang <wangray1021@gmail.com>
AuthorDate: Fri Feb 14 15:02:03 2020 +0800

    psupport.m4: remove incorrect definition
    
    Fix jsvc build error on s390, arm, aarch64, mipsel, mips. jni_md.h file
    could not be found, due to incorrent definition ‘supported_os’. it should
    not be defined as the architecture of the cpu.
---
 src/changes/changes.xml              | 5 +++++
 src/native/unix/support/apsupport.m4 | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 99d90e6..0a94cdf 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -53,6 +53,11 @@
       <action type="add" dev="markt">
         procrun. Add additional debug logging for Java start mode.
       </action>
+      <action type="fix" dev="markt" due-to="Ray Wang">
+        jsvc. Remove incorrent definition 'supported_os' which defined in 
+        psupport.m4 file to fix jsvc build error on s390, arm, aarch64, 
+        mipsel and mips. 
+      </action>
     </release>
     <release version="1.2.2" date="2019-10-04" description="Bug fix release">
       <action issue="DAEMON-408" type="fix" dev="markt">
diff --git a/src/native/unix/support/apsupport.m4 b/src/native/unix/support/apsupport.m4
index 2d58d4a..94f4961 100644
--- a/src/native/unix/support/apsupport.m4
+++ b/src/native/unix/support/apsupport.m4
@@ -118,17 +118,14 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
     ;;
   mips*el)
     CFLAGS="$CFLAGS -DCPU=\\\"mipsel\\\""
-    supported_os="mipsel"
     HOST_CPU=mipsel
     ;;
   mips*)
     CFLAGS="$CFLAGS -DCPU=\\\"mips\\\""
-    supported_os="mips"
     HOST_CPU=mips
     ;;
   alpha*)
     CFLAGS="$CFLAGS -DCPU=\\\"alpha\\\""
-    supported_os="alpha"
     HOST_CPU=alpha
     ;;
   hppa2.0w|hppa64)
@@ -174,17 +171,14 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
     HOST_CPU=$host_cpu;;
   s390 | s390x)
     CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
-    supported_os="s390"
     HOST_CPU=s390
     ;;
   arm*)
     CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
-    supported_os="arm"
     HOST_CPU=arm
     ;;
   aarch64)
     CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
-    supported_os="aarch64"
     HOST_CPU=aarch64
     ;;
   *)


Mime
View raw message