commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ebo...@apache.org
Subject svn commit: r1528116 - in /commons/proper/daemon/branches/1.0.x: ./ src/native/unix/support/apsupport.m4
Date Tue, 01 Oct 2013 15:16:41 GMT
Author: ebourg
Date: Tue Oct  1 15:16:40 2013
New Revision: 1528116

URL: http://svn.apache.org/r1528116
Log:
Merged revision(s) 1458896 from commons/proper/daemon/trunk:
Integrated Debian patches adding support for kFreeBSD, GNU Hurd, PowerPC SPE, s390x, Renesas
SH4 (DAEMON-289)

Modified:
    commons/proper/daemon/branches/1.0.x/   (props changed)
    commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4

Propchange: commons/proper/daemon/branches/1.0.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /commons/proper/daemon/trunk:1458896

Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4?rev=1528116&r1=1528115&r2=1528116&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/support/apsupport.m4 Tue Oct  1 15:16:40
2013
@@ -73,13 +73,23 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
     LDFLAGS="$LDFLAGS -ldl"
     supported_os="aix5"
     ;;
+  kfreebsd*-gnu)
+    CFLAGS="$CFLAGS -DOS_BSD -DDSO_DLFCN -pthread"
+    supported_os="kfreebsd-gnu"
+    LIBS="$LIBS -ldl -lpthread"
+    ;;
+  gnu*)
+    CFLAGS="$CFLAGS -DOS_HURD -DDSO_DLFCN -pthread "
+    supported_os="hurd-gnu"
+    LIBS="$LIBS -ldl -lpthread"
+    ;;
   *)
     AC_MSG_RESULT([failed])
     AC_MSG_ERROR([Unsupported operating system "$host_os"])
     ;;
   esac
   case $host_cpu in
-  powerpc)
+  powerpc*)
     CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
     HOST_CPU=$host_cpu
     ;;
@@ -156,7 +166,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
         HOST_CPU=ia64
     fi
     ;;
-  s390)
+  sh*)
+    CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
+    HOST_CPU=$host_cpu;;
+  s390 | s390x)
     CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
     supported_os="s390"
     HOST_CPU=s390



Mime
View raw message