pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
spidermonkey31: Fix build
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sun Oct 9 15:45:39 2016 +0200
Changeset: 770775c2be599ed15da4b151ce2cc3b72d9d1453
Modified Files:
spidermonkey31/Makefile
spidermonkey31/PLIST
Log Message:
spidermonkey31: Fix build
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=770775c2be599ed15da4b151ce2cc3b72d9d1453
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
spidermonkey31/Makefile | 16 +++--
spidermonkey31/PLIST | 184 +++++++++++++++++++++++++++---------------------
2 files changed, 115 insertions(+), 85 deletions(-)
diffs:
diff --git a/spidermonkey31/Makefile b/spidermonkey31/Makefile
index 432ea7c..5cf4a84 100644
--- a/spidermonkey31/Makefile
+++ b/spidermonkey31/Makefile
@@ -26,6 +26,8 @@ CONFIGURE_ARGS+= --enable-threadsafe
CONFIGURE_ARGS+= --with-system-icu
CONFIGURE_ARGS+= --with-system-nspr
+MAKE_JOBS_SAFE= no
+
PKGCONFIG_OVERRIDE+= ctypes/libffi/libffi.pc.in
PKGCONFIG_OVERRIDE+= js.pc.in
@@ -36,6 +38,8 @@ PYTHON_FOR_BUILD_ONLY= yes
.include "../../lang/python/application.mk"
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
+CXXFLAGS+= -fpermissive # converting to 'bool' from 'std::nullptr_t'
+
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} == "x86_64"
@@ -46,13 +50,13 @@ PLIST_SUBST+= ARCH=${MACHINE_ARCH}
post-install:
.if ${OPSYS} == "Darwin"
- install_name_tool -id ${PREFIX}/lib/libmozjs-24.dylib \
- ${DESTDIR}${PREFIX}/lib/libmozjs-24.dylib
+ install_name_tool -id ${PREFIX}/lib/libmozjs-31.dylib \
+ ${DESTDIR}${PREFIX}/lib/libmozjs-31.dylib
.endif
- ${CHMOD} -x ${DESTDIR}${PREFIX}/include/mozjs-24/*.*
- ${CHMOD} -x ${DESTDIR}${PREFIX}/include/mozjs-24/*/*.*
- ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/libmozjs-24.a
- ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/pkgconfig/mozjs-24.pc
+ ${CHMOD} -x ${DESTDIR}${PREFIX}/include/mozjs-31/*.*
+ ${CHMOD} -x ${DESTDIR}${PREFIX}/include/mozjs-31/*/*.*
+ ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/libmozjs-31.a
+ ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/pkgconfig/mozjs-31.pc
.include "../../devel/libffi/buildlink3.mk"
.include "../../devel/nspr/buildlink3.mk"
diff --git a/spidermonkey31/PLIST b/spidermonkey31/PLIST
index 5d4ff68..1f7a911 100644
--- a/spidermonkey31/PLIST
+++ b/spidermonkey31/PLIST
@@ -1,79 +1,105 @@
-@comment $NetBSD: PLIST,v 1.1 2014/02/06 15:12:17 fhajny Exp $
-bin/js24
-bin/js24-config
-include/mozjs-24/js-config.h
-include/mozjs-24/js.msg
-include/mozjs-24/js/Anchor.h
-include/mozjs-24/js/CallArgs.h
-include/mozjs-24/js/CharacterEncoding.h
-include/mozjs-24/js/Date.h
-include/mozjs-24/js/GCAPI.h
-include/mozjs-24/js/HashTable.h
-include/mozjs-24/js/HeapAPI.h
-include/mozjs-24/js/LegacyIntTypes.h
-include/mozjs-24/js/MemoryMetrics.h
-include/mozjs-24/js/PropertyKey.h
-include/mozjs-24/js/RequiredDefines.h
-include/mozjs-24/js/RootingAPI.h
-include/mozjs-24/js/TemplateLib.h
-include/mozjs-24/js/Utility.h
-include/mozjs-24/js/Value.h
-include/mozjs-24/js/Vector.h
-include/mozjs-24/jsalloc.h
-include/mozjs-24/jsapi.h
-include/mozjs-24/jsclass.h
-include/mozjs-24/jsclist.h
-include/mozjs-24/jscpucfg.h
-include/mozjs-24/jsdbgapi.h
-include/mozjs-24/jsfriendapi.h
-include/mozjs-24/jslock.h
-include/mozjs-24/jsperf.h
-include/mozjs-24/jsprf.h
-include/mozjs-24/jsprototypes.h
-include/mozjs-24/jsproxy.h
-include/mozjs-24/jsprvtd.h
-include/mozjs-24/jspubtd.h
-include/mozjs-24/jstypes.h
-include/mozjs-24/jsutil.h
-include/mozjs-24/jsversion.h
-include/mozjs-24/jswrapper.h
-include/mozjs-24/mozilla/Assertions.h
-include/mozjs-24/mozilla/Atomics.h
-include/mozjs-24/mozilla/Attributes.h
-include/mozjs-24/mozilla/BloomFilter.h
-include/mozjs-24/mozilla/Casting.h
-include/mozjs-24/mozilla/Char16.h
-include/mozjs-24/mozilla/CheckedInt.h
-include/mozjs-24/mozilla/Compiler.h
-include/mozjs-24/mozilla/Constants.h
-include/mozjs-24/mozilla/DebugOnly.h
-include/mozjs-24/mozilla/Decimal.h
-include/mozjs-24/mozilla/Endian.h
-include/mozjs-24/mozilla/EnumSet.h
-include/mozjs-24/mozilla/FloatingPoint.h
-include/mozjs-24/mozilla/GuardObjects.h
-include/mozjs-24/mozilla/HashFunctions.h
-include/mozjs-24/mozilla/Likely.h
-include/mozjs-24/mozilla/LinkedList.h
-include/mozjs-24/mozilla/MSStdInt.h
-include/mozjs-24/mozilla/MathAlgorithms.h
-include/mozjs-24/mozilla/MemoryChecking.h
-include/mozjs-24/mozilla/NullPtr.h
-include/mozjs-24/mozilla/PodOperations.h
-include/mozjs-24/mozilla/Poison.h
-include/mozjs-24/mozilla/Range.h
-include/mozjs-24/mozilla/RangedPtr.h
-include/mozjs-24/mozilla/RefPtr.h
-include/mozjs-24/mozilla/SHA1.h
-include/mozjs-24/mozilla/Scoped.h
-include/mozjs-24/mozilla/SplayTree.h
-include/mozjs-24/mozilla/StandardInteger.h
-include/mozjs-24/mozilla/ThreadLocal.h
-include/mozjs-24/mozilla/TypeTraits.h
-include/mozjs-24/mozilla/TypedEnum.h
-include/mozjs-24/mozilla/Types.h
-include/mozjs-24/mozilla/Util.h
-include/mozjs-24/mozilla/WeakPtr.h
-lib/libmozjs-24.a
-lib/libmozjs-24.so
-lib/pkgconfig/mozjs-24.pc
+@comment $NetBSD$
+bin/js
+bin/js-config
+include/mozjs-31/js.msg
+include/mozjs-31/js/Anchor.h
+include/mozjs-31/js/CallArgs.h
+include/mozjs-31/js/CallNonGenericMethod.h
+include/mozjs-31/js/CharacterEncoding.h
+include/mozjs-31/js/Class.h
+include/mozjs-31/js/Date.h
+include/mozjs-31/js/GCAPI.h
+include/mozjs-31/js/HashTable.h
+include/mozjs-31/js/HeapAPI.h
+include/mozjs-31/js/Id.h
+include/mozjs-31/js/LegacyIntTypes.h
+include/mozjs-31/js/MemoryMetrics.h
+include/mozjs-31/js/OldDebugAPI.h
+include/mozjs-31/js/Principals.h
+include/mozjs-31/js/ProfilingStack.h
+include/mozjs-31/js/PropertyKey.h
+include/mozjs-31/js/RequiredDefines.h
+include/mozjs-31/js/RootingAPI.h
+include/mozjs-31/js/SliceBudget.h
+include/mozjs-31/js/StructuredClone.h
+include/mozjs-31/js/TracingAPI.h
+include/mozjs-31/js/TypeDecls.h
+include/mozjs-31/js/Utility.h
+include/mozjs-31/js/Value.h
+include/mozjs-31/js/Vector.h
+include/mozjs-31/js/WeakMapPtr.h
+include/mozjs-31/jsalloc.h
+include/mozjs-31/jsapi.h
+include/mozjs-31/jsbytecode.h
+include/mozjs-31/jsclist.h
+include/mozjs-31/jscpucfg.h
+include/mozjs-31/jsfriendapi.h
+include/mozjs-31/jsperf.h
+include/mozjs-31/jsprf.h
+include/mozjs-31/jsprototypes.h
+include/mozjs-31/jsproxy.h
+include/mozjs-31/jspubtd.h
+include/mozjs-31/jstypes.h
+include/mozjs-31/jsversion.h
+include/mozjs-31/jswrapper.h
+include/mozjs-31/mozilla/Alignment.h
+include/mozjs-31/mozilla/AllocPolicy.h
+include/mozjs-31/mozilla/Array.h
+include/mozjs-31/mozilla/ArrayUtils.h
+include/mozjs-31/mozilla/Assertions.h
+include/mozjs-31/mozilla/Atomics.h
+include/mozjs-31/mozilla/Attributes.h
+include/mozjs-31/mozilla/BinarySearch.h
+include/mozjs-31/mozilla/BloomFilter.h
+include/mozjs-31/mozilla/Casting.h
+include/mozjs-31/mozilla/ChaosMode.h
+include/mozjs-31/mozilla/Char16.h
+include/mozjs-31/mozilla/CheckedInt.h
+include/mozjs-31/mozilla/Compiler.h
+include/mozjs-31/mozilla/Compression.h
+include/mozjs-31/mozilla/Constants.h
+include/mozjs-31/mozilla/DebugOnly.h
+include/mozjs-31/mozilla/Decimal.h
+include/mozjs-31/mozilla/Endian.h
+include/mozjs-31/mozilla/EnumSet.h
+include/mozjs-31/mozilla/EnumeratedArray.h
+include/mozjs-31/mozilla/FloatingPoint.h
+include/mozjs-31/mozilla/GuardObjects.h
+include/mozjs-31/mozilla/HashFunctions.h
+include/mozjs-31/mozilla/IntegerPrintfMacros.h
+include/mozjs-31/mozilla/IntegerTypeTraits.h
+include/mozjs-31/mozilla/Likely.h
+include/mozjs-31/mozilla/LinkedList.h
+include/mozjs-31/mozilla/MSIntTypes.h
+include/mozjs-31/mozilla/MacroArgs.h
+include/mozjs-31/mozilla/MacroForEach.h
+include/mozjs-31/mozilla/MathAlgorithms.h
+include/mozjs-31/mozilla/Maybe.h
+include/mozjs-31/mozilla/MemoryChecking.h
+include/mozjs-31/mozilla/MemoryReporting.h
+include/mozjs-31/mozilla/Move.h
+include/mozjs-31/mozilla/NullPtr.h
+include/mozjs-31/mozilla/NumericLimits.h
+include/mozjs-31/mozilla/PodOperations.h
+include/mozjs-31/mozilla/Poison.h
+include/mozjs-31/mozilla/Range.h
+include/mozjs-31/mozilla/RangedPtr.h
+include/mozjs-31/mozilla/ReentrancyGuard.h
+include/mozjs-31/mozilla/RefCountType.h
+include/mozjs-31/mozilla/RefPtr.h
+include/mozjs-31/mozilla/RollingMean.h
+include/mozjs-31/mozilla/SHA1.h
+include/mozjs-31/mozilla/Scoped.h
+include/mozjs-31/mozilla/SplayTree.h
+include/mozjs-31/mozilla/TemplateLib.h
+include/mozjs-31/mozilla/ThreadLocal.h
+include/mozjs-31/mozilla/TypeTraits.h
+include/mozjs-31/mozilla/TypedEnum.h
+include/mozjs-31/mozilla/TypedEnumBits.h
+include/mozjs-31/mozilla/TypedEnumInternal.h
+include/mozjs-31/mozilla/Types.h
+include/mozjs-31/mozilla/Vector.h
+include/mozjs-31/mozilla/WeakPtr.h
+lib/libmozjs-31.a
+lib/libmozjs-31.so
+lib/pkgconfig/mozjs-31.pc
Home |
Main Index |
Thread Index |
Old Index