pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/sysutils/R-processx



Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May 25 11:08:57 UTC 2023

Modified Files:
        pkgsrc/sysutils/R-processx: Makefile distinfo
Added Files:
        pkgsrc/sysutils/R-processx/patches: patch-src_Makevars

Log Message:
R-processx: Support LIBS, and fix SunOS build.

R inexplicably hardcodes LDFLAGS in its own shipped file so you can't specify
it for individual packages, so we need some other way to support additional
libraries.  It's also highly suboptimal that all of the compiling is done in
the install phase.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/R-processx/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/R-processx/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/R-processx/patches/patch-src_Makevars

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/R-processx/Makefile
diff -u pkgsrc/sysutils/R-processx/Makefile:1.5 pkgsrc/sysutils/R-processx/Makefile:1.6
--- pkgsrc/sysutils/R-processx/Makefile:1.5     Sun Dec 18 01:08:06 2022
+++ pkgsrc/sysutils/R-processx/Makefile Thu May 25 11:08:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/12/18 01:08:06 mef Exp $
+# $NetBSD: Makefile,v 1.6 2023/05/25 11:08:57 jperkin Exp $
 
 R_PKGNAME=     processx
 R_PKGVER=      3.8.0
@@ -16,5 +16,7 @@ DEPENDS+=     R-ps>=1.2.0:../../sysutils/R-p
 
 USE_LANGUAGES= c
 
+LIBS.SunOS+=   -lsocket -lnsl
+
 .include "../../math/R/Makefile.extension"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/R-processx/distinfo
diff -u pkgsrc/sysutils/R-processx/distinfo:1.6 pkgsrc/sysutils/R-processx/distinfo:1.7
--- pkgsrc/sysutils/R-processx/distinfo:1.6     Sun Dec 18 01:08:06 2022
+++ pkgsrc/sysutils/R-processx/distinfo Thu May 25 11:08:57 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2022/12/18 01:08:06 mef Exp $
+$NetBSD: distinfo,v 1.7 2023/05/25 11:08:57 jperkin Exp $
 
 BLAKE2s (R/processx_3.8.0.tar.gz) = d5875d901f567460a3df3d9aa2425f387d8b3aac68d46869f74903689d9a6fea
 SHA512 (R/processx_3.8.0.tar.gz) = 6ea529869a5999a6273dc5f0f01cb64ff1106f0f625251cca6d15b24127aa46c6d8aa8634bfc4c2347def1bad36b936e857b27bc2e87bdfd619a4dac5e767a85
 Size (R/processx_3.8.0.tar.gz) = 162539 bytes
+SHA1 (patch-src_Makevars) = a3e4f650d9d58db86f22e12dd65cd02608f3cdd4

Added files:

Index: pkgsrc/sysutils/R-processx/patches/patch-src_Makevars
diff -u /dev/null pkgsrc/sysutils/R-processx/patches/patch-src_Makevars:1.1
--- /dev/null   Thu May 25 11:08:57 2023
+++ pkgsrc/sysutils/R-processx/patches/patch-src_Makevars       Thu May 25 11:08:57 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_Makevars,v 1.1 2023/05/25 11:08:57 jperkin Exp $
+
+Support LIBS.
+
+--- src/Makevars.orig  2022-10-04 11:20:23.000000000 +0000
++++ src/Makevars
+@@ -11,14 +11,14 @@ OBJECTS = init.o poll.o errors.o process
+ all: tools/px tools/sock supervisor/supervisor client$(SHLIB_EXT) $(SHLIB)
+ 
+ tools/px: tools/px.c
+-      $(CC) $(CFLAGS) $(LDFLAGS) -Wall tools/px.c -o tools/px
++      $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -Wall tools/px.c -o tools/px
+ 
+ supervisor/supervisor: supervisor/supervisor.c supervisor/utils.c
+       $(CC) $(CFLAGS) $(LDFLAGS) supervisor/supervisor.c \
+             supervisor/utils.c -o supervisor/supervisor
+ 
+ tools/sock: tools/sock.c
+-      $(CC) $(CFLAGS) $(LDFLAGS) -I../inst/include -Wall tools/sock.c -o tools/sock
++      $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -I../inst/include -Wall tools/sock.c -o tools/sock
+ 
+ CLIENT_OBJECTS = base64.o client.o errors.o
+ 



Home | Main Index | Thread Index | Old Index