diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile index 1a1d859b3991..d91251fe33fc 100644 --- a/lang/spidermonkey78/Makefile +++ b/lang/spidermonkey78/Makefile @@ -1,91 +1,89 @@ PORTNAME= spidermonkey DISTVERSION= 78.15.0 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= lang MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source PKGNAMESUFFIX= ${SP_VER} DISTNAME= firefox-${DISTVERSION}esr.source MAINTAINER= bofh@FreeBSD.org COMMENT= Standalone JavaScript based from Mozilla 78-esr WWW= https://spidermonkey.dev/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ autoconf2.13:devel/autoconf2.13 \ rust-cbindgen>=0.8.7:devel/rust-cbindgen LIB_DEPENDS= libffi.so:devel/libffi \ libicudata.so:devel/icu \ libnspr4.so:devel/nspr USES= compiler:c++17-lang gmake localbase pathfix pkgconfig python:build \ readline tar:xz USE_LDCONFIG= yes SP_VER= 78 HAS_CONFIGURE= yes WRKSRC= ${WRKDIR}/firefox-${DISTVERSION} PATCH_WRKSRC= ${WRKDIR}/firefox-${DISTVERSION}/ CONFIGURE_OUTSOURCE= yes CONFIGURE_ARGS= --enable-application=js \ --disable-debug \ --disable-debug-symbols \ --disable-gold \ --disable-jemalloc \ --disable-tests \ --enable-optimize \ --enable-readline \ --enable-shared-js \ --prefix=${PREFIX:Q} \ --target=${CONFIGURE_TARGET} \ --with-intl-api \ --with-system-icu \ --with-system-nspr \ --with-system-zlib CONFIGURE_ENV= HOST_CC=${CC} \ HOST_CXX=${CXX} BINARY_ALIAS= python3=${PYTHON_CMD} PLIST_SUB= SP_VER=${SP_VER} .include .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} -.elif ${ARCH} == powerpc -EXTRA_PATCHES= ${FILESDIR}/extra-patch-config_makefiles_rust.mk .endif # Require newer Clang than what's in base system unless user opted out # or the base system is new enough. .if ${CHOSEN_COMPILER_TYPE} == gcc CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT} BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} USE_GCC= yes .elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) && \ ${COMPILER_VERSION} < 80 CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT} BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure @${FIND} ${WRKSRC}/build/pymake ${WRKSRC}/python/mozbuild -name *.py -exec \ ${REINPLACE_CMD} "s|'rU'|'r'|g" {} \; post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs ${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js${SP_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.* .include diff --git a/lang/spidermonkey78/files/extra-patch-config_makefiles_rust.mk b/lang/spidermonkey78/files/extra-patch-config_makefiles_rust.mk deleted file mode 100644 index 305aa3df68c4..000000000000 --- a/lang/spidermonkey78/files/extra-patch-config_makefiles_rust.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- config/makefiles/rust.mk.orig 2022-04-02 10:37:19 UTC -+++ config/makefiles/rust.mk -@@ -171,7 +171,6 @@ export LIBCLANG_PATH=$(MOZ_LIBCLANG_PATH) - export CLANG_PATH=$(MOZ_CLANG_PATH) - export PKG_CONFIG - export PKG_CONFIG_ALLOW_CROSS=1 --export RUST_BACKTRACE=full - export MOZ_TOPOBJDIR=$(topobjdir) - - # Set COREAUDIO_SDK_PATH for third_party/rust/coreaudio-sys/build.rs