Add support for musl libc on linux

xrootd · Dec 17, 2022 · 796896e · 796896e
1 parent 5cee590
commit 796896e
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 15 deletions.
diff --git a/src/Xrd/XrdConfig.hh b/src/Xrd/XrdConfig.hh
@@ -34,6 +34,11 @@
 #include "Xrd/XrdProtLoad.hh"
 #include "Xrd/XrdProtocol.hh"
 
+#if defined(__linux__) && defined(HAVE_MUSL_LIBC)
+#define __NEED_mode_t
+#include <bits/alltypes.h>
+#endif
+
 class XrdSysError;
 class XrdTcpMonInfo;
 class XrdNetSecurity;

diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc
@@ -46,6 +46,14 @@
 #include "XrdAcc/XrdAccGroups.hh"
 #include "XrdAcc/XrdAccPrivs.hh"
 
+#if defined(__linux__) && defined(HAVE_MUSL_LIBC)
+int innetgr(const char *netgroup, const char *host, const char *user,
+             const char *domain)
+{
+   return 0;
+}
+#endif
+
 // Additionally, this routine does not support a user in more than
 // NGROUPS_MAX groups. This is a standard unix limit defined in limits.h.
 

diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh
@@ -42,6 +42,12 @@
 #include <sys/uio.h>
 #include <cstdint>
 
+#if defined(__linux__) && defined(HAVE_MUSL_LIBC)
+#define __NEED_suseconds_t
+#define __NEED_struct_timeval
+#include <bits/alltypes.h>
+#endif
+
 namespace
 {
   class PgReadHandler;

diff --git a/src/XrdCl/XrdClMonitor.hh b/src/XrdCl/XrdClMonitor.hh
@@ -43,6 +43,12 @@
 
 #include "XrdCl/XrdClFileSystem.hh"
 
+#if defined(__linux__) && defined(HAVE_MUSL_LIBC)
+#define __NEED_suseconds_t
+#define __NEED_struct_timeval
+#include <bits/alltypes.h>
+#endif
+
 namespace XrdCl
 {
   class URL;

diff --git a/src/XrdNet/XrdNetSecurity.cc b/src/XrdNet/XrdNetSecurity.cc
@@ -40,12 +40,14 @@
 #include <sys/types.h>
 #include <Winsock2.h>
 #include <io.h>
+#include "XrdSys/XrdWin32.hh"
+#endif
+#if WIN32 || defined(__linux__) && defined(HAVE_MUSL_LIBC)
 int innetgr(const char *netgroup, const char *host, const char *user,
              const char *domain)
 {
    return 0;
 }
-#include "XrdSys/XrdWin32.hh"
 #endif
 
 #include "XrdNet/XrdNetAddr.hh"

diff --git a/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh b/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh
@@ -38,7 +38,7 @@
 #include <memory>
 #include <mutex>
 
-#if defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__)
+#if defined(__GLIBC__) || defined(HAVE_MUSL_LIBC) || defined(__BIONIC__) || defined(__CYGWIN__)
 #include <byteswap.h>
 #elif defined(__APPLE__)
 // Make sure that byte swap functions are not already defined.

diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc
@@ -37,6 +37,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/uio.h>
+#if defined(__linux__) && defined(HAVE_MUSL_LIBC)
+#include <stdio_ext.h>
+#endif
 
 #include "XrdSys/XrdSysHeaders.hh"
 #include "XrdPosix/XrdPosixLinkage.hh"
@@ -310,9 +313,11 @@ size_t XrdPosix_Fread(void *ptr, size_t size, size_t nitems, FILE *stream)
 //
         if (bytes > 0 && size) rc = bytes/size;
 #ifndef SUNX86
-#if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
+#if defined(__GLIBC__) || defined(__GNU__)
    else if (bytes < 0) stream->_flags |= _IO_ERR_SEEN;
    else                stream->_flags |= _IO_EOF_SEEN;
+#elif defined(HAVE_MUSL_LIBC)
+   else if (bytes < 0) __fseterr(stream);
 #elif defined(__APPLE__) || defined(__FreeBSD__)
    else if (bytes < 0) stream->_flags |= __SEOF;
    else                stream->_flags |= __SERR;
@@ -481,8 +486,10 @@ size_t XrdPosix_Fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream
 //
    if (bytes > 0 && size) rc = bytes/size;
 #ifndef SUNX86
-#if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
+#if defined(__GLIBC__) || defined(__GNU__)
       else stream->_flags |= _IO_ERR_SEEN;
+#elif defined(HAVE_MUSL_LIBC)
+      else  __fseterr(stream);
 #elif defined(__APPLE__) || defined(__FreeBSD__)
       else stream->_flags |= __SERR;
 #else

diff --git a/src/XrdPosix/XrdPosixLinkage.hh b/src/XrdPosix/XrdPosixLinkage.hh
@@ -40,6 +40,7 @@
 #include <unistd.h>
 
 #include "XrdPosix/XrdPosixOsDep.hh"
+#include "XrdPosix/XrdPosixXrootd.hh"
 #include "XrdSys/XrdSysPlatform.hh"
 
 /******************************************************************************/

diff --git a/src/XrdPosix/XrdPosixMap.hh b/src/XrdPosix/XrdPosixMap.hh
@@ -36,6 +36,11 @@
 #include "XrdCl/XrdClFileSystem.hh"
 #include "XrdCl/XrdClXRootDResponses.hh"
 
+#if defined(__linux__) && defined(HAVE_MUSL_LIBC)
+#define __NEED_dev_t
+#include <bits/alltypes.h>
+#endif
+
 class XrdPosixMap
 {
 public:

diff --git a/src/XrdPosix/XrdPosixPreload.cc b/src/XrdPosix/XrdPosixPreload.cc
@@ -42,6 +42,22 @@
 
 #include "XrdPosix/XrdPosixExtern.hh"
 
+#ifdef creat64
+#undef creat64
+#undef fseeko64
+#undef ftello64
+#undef ftruncate64
+#undef lseek64
+#undef open64
+#undef pread64
+#undef pwrite64
+#undef readdir64
+#undef readdir64_r
+#undef statfs64
+#undef statvfs64
+#undef truncate64
+#endif
+
 /******************************************************************************/
 /*                   G l o b a l   D e c l a r a t i o n s                    */
 /******************************************************************************/

diff --git a/src/XrdSys/XrdSysPlatform.hh b/src/XrdSys/XrdSysPlatform.hh
@@ -241,16 +241,8 @@ extern "C"
 #if defined(_AIX) || \
    (defined(XR__SUNGCC3) && !defined(__arch64__))
 #   define SOCKLEN_t size_t
-#elif defined(XR__GLIBC) || \
-   defined(__FreeBSD__) || \
-   (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) || \
-   (defined(XR__SUNGCC3) && defined(__arch64__)) || defined(__APPLE__) || \
-   (defined(__sun) && defined(_SOCKLEN_T))
-#   ifndef SOCKLEN_t
-#      define SOCKLEN_t socklen_t
-#   endif
 #elif !defined(SOCKLEN_t)
-#   define SOCKLEN_t int
+#   define SOCKLEN_t socklen_t
 #endif
 
 #ifdef _LP64

diff --git a/src/XrdSys/XrdSysPthread.hh b/src/XrdSys/XrdSysPthread.hh
@@ -351,7 +351,7 @@ enum PrefType {prefWR=1};
 
         XrdSysRWLock(PrefType ptype)
                     {
-#ifdef __linux__
+#ifdef __GLIBC__
                      pthread_rwlockattr_t attr;
                      pthread_rwlockattr_setkind_np(&attr,
                              PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
@@ -367,7 +367,7 @@ enum PrefType {prefWR=1};
 inline void ReInitialize(PrefType ptype)
 {
   pthread_rwlock_destroy(&lock);
-#ifdef __linux__
+#ifdef __GLIBC__
   pthread_rwlockattr_t attr;
   pthread_rwlockattr_setkind_np(&attr,
                      PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);