pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
(math/R) Add SUBST_MESSAGE.strtoi, reduce pkglint flags
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By: mef
Date: Sat Jan 6 08:27:38 2024 +0900
Changeset: 4ad7cbe56977c7695f016e35e6160f396cab8503
Modified Files:
R/COMMIT_MSG
R/Makefile
Log Message:
(math/R) Add SUBST_MESSAGE.strtoi, reduce pkglint flags
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4ad7cbe56977c7695f016e35e6160f396cab8503
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
R/COMMIT_MSG | 2 +-
R/Makefile | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diffs:
diff --git a/R/COMMIT_MSG b/R/COMMIT_MSG
index 5f5e67103f..9e4b8aa228 100644
--- a/R/COMMIT_MSG
+++ b/R/COMMIT_MSG
@@ -1,4 +1,4 @@
-(math/R) Updated 4.2.3 to 4.3.2
+(math/R) Updated 4.2.3 to 4.3.2 with remedy for strtoi
- pkgsrc side change
strtoi function now conflicts with NetBSD function. Renaming R' side one
diff --git a/R/Makefile b/R/Makefile
index 42a5b3af07..392ee4a854 100644
--- a/R/Makefile
+++ b/R/Makefile
@@ -150,10 +150,10 @@ SUBST_SED.fixwrap= -e "s,${WRAPPER_BINDIR}/libtool,${PKG_LIBTOOL},g"
SUBST_CLASSES+= strtoi
SUBST_STAGE.strtoi= pre-configure
-
-SUBST_FILES.strtoi= \
+SUBST_MESSAGE.strtoi= Renaming strtoi to strtoiR to avoid conflict
+SUBST_FILES.strtoi= \
tests/reg-tests-1d.R \
- doc/NEWS.3 \
+ doc/NEWS.3 \
doc/html/NEWS.2.html \
doc/html/NEWS.3.html \
doc/NEWS.2 \
@@ -172,7 +172,6 @@ SUBST_FILES.strtoi= \
SUBST_SED.strtoi= -e "s,strtoi,strtoiR,g"
-
BUILDLINK_API_DEPENDS.bzip2+= bzip2>=1.0.5
# failed to convert strong functions and variables: Invalid type identifier
Home |
Main Index |
Thread Index |
Old Index