From: BenJarg <BenJarg@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: root-6.24.06
Date: Thu, 13 Jan 2022 03:48:52 +0100 [thread overview]
Message-ID: <20220113024852.mapuRMwlBK9jyuArH2uDVQjfVu-CRYgJCf8orX0SePc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34647@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
There is an updated pull request by BenJarg against master on the void-packages repository
https://github.com/BenJarg/void-packages master
https://github.com/void-linux/void-packages/pull/34647
New package: root-6.24.06
- I tested the changes in this PR: YES
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES
- I built this PR locally for my native architectures (x86_64-glibc and x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/34647.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-34647.patch --]
[-- Type: text/x-diff, Size: 22952 bytes --]
From 70ab93b1302505a15f1264e4df805786a444f431 Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Tue, 4 Jan 2022 16:11:43 -0800
Subject: [PATCH 1/4] New package: R-cran-RInside-0.2.16
---
common/shlibs | 4 ++++
srcpkgs/R-cran-RInside/template | 12 ++++++++++++
2 files changed, 16 insertions(+)
create mode 100644 srcpkgs/R-cran-RInside/template
diff --git a/common/shlibs b/common/shlibs
index ebbd48a3d84c..774b7acf29ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4097,3 +4097,7 @@ libkmailconfirmbeforedeleting.so.5 kdepim-addons-21.08.3_1
libkaddressbookprivate.so.5 kaddressbook-21.08.3_1
libcodec2.so.1.0 codec2-1.0.1_1
libx86emu.so.3 libx86emu-3.4_1
+libRInside.so R-cran-RInside-0.2.16_1
+libXrdUtils.so.2 root-6.24.06_1
+libXrdClient.so.2 root-6.24.06_1
+libXrdCl.so.2 root-6.24.06_1
diff --git a/srcpkgs/R-cran-RInside/template b/srcpkgs/R-cran-RInside/template
new file mode 100644
index 000000000000..c15b30293151
--- /dev/null
+++ b/srcpkgs/R-cran-RInside/template
@@ -0,0 +1,12 @@
+# Template file for 'R-cran-RInside'
+pkgname=R-cran-RInside
+version=0.2.16
+revision=1
+build_style=R-cran
+makedepends="R-cran-Rcpp"
+short_desc="C++ classes to embed R in C++ (and C) applications"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://CRAN.R-project.org/package=RInside"
+checksum=7ae4ade128ea05f37068d59e610822ff0b277f9d39d8900f7eb31759ad5a2a0e
+shlib_provides="libRInside.so"
From f47f6e88108c9f37561abaa8caad75e3daa2d348 Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Tue, 11 Jan 2022 12:36:46 -0800
Subject: [PATCH 2/4] New package: xrootd-5.4.0
---
common/shlibs | 8 ++++++++
srcpkgs/xrootd/template | 13 +++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/xrootd/template
diff --git a/common/shlibs b/common/shlibs
index 774b7acf29ef..613a4f322b66 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4101,3 +4101,11 @@ libRInside.so R-cran-RInside-0.2.16_1
libXrdUtils.so.2 root-6.24.06_1
libXrdClient.so.2 root-6.24.06_1
libXrdCl.so.2 root-6.24.06_1
+libXrdUtils.so.3 xrootd-5.4.0_1
+libXrdCl.so.3 xrootd-5.4.0_1
+libXrdServer.so.3 xrootd-5.4.0_1
+libXrdCrypto.so.2 xrootd-5.4.0_1
+libXrdPosix.so.3 xrootd-5.4.0_1
+libXrdHttpUtils.so.2 xrootd-5.4.0_1
+libXrdSsiLib.so.2 xrootd-5.4.0_1
+libXrdCryptoLite.so.2 xrootd-5.4.0_1
diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template
new file mode 100644
index 000000000000..c4fbe1c16e39
--- /dev/null
+++ b/srcpkgs/xrootd/template
@@ -0,0 +1,13 @@
+# Template file for 'xrootd'
+pkgname=xrootd
+version=5.4.0
+revision=1
+archs="~*-musl"
+build_style=cmake
+makedepends="zlib-devel openssl-devel libuuid-devel readline-devel"
+short_desc="Low latency, scalable and fault tolerant access to data"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://xrootd.slac.stanford.edu"
+distfiles="http://xrootd.org/download/v${version}/xrootd-${version}.tar.gz"
+checksum=23bf63bbc63c8fb45dad8b907a7692624f31427001a1688135e9c8d182a3ee7d
From 05d68696ce9558345d6df653fcebf8582741259f Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Tue, 11 Jan 2022 12:38:46 -0800
Subject: [PATCH 3/4] New package: libvdt-0.4.3
---
srcpkgs/libvdt-devel | 1 +
srcpkgs/libvdt/template | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
create mode 120000 srcpkgs/libvdt-devel
create mode 100644 srcpkgs/libvdt/template
diff --git a/srcpkgs/libvdt-devel b/srcpkgs/libvdt-devel
new file mode 120000
index 000000000000..4bf35cfc4ed5
--- /dev/null
+++ b/srcpkgs/libvdt-devel
@@ -0,0 +1 @@
+./libvdt
\ No newline at end of file
diff --git a/srcpkgs/libvdt/template b/srcpkgs/libvdt/template
new file mode 100644
index 000000000000..5ee09551cf29
--- /dev/null
+++ b/srcpkgs/libvdt/template
@@ -0,0 +1,21 @@
+# Template file for 'libvdt'
+pkgname=libvdt
+version=0.4.3
+revision=1
+wrksrc="vdt-${version}"
+build_style=cmake
+makedepends="python3"
+short_desc="Collection of fast and inline implementations of mathematical functions"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/dpiparo/vdt"
+distfiles="https://github.com/dpiparo/vdt/archive/refs/tags/v${version}.tar.gz"
+checksum=705674612ebb5c182b65a8f61f4d173eb7fe7cdeee2235b402541a492e08ace1
+
+libvdt-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ }
+}
From 46f4a181cd387bfeec07c62ffacbeda7edd77bac Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Mon, 20 Dec 2021 23:55:36 -0500
Subject: [PATCH 4/4] New package: root-6.24.06
---
srcpkgs/python3-pyroot | 1 +
srcpkgs/root-R | 1 +
srcpkgs/root/INSTALL.msg | 3 +
srcpkgs/root/patches/musl.patch | 424 ++++++++++++++++++++++++++++++++
srcpkgs/root/template | 85 +++++++
5 files changed, 514 insertions(+)
create mode 120000 srcpkgs/python3-pyroot
create mode 120000 srcpkgs/root-R
create mode 100644 srcpkgs/root/INSTALL.msg
create mode 100644 srcpkgs/root/patches/musl.patch
create mode 100644 srcpkgs/root/template
diff --git a/srcpkgs/python3-pyroot b/srcpkgs/python3-pyroot
new file mode 120000
index 000000000000..9f64bd473b46
--- /dev/null
+++ b/srcpkgs/python3-pyroot
@@ -0,0 +1 @@
+./root
\ No newline at end of file
diff --git a/srcpkgs/root-R b/srcpkgs/root-R
new file mode 120000
index 000000000000..9f64bd473b46
--- /dev/null
+++ b/srcpkgs/root-R
@@ -0,0 +1 @@
+./root
\ No newline at end of file
diff --git a/srcpkgs/root/INSTALL.msg b/srcpkgs/root/INSTALL.msg
new file mode 100644
index 000000000000..05c0d055f269
--- /dev/null
+++ b/srcpkgs/root/INSTALL.msg
@@ -0,0 +1,3 @@
+Before using ROOT, source 'thisroot.sh' to set up environmental variables.
+
+$ source root/bin/thisroot.sh # also available: thisroot.{csh,fish}
diff --git a/srcpkgs/root/patches/musl.patch b/srcpkgs/root/patches/musl.patch
new file mode 100644
index 000000000000..cd0a2a46dbef
--- /dev/null
+++ b/srcpkgs/root/patches/musl.patch
@@ -0,0 +1,424 @@
+diff --git a/core/base/inc/Varargs.h b/core/base/inc/Varargs.h
+index 525f1f64a6..30983e0124 100644
+--- a/core/base/inc/Varargs.h
++++ b/core/base/inc/Varargs.h
+@@ -44,12 +44,10 @@
+ #endif
+
+ #if !defined(R__VA_COPY)
+-# if defined(__GNUC__) && !defined(__FreeBSD__)
+-# define R__VA_COPY(to, from) __va_copy((to), (from))
++# if defined(va_copy)
++# define R__VA_COPY(to, from) va_copy((to), (from))
+ # elif defined(__va_copy)
+ # define R__VA_COPY(to, from) __va_copy((to), (from))
+-# elif defined(va_copy)
+-# define R__VA_COPY(to, from) va_copy((to), (from))
+ # elif defined(_WIN32) && _MSC_VER < 1310
+ # define R__VA_COPY(to, from) (*(to) = *(from))
+ # else
+diff --git a/core/clib/src/mmapsup.c b/core/clib/src/mmapsup.c
+index 6017afd91b..daf0109977 100644
+--- a/core/clib/src/mmapsup.c
++++ b/core/clib/src/mmapsup.c
+@@ -42,13 +42,6 @@ typedef char* caddr_t;
+ #include <cygwin/version.h>
+ #endif /* __CYGWIN__ */
+
+-#if defined(R__LINUX) && !defined(R__GLIBC) && !defined(__CYGWIN__) \
+- || (defined(__CYGWIN__) && (CYGWIN_VERSION_API_MAJOR > 0 || CYGWIN_VERSION_API_MINOR < 213))
+-extern size_t getpagesize PARAMS ((void));
+-#else
+-extern int getpagesize PARAMS ((void));
+-#endif
+-
+ #ifndef SEEK_SET
+ #define SEEK_SET 0
+ #endif
+diff --git a/core/clib/src/mvalloc.c b/core/clib/src/mvalloc.c
+index ef0fdc8196..e062c2d20d 100644
+--- a/core/clib/src/mvalloc.c
++++ b/core/clib/src/mvalloc.c
+@@ -29,13 +29,6 @@ Boston, MA 02111-1307, USA. */
+ #include <cygwin/version.h>
+ #endif /* __CYGWIN__ */
+
+-#if defined(R__LINUX) && !defined(R__GLIBC) && !defined(__CYGWIN__) \
+- || (defined(__CYGWIN__) && (CYGWIN_VERSION_API_MAJOR > 0 || CYGWIN_VERSION_API_MINOR < 213))
+-extern size_t getpagesize PARAMS ((void));
+-#else
+-extern int getpagesize PARAMS ((void));
+-#endif
+-
+ #ifdef VMS
+ #undef _SC_PAGE_SIZE
+ #undef _SC_PAGESIZE
+diff --git a/core/unix/src/TUnixSystem.cxx b/core/unix/src/TUnixSystem.cxx
+index 25dfe1cf87..7f92c1146f 100644
+--- a/core/unix/src/TUnixSystem.cxx
++++ b/core/unix/src/TUnixSystem.cxx
+@@ -148,17 +148,6 @@
+ # define UTMP_NO_ADDR
+ #endif
+
+-#if (defined(R__AIX) && !defined(_AIX43)) || \
+- (defined(R__SUNGCC3) && !defined(__arch64__))
+-# define USE_SIZE_T
+-#elif defined(R__GLIBC) || defined(R__FBSD) || \
+- (defined(R__SUNGCC3) && defined(__arch64__)) || \
+- defined(R__OBSD) || defined(MAC_OS_X_VERSION_10_4) || \
+- (defined(R__AIX) && defined(_AIX43)) || \
+- (defined(R__SOLARIS) && defined(_SOCKLEN_T))
+-# define USE_SOCKLEN_T
+-#endif
+-
+ #if defined(R__LYNXOS)
+ extern "C" {
+ extern int putenv(const char *);
+@@ -214,7 +203,6 @@ extern "C" {
+
+ // FPE handling includes
+ #if (defined(R__LINUX) && !defined(R__WINGCC))
+-#include <fpu_control.h>
+ #include <fenv.h>
+ #include <sys/prctl.h> // for prctl() function used in StackTrace()
+ #endif
+@@ -3074,13 +3062,7 @@ TInetAddress TUnixSystem::GetHostByName(const char *hostname)
+ TInetAddress TUnixSystem::GetSockName(int sock)
+ {
+ struct sockaddr addr;
+-#if defined(USE_SIZE_T)
+- size_t len = sizeof(addr);
+-#elif defined(USE_SOCKLEN_T)
+ socklen_t len = sizeof(addr);
+-#else
+- int len = sizeof(addr);
+-#endif
+
+ TInetAddress ia;
+ if (getsockname(sock, &addr, &len) == -1) {
+@@ -3110,13 +3092,7 @@ TInetAddress TUnixSystem::GetSockName(int sock)
+ TInetAddress TUnixSystem::GetPeerName(int sock)
+ {
+ struct sockaddr addr;
+-#if defined(USE_SIZE_T)
+- size_t len = sizeof(addr);
+-#elif defined(USE_SOCKLEN_T)
+ socklen_t len = sizeof(addr);
+-#else
+- int len = sizeof(addr);
+-#endif
+
+ TInetAddress ia;
+ if (getpeername(sock, &addr, &len) == -1) {
+@@ -3483,13 +3459,7 @@ int TUnixSystem::GetSockOpt(int sock, int opt, int *val)
+ {
+ if (sock < 0) return -1;
+
+-#if defined(USE_SOCKLEN_T) || defined(_AIX43)
+ socklen_t optlen = sizeof(*val);
+-#elif defined(USE_SIZE_T)
+- size_t optlen = sizeof(*val);
+-#else
+- int optlen = sizeof(*val);
+-#endif
+
+ switch (opt) {
+ case kSendBuffer:
+diff --git a/interpreter/cling/lib/Interpreter/Interpreter.cpp b/interpreter/cling/lib/Interpreter/Interpreter.cpp
+index d061f04e4b..e6dca5dd90 100644
+--- a/interpreter/cling/lib/Interpreter/Interpreter.cpp
++++ b/interpreter/cling/lib/Interpreter/Interpreter.cpp
+@@ -453,7 +453,7 @@ namespace cling {
+
+ // Intercept all atexit calls, as the Interpreter and functions will be long
+ // gone when the -native- versions invoke them.
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+ const char* LinkageCxx = "extern \"C++\"";
+ const char* Attr = LangOpts.CPlusPlus ? " throw () " : "";
+ #else
+diff --git a/io/io/src/TMapFile.cxx b/io/io/src/TMapFile.cxx
+index 7fbad8621f..fddd5a9e95 100644
+--- a/io/io/src/TMapFile.cxx
++++ b/io/io/src/TMapFile.cxx
+@@ -107,9 +107,7 @@ robust Streamer mechanism I opted for 3).
+ #include <sys/types.h>
+ #include <sys/ipc.h>
+ #include <sys/sem.h>
+-#if defined(R__HPUX) || \
+- defined (R__SOLARIS) || defined(R__AIX) || defined(R__HIUX) || \
+- __GLIBC_MINOR__ > 0
++#ifndef WIN32
+ union semun {
+ int val; // value for SETVAL
+ struct semid_ds *buf; // buffer for IPC_STAT & IPC_SET
+diff --git a/math/mathcore/inc/TMath.h b/math/mathcore/inc/TMath.h
+index 55bbdbf1df..eea42c55a7 100644
+--- a/math/mathcore/inc/TMath.h
++++ b/math/mathcore/inc/TMath.h
+@@ -577,63 +577,13 @@ struct Limits {
+ // Trig and other functions
+
+ #include <float.h>
++#include <math.h>
+
+ #if defined(R__WIN32) && !defined(__CINT__)
+ # ifndef finite
+ # define finite _finite
+ # endif
+ #endif
+-#if defined(R__AIX) || defined(R__SOLARIS_CC50) || \
+- defined(R__HPUX11) || defined(R__GLIBC) || \
+- (defined(R__MACOSX) )
+-// math functions are defined inline so we have to include them here
+-# include <math.h>
+-# ifdef R__SOLARIS_CC50
+- extern "C" { int finite(double); }
+-# endif
+-// # if defined(R__GLIBC) && defined(__STRICT_ANSI__)
+-// # ifndef finite
+-// # define finite __finite
+-// # endif
+-// # ifndef isnan
+-// # define isnan __isnan
+-// # endif
+-// # endif
+-#else
+-// don't want to include complete <math.h>
+-extern "C" {
+- extern double sin(double);
+- extern double cos(double);
+- extern double tan(double);
+- extern double sinh(double);
+- extern double cosh(double);
+- extern double tanh(double);
+- extern double asin(double);
+- extern double acos(double);
+- extern double atan(double);
+- extern double atan2(double, double);
+- extern double sqrt(double);
+- extern double exp(double);
+- extern double pow(double, double);
+- extern double log(double);
+- extern double log10(double);
+-#ifndef R__WIN32
+-# if !defined(finite)
+- extern int finite(double);
+-# endif
+-# if !defined(isnan)
+- extern int isnan(double);
+-# endif
+- extern double ldexp(double, int);
+- extern double ceil(double);
+- extern double floor(double);
+-#else
+- _CRTIMP double ldexp(double, int);
+- _CRTIMP double ceil(double);
+- _CRTIMP double floor(double);
+-#endif
+-}
+-#endif
+
+ ////////////////////////////////////////////////////////////////////////////////
+ inline Double_t TMath::Sin(Double_t x)
+diff --git a/math/mathcore/src/triangle.c b/math/mathcore/src/triangle.c
+index e1990a9484..58d47cfdc9 100644
+--- a/math/mathcore/src/triangle.c
++++ b/math/mathcore/src/triangle.c
+@@ -324,7 +324,7 @@
+ #include <float.h>
+ #endif /* CPU86 */
+ #ifdef LINUX
+-#include <fpu_control.h>
++#include <fenv.h>
+ #endif /* LINUX */
+ #ifdef TRILIBRARY
+ #include "triangle.h"
+@@ -4867,7 +4867,7 @@ void exactinit()
+ REAL check, lastcheck;
+ int every_other;
+ #ifdef LINUX
+- int cword;
++ fenv_t fenv;
+ #endif /* LINUX */
+
+ #ifdef CPU86
+@@ -4879,13 +4879,13 @@ void exactinit()
+ #endif /* CPU86 */
+ #ifdef LINUX
+ #ifdef SINGLE
+- /* cword = 4223; */
+- cword = 4210; /* set FPU control word for single precision */
++ /* fenv.__control_word = 4223; */
++ fenv.__control_word = 4210; /* set FPU control word for single precision */
+ #else /* not SINGLE */
+- /* cword = 4735; */
+- cword = 4722; /* set FPU control word for double precision */
++ /* fenv.__control_word = 4735; */
++ fenv.__control_word = 4722; /* set FPU control word for double precision */
+ #endif /* not SINGLE */
+- _FPU_SETCW(cword);
++ fesetenv(&fenv);
+ #endif /* LINUX */
+
+ every_other = 1;
+diff --git a/net/rpdutils/src/daemon.cxx b/net/rpdutils/src/daemon.cxx
+index 9bdb4294a5..0d25986dc4 100644
+--- a/net/rpdutils/src/daemon.cxx
++++ b/net/rpdutils/src/daemon.cxx
+@@ -24,9 +24,7 @@
+ #include <signal.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+-#if defined(__sun) || defined(__sgi)
+-# include <fcntl.h>
+-#endif
++#include <fcntl.h>
+
+ #if defined(__linux__) && !defined(linux)
+ # define linux
+@@ -44,15 +42,6 @@
+ # define NOFILE 0
+ #endif
+
+-#if defined(__hpux)
+-#define USE_SIGCHLD
+-#endif
+-
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+-#define USE_SIGCHLD
+-#define SIGCLD SIGCHLD
+-#endif
+-
+ #if defined(linux) || defined(__hpux) || defined(__sun) || defined(__sgi) || \
+ defined(_AIX) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
+ defined(__APPLE__) || defined(__MACH__) || \
+@@ -69,23 +58,16 @@ namespace ROOT {
+
+ extern ErrorHandler_t gErrSys;
+
+-#if defined(USE_SIGCHLD)
+ ////////////////////////////////////////////////////////////////////////////////
+
+ static void SigChild(int)
+ {
+- int pid;
+-#if defined(__hpux) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
+- defined(__APPLE__)
++ int pid;
+ int status;
+-#else
+- union wait status;
+-#endif
+
+ while ((pid = wait3(&status, WNOHANG, 0)) > 0)
+ ;
+ }
+-#endif
+
+ ////////////////////////////////////////////////////////////////////////////////
+ /// Detach a daemon process from login session context.
+@@ -208,15 +190,7 @@ out:
+ // and execute the wait3() system call.
+
+ if (ignsigcld) {
+-#ifdef USE_SIGCHLD
+- signal(SIGCLD, SigChild);
+-#else
+-#if defined(__sun)
+- sigignore(SIGCHLD);
+-#else
+- signal(SIGCLD, SIG_IGN);
+-#endif
+-#endif
++ signal(SIGCHLD, SigChild);
+ }
+ }
+
+diff --git a/net/rpdutils/src/net.cxx b/net/rpdutils/src/net.cxx
+index d258e71e62..b532848985 100644
+--- a/net/rpdutils/src/net.cxx
++++ b/net/rpdutils/src/net.cxx
+@@ -31,17 +31,6 @@
+ #include <netdb.h>
+ #include <errno.h>
+
+-#if (defined(R__AIX) && !defined(_AIX43)) || \
+- (defined(R__SUNGCC3) && !defined(__arch64__))
+-# define USE_SIZE_T
+-#elif defined(R__GLIBC) || defined(R__FBSD) || \
+- (defined(R__SUNGCC3) && defined(__arch64__)) || \
+- defined(R__OBSD) || defined(MAC_OS_X_VERSION_10_4) || \
+- (defined(R__AIX) && defined(_AIX43)) || \
+- (defined(R__SOLARIS) && defined(_SOCKLEN_T))
+-# define USE_SOCKLEN_T
+-#endif
+-
+ #include "rpdp.h"
+ #include "rpderr.h"
+
+@@ -357,13 +346,7 @@ int NetRecv(char *msg, int max)
+
+ int NetOpen(int inetdflag, EService service)
+ {
+-#if defined(USE_SIZE_T)
+- size_t clilen = sizeof(gTcpCliAddr);
+-#elif defined(USE_SOCKLEN_T)
+ socklen_t clilen = sizeof(gTcpCliAddr);
+-#else
+- int clilen = sizeof(gTcpCliAddr);
+-#endif
+
+ if (inetdflag) {
+
+@@ -588,13 +571,7 @@ void NetSetOptions(EService serv, int sock, int tcpwindowsize)
+ ErrorInfo("NetSetOptions: set SO_RCVBUF %d", val);
+
+ if (gDebug > 0) {
+-#if defined(USE_SIZE_T)
+- size_t optlen = sizeof(val);
+-#elif defined(USE_SOCKLEN_T)
+ socklen_t optlen = sizeof(val);
+-#else
+- int optlen = sizeof(val);
+-#endif
+ if (serv == kROOTD) {
+ getsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char*)&val, &optlen);
+ ErrorInfo("NetSetOptions: get TCP_NODELAY: %d", val);
+diff --git a/net/rpdutils/src/netpar.cxx b/net/rpdutils/src/netpar.cxx
+index 00f759a6c9..a781ca9658 100644
+--- a/net/rpdutils/src/netpar.cxx
++++ b/net/rpdutils/src/netpar.cxx
+@@ -37,17 +37,6 @@
+ #include <strings.h>
+ #endif
+
+-#if (defined(R__AIX) && !defined(_AIX43)) || \
+- (defined(R__SUNGCC3) && !defined(__arch64__))
+-# define USE_SIZE_T
+-#elif defined(R__GLIBC) || defined(R__FBSD) || \
+- (defined(R__SUNGCC3) && defined(__arch64__)) || \
+- defined(R__OBSD) || defined(MAC_OS_X_VERSION_10_4) || \
+- (defined(R__AIX) && defined(_AIX43)) || \
+- (defined(R__SOLARIS) && defined(_SOCKLEN_T))
+-# define USE_SOCKLEN_T
+-#endif
+-
+ #include "rpdp.h"
+
+ extern int gDebug;
+@@ -201,13 +190,7 @@ int NetParOpen(int port, int size)
+ struct sockaddr_in remote_addr;
+ memset(&remote_addr, 0, sizeof(remote_addr));
+
+-#if defined(USE_SIZE_T)
+- size_t remlen = sizeof(remote_addr);
+-#elif defined(USE_SOCKLEN_T)
+ socklen_t remlen = sizeof(remote_addr);
+-#else
+- int remlen = sizeof(remote_addr);
+-#endif
+
+ if (!getpeername(NetGetSockFd(), (struct sockaddr *)&remote_addr, &remlen)) {
+ remote_addr.sin_family = AF_INET;
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
new file mode 100644
index 000000000000..b11189dc54f5
--- /dev/null
+++ b/srcpkgs/root/template
@@ -0,0 +1,85 @@
+# Template file for 'root'
+pkgname=root
+version=6.24.06
+revision=1
+# Only i686 and x86_64 seem to be officially supported
+archs="i686* x86_64*"
+build_style=cmake
+configure_args="-Dgnuinstall=ON -Druntime_cxxmodules=OFF -Dr=ON $(vopt_if fortran '-Dfortran=ON') -DXROOTD_XrdCl_LIBRARY=/usr/lib/libXrdCl.so.3 -DCMAKE_INSTALL_SYSCONFDIR='../etc/root' -DCMAKE_INSTALL_PYTHONDIR=${py3_sitelib/'usr/'}"
+hostmakedepends="git gcc-fortran"
+makedepends="libX11-devel libXpm-devel libXft-devel libXext-devel openssl-devel libpng-devel readline-devel tbb-devel liblz4-devel pcre-devel xxHash-devel libzstd-devel liblzma-devel libvdt-devel python3-devel python3-numpy R-cran-Rcpp R-cran-RInside"
+depends="gcc"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -Dssl=OFF -Dxrootd=OFF"
+ ;;
+ *)
+ makedepends+=" xrootd"
+ ;;
+esac
+short_desc="C++ framework for data processing created by CERN"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://root.cern"
+distfiles="https://root.cern/download/root_v${version}.source.tar.gz"
+checksum=907f69f4baca1e4f30eeb4979598ca7599b6aa803ca046e80e25b6bbaa0ef522
+build_options="fortran"
+build_options_default=$build_options
+python_version=3
+
+post_install() {
+ rm ${DESTDIR}/usr/share/root/fonts/LICENSE
+ rm ${DESTDIR}/usr/share/root/fonts/arialbd.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/arialbi.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/ariali.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/arial.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/ariblk.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/comicbd.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/comic.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/courbd.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/courbi.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/couri.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/cour.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/georgiab.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/georgiai.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/georgia.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/georgiaz.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/impact.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/monotype.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/timesbd.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/timesbi.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/timesi.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/times.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/trebucbd.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/trebucbi.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/trebucit.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/trebuc.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/verdanab.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/verdanai.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/verdana.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/verdanaz.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/webdings.ttf
+ rm ${DESTDIR}/usr/share/root/fonts/wingding.ttf
+}
+
+python3-pyroot_package() {
+ short_desc="Python interface to ROOT"
+ depends="root>=${version}_${revision}"
+ pkg_install() {
+ vmove ${py3_sitelib}
+ }
+}
+root-R_package() {
+ short_desc="ROOT interface to R"
+ depends="root>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include/root/RExports.h
+ vmove usr/include/root/TRDataFrame.h
+ vmove usr/include/root/TRFunctionExport.h
+ vmove usr/include/root/TRFunctionImport.h
+ vmove usr/include/root/TRInterface.h
+ vmove usr/include/root/TRInternalFunction.h
+ vmove usr/include/root/TRObject.h
+ vmove usr/lib/libRInterface.so
+ }
+}
next prev parent reply other threads:[~2022-01-13 2:48 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 16:55 [PR PATCH] " BenJarg
2021-12-21 16:59 ` [PR REVIEW] " Duncaen
2021-12-21 20:35 ` [PR PATCH] [Updated] " BenJarg
2021-12-21 20:48 ` [PR REVIEW] " BenJarg
2021-12-22 3:00 ` [PR PATCH] [Updated] " BenJarg
2021-12-23 2:47 ` BenJarg
2021-12-23 9:45 ` balejk
2021-12-23 17:24 ` BenJarg
2021-12-23 17:55 ` [PR PATCH] [Updated] " BenJarg
2021-12-24 0:17 ` BenJarg
2021-12-30 18:25 ` [PR PATCH] [Updated] " BenJarg
2021-12-30 22:22 ` Chocimier
2021-12-31 2:27 ` [PR PATCH] [Updated] " BenJarg
2021-12-31 2:40 ` BenJarg
2022-01-02 21:24 ` balejk
2022-01-02 21:34 ` balejk
2022-01-02 23:33 ` BenJarg
2022-01-03 7:43 ` [PR PATCH] [Updated] " BenJarg
2022-01-03 8:30 ` BenJarg
2022-01-03 9:22 ` balejk
2022-01-03 9:55 ` [PR PATCH] [Updated] " BenJarg
2022-01-03 10:04 ` BenJarg
2022-01-03 10:06 ` BenJarg
2022-01-03 11:03 ` balejk
2022-01-03 11:04 ` balejk
2022-01-05 2:53 ` [PR PATCH] [Updated] " BenJarg
2022-01-05 3:00 ` BenJarg
2022-01-05 14:37 ` balejk
2022-01-05 20:50 ` [PR PATCH] [Updated] " BenJarg
2022-01-05 20:57 ` BenJarg
2022-01-06 23:35 ` BenJarg
2022-01-07 22:06 ` [PR PATCH] [Updated] " BenJarg
2022-01-07 22:09 ` BenJarg
2022-01-10 18:29 ` Chocimier
2022-01-10 21:10 ` balejk
2022-01-11 23:25 ` [PR PATCH] [Updated] " BenJarg
2022-01-11 23:38 ` BenJarg
2022-01-11 23:39 ` BenJarg
2022-01-11 23:39 ` BenJarg
2022-01-11 23:39 ` BenJarg
2022-01-12 8:35 ` balejk
2022-01-13 2:48 ` BenJarg [this message]
2022-01-13 2:53 ` BenJarg
2022-01-13 5:00 ` [PR PATCH] [Updated] " BenJarg
2022-01-13 5:06 ` BenJarg
2022-01-13 5:10 ` [PR PATCH] [Updated] " BenJarg
2022-01-13 6:09 ` BenJarg
2022-01-17 7:32 ` BenJarg
2022-01-17 7:33 ` BenJarg
2022-01-18 0:13 ` [PR PATCH] [Updated] " BenJarg
2022-01-18 0:14 ` BenJarg
2022-01-18 1:38 ` [PR PATCH] [Updated] " BenJarg
2022-01-20 20:40 ` Chocimier
2022-01-21 3:47 ` [PR PATCH] [Updated] " BenJarg
2022-01-21 4:09 ` BenJarg
2022-01-28 18:31 ` [PR REVIEW] " Chocimier
2022-01-28 18:31 ` Chocimier
2022-01-28 18:31 ` Chocimier
2022-01-28 18:31 ` Chocimier
2022-01-28 18:31 ` Chocimier
2022-01-28 20:06 ` BenJarg
2022-01-28 20:33 ` [PR PATCH] [Updated] " BenJarg
2022-01-28 20:45 ` [PR REVIEW] " BenJarg
2022-01-28 21:30 ` [PR PATCH] [Updated] " BenJarg
2022-01-28 21:32 ` [PR REVIEW] " BenJarg
2022-01-28 21:38 ` Chocimier
2022-01-28 22:12 ` [PR PATCH] [Updated] " BenJarg
2022-01-28 22:51 ` [PR REVIEW] " BenJarg
2022-01-29 0:22 ` BenJarg
2022-01-29 18:52 ` Chocimier
2022-01-29 21:29 ` [PR PATCH] [Updated] " BenJarg
2022-01-29 21:30 ` [PR REVIEW] " BenJarg
2022-02-23 19:45 ` [PR PATCH] [Updated] " BenJarg
2022-02-24 5:57 ` BenJarg
2022-02-24 6:04 ` [PR REVIEW] " BenJarg
2022-03-01 18:43 ` Chocimier
2022-03-01 23:44 ` [PR PATCH] [Updated] " BenJarg
2022-03-01 23:58 ` [PR REVIEW] " BenJarg
2022-03-02 21:19 ` BenJarg
2022-03-10 21:14 ` [PR PATCH] [Updated] " BenJarg
2022-03-10 21:15 ` BenJarg
2022-03-10 21:20 ` BenJarg
2022-03-15 20:41 ` Chocimier
2022-03-17 5:24 ` [PR PATCH] [Updated] " BenJarg
2022-03-17 5:27 ` BenJarg
2022-04-04 5:38 ` [PR PATCH] [Updated] " BenJarg
2022-04-06 2:18 ` BenJarg
2022-04-20 2:24 ` BenJarg
2022-04-20 16:20 ` [PR REVIEW] " Chocimier
2022-04-20 16:20 ` Chocimier
2022-04-20 16:20 ` Chocimier
2022-04-20 16:20 ` Chocimier
2022-04-20 17:24 ` BenJarg
2022-04-20 17:25 ` [PR PATCH] [Updated] " BenJarg
2022-04-20 18:46 ` BenJarg
2022-04-20 19:05 ` [PR REVIEW] " BenJarg
2022-04-21 16:19 ` Chocimier
2022-04-21 19:49 ` [PR PATCH] [Updated] " BenJarg
2022-04-21 19:51 ` BenJarg
2022-05-05 21:43 ` [PR PATCH] [Updated] " BenJarg
2022-05-07 17:39 ` [PR PATCH] [Merged]: " Chocimier
2022-06-04 11:14 ` q66
2022-06-04 14:26 ` BenJarg
2022-06-04 14:31 ` Chocimier
2022-06-04 15:38 ` q66
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220113024852.mapuRMwlBK9jyuArH2uDVQjfVu-CRYgJCf8orX0SePc@z \
--to=benjarg@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).