git: 59d0fbddd388 - main - lang/spidermonkey*: Fix build with ICU 76.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sat, 18 Jan 2025 22:22:55 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=59d0fbddd38882adc9224ad44c193551d9a68fee

commit 59d0fbddd38882adc9224ad44c193551d9a68fee
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-01-18 22:19:39 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-01-18 22:19:44 +0000

    lang/spidermonkey*: Fix build with ICU 76.1
    
    Link with both icu-uc and icu-i18n
    
    Reference:
    https://src.fedoraproject.org/rpms/mozjs115/blob/23148a636b715c72899774aa846e34c7947000c6/f/mozjs115.spec#_125
    
    Approved by:    portmgr (blanket)
---
 lang/spidermonkey102/Makefile | 1 +
 lang/spidermonkey115/Makefile | 1 +
 lang/spidermonkey128/Makefile | 1 +
 lang/spidermonkey78/Makefile  | 1 +
 lang/spidermonkey91/Makefile  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/lang/spidermonkey102/Makefile b/lang/spidermonkey102/Makefile
index 93605d2e069d..8a1116001c47 100644
--- a/lang/spidermonkey102/Makefile
+++ b/lang/spidermonkey102/Makefile
@@ -70,6 +70,7 @@ USE_GCC=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
+	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 	@${FIND} ${WRKSRC}/python/mozbuild -name *.py -exec \
 		${REINPLACE_CMD} 's|"rU"|"r"|g' {} \;
 
diff --git a/lang/spidermonkey115/Makefile b/lang/spidermonkey115/Makefile
index 6d41057f91d4..cb5264d78a46 100644
--- a/lang/spidermonkey115/Makefile
+++ b/lang/spidermonkey115/Makefile
@@ -69,6 +69,7 @@ USE_GCC=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
+	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
diff --git a/lang/spidermonkey128/Makefile b/lang/spidermonkey128/Makefile
index 318dc4fbebda..81ed8c9d13b6 100644
--- a/lang/spidermonkey128/Makefile
+++ b/lang/spidermonkey128/Makefile
@@ -65,6 +65,7 @@ USE_GCC=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
+	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile
index bdf12250b81f..73f94ca67e80 100644
--- a/lang/spidermonkey78/Makefile
+++ b/lang/spidermonkey78/Makefile
@@ -71,6 +71,7 @@ USE_GCC=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
+	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 	@${FIND} ${WRKSRC}/build/pymake ${WRKSRC}/python/mozbuild -name *.py -exec \
 		${REINPLACE_CMD} "s|'rU'|'r'|g" {} \;
 
diff --git a/lang/spidermonkey91/Makefile b/lang/spidermonkey91/Makefile
index 29fb3357ab84..59725bde231a 100644
--- a/lang/spidermonkey91/Makefile
+++ b/lang/spidermonkey91/Makefile
@@ -79,6 +79,7 @@ USE_GCC=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
+	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 	@${FIND} ${WRKSRC}/python/mozbuild -name *.py -exec \
 		${REINPLACE_CMD} 's|"rU"|"r"|g' {} \;