RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 05-Jul-2017 22:23:26 Branch: rpm-5_4 Handle: 2017070520232600 Modified files: (Branch: rpm-5_4) rpm/js Makefile.am extract.sh Log: - mozjs: upgrade to 52.2.1esr. Summary: Revision Changes Path 1.44.2.9 +2 -1 rpm/js/Makefile.am 1.1.2.3 +212 -156 rpm/js/extract.sh ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/js/Makefile.am ============================================================================ $ cvs diff -u -r1.44.2.8 -r1.44.2.9 Makefile.am --- rpm/js/Makefile.am 5 Jul 2017 18:11:06 -0000 1.44.2.8 +++ rpm/js/Makefile.am 5 Jul 2017 20:23:26 -0000 1.44.2.9 @@ -91,7 +91,8 @@ v8_LDFLAGS = -fsanitize=address -lv8 #MOZJS_VERSION = 45.4.0esr -MOZJS_VERSION = 45.9.0esr +#MOZJS_VERSION = 45.9.0esr +MOZJS_VERSION = 52.2.1esr MOZJS_TARBALL = firefox-${MOZJS_VERSION}.source.tar.xz MOZJS_URL = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZJS_VERSION}/source/${MOZJS_TARBALL} @@ . patch -p0 <<'@@ .' Index: rpm/js/extract.sh ============================================================================ $ cvs diff -u -r1.1.2.2 -r1.1.2.3 extract.sh --- rpm/js/extract.sh 5 Jul 2017 18:11:06 -0000 1.1.2.2 +++ rpm/js/extract.sh 5 Jul 2017 20:23:26 -0000 1.1.2.3 @@ -27,41 +27,48 @@ # headers, but only to stub out functions that fail at runtime #PYTHON=python ./configure --without-intl-api --enable-posix-nspr-emulation PYTHON=python ./configure \ - --build=x86_64-redhat-linux-gnu --host=x86_64-redhat-linux-gnu \ - --program-prefix= \ - --disable-dependency-tracking \ + --host=x86_64-redhat-linux-gnu --target=x86_64-redhat-linux-gnu \ --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --includedir=/usr/include \ --libdir=/usr/lib64 \ - --libexecdir=/usr/libexec \ - --localstatedir=/var \ - --sharedstatedir=/var/lib \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ --enable-optimize \ --enable-pie \ --enable-posix-nspr-emulation \ --enable-readline \ --enable-release \ --enable-shared-js \ - --enable-system-ffi \ - --enable-xterm-updates \ --with-pthreads \ - --with-system-icu \ --with-system-zlib \ - --with-intl-api \ - --enable-gczeal \ - --enable-more-deterministic + --without-intl-api \ + --enable-gczeal + +# --enable-gczeal +# --enable-more-deterministic # --enable-ctypes # --enable-gc-trace # --enable-jitspew -echo "CPPSRCS += \$(DEPTH)/mfbt/Unified_cpp_mfbt0.cpp \$(DEPTH)/../../mfbt/Compression.cpp \$(DEPTH)/../../mfbt/decimal/Decimal.cpp" >> js/src/backend.mk +# --build=x86_64-redhat-linux-gnu --host=x86_64-redhat-linux-gnu +# --program-prefix= +# --disable-dependency-tracking +# --exec-prefix=/usr +# --bindir=/usr/bin +# --sbindir=/usr/sbin +# --sysconfdir=/etc +# --datadir=/usr/share +# --includedir=/usr/include +# --libexecdir=/usr/libexec +# --localstatedir=/var +# --sharedstatedir=/var/lib +# --mandir=/usr/share/man +# --infodir=/usr/share/info +# --enable-system-ffi +# --enable-xterm-updates +# --with-system-icu +# --with-intl-api +# --enable-gczeal +# --enable-more-deterministic + +#echo "CPPSRCS += \$(DEPTH)/mfbt/Unified_cpp_mfbt0.cpp \$(DEPTH)/../../mfbt/Compression.cpp \$(DEPTH)/../../mfbt/decimal/Decimal.cpp" >> js/src/backend.mk #echo "STATIC_LIBS += \$(DEPTH)/mfbt/libmfbt.a" >> js/src/backend.mk # skipping icu and relying on posix nspr emulation all helps. After that we @@ -75,12 +82,19 @@ cp mozilla-release/js/src/js/src/jsautokw.h extract/js/src # mfbt doesn't change by arch or platform, so keep the same unified cpp -mkdir extract/js/src/mfbt -cp mozilla-release/js/src/mfbt/Unified_cpp_mfbt0.cpp extract/js/src/mfbt +if [ -f mozilla-release/js/src/mfbt/Unified_cpp_mfbt0.cpp ]; then + mkdir -p extract/js/src/mfbt -sed 's/#include ".*\/mfbt\//#include "/' < extract/js/src/mfbt/Unified_cpp_mfbt0.cpp > t1 -sed 's/#error ".*\/mfbt\//#error "/' < t1 > extract/js/src/mfbt/Unified_cpp_mfbt0.cpp -rm t1 + cp mozilla-release/js/src/mfbt/Unified_cpp_mfbt0.cpp extract/js/src/mfbt + sed 's/#include ".*\/mfbt\//#include "/' < extract/js/src/mfbt/Unified_cpp_mfbt0.cpp > t1 + sed 's/#error ".*\/mfbt\//#error "/' < t1 > extract/js/src/mfbt/Unified_cpp_mfbt0.cpp + rm t1 + + cp mozilla-release/js/src/mfbt/Unified_cpp_mfbt1.cpp extract/js/src/mfbt + sed 's/#include ".*\/mfbt\//#include "/' < extract/js/src/mfbt/Unified_cpp_mfbt1.cpp > t1 + sed 's/#error ".*\/mfbt\//#error "/' < t1 > extract/js/src/mfbt/Unified_cpp_mfbt1.cpp + rm t1 +fi # stuff we can toss rm -rf \ @@ -129,143 +143,185 @@ extract/js/src/vtune # this is all of the EXPORTS files from the moz.build's -mkdir include -cp extract/js/src/js.msg include -cp extract/js/src/jsalloc.h include -cp extract/js/src/jsapi.h include -cp extract/js/src/jsbytecode.h include -cp extract/js/src/jsclist.h include -cp extract/js/src/jscpucfg.h include -cp extract/js/src/jsfriendapi.h include -cp extract/js/src/jsprf.h include -cp extract/js/src/jsprototypes.h include -cp extract/js/src/jspubtd.h include -cp extract/js/src/jstypes.h include -cp extract/js/src/jsversion.h include -cp extract/js/src/jswrapper.h include -cp extract/js/src/perf/jsperf.h include +mkdir -p include +FILES=" + js.msg + jsalloc.h + jsapi.h + jsbytecode.h + jsclist.h + jscpucfg.h + jsfriendapi.h + jsprf.h + jsprototypes.h + jspubtd.h + jstypes.h + jsversion.h + jswrapper.h + perf/jsperf.h +" +for F in $FILES; do + cp extract/js/src/$F include +done # this is all of the EXPORTS.js files from the moz.build's -mkdir include/js -cp extract/js/public/CallArgs.h include/js -cp extract/js/public/CallNonGenericMethod.h include/js -cp extract/js/public/CharacterEncoding.h include/js -cp extract/js/public/Class.h include/js -cp extract/js/public/Conversions.h include/js -cp extract/js/public/Date.h include/js -cp extract/js/public/Debug.h include/js -cp extract/js/public/GCAPI.h include/js -cp extract/js/public/GCHashTable.h include/js -cp extract/js/public/HashTable.h include/js -cp extract/js/public/HeapAPI.h include/js -cp extract/js/public/Id.h include/js -cp extract/js/public/Initialization.h include/js -cp extract/js/public/LegacyIntTypes.h include/js -cp extract/js/public/MemoryMetrics.h include/js -cp extract/js/public/Principals.h include/js -cp extract/js/public/ProfilingFrameIterator.h include/js -cp extract/js/public/ProfilingStack.h include/js -cp extract/js/public/Proxy.h include/js -cp extract/js/public/RequiredDefines.h include/js -cp extract/js/public/RootingAPI.h include/js -cp extract/js/public/SliceBudget.h include/js -cp extract/js/public/StructuredClone.h include/js -cp extract/js/public/TraceKind.h include/js -cp extract/js/public/TraceableVector.h include/js -cp extract/js/public/TracingAPI.h include/js -cp extract/js/public/TrackedOptimizationInfo.h include/js -cp extract/js/public/TypeDecls.h include/js -cp extract/js/public/UbiNode.h include/js -cp extract/js/public/UbiNodeBreadthFirst.h include/js -cp extract/js/public/UbiNodeCensus.h include/js -cp extract/js/public/Utility.h include/js -cp extract/js/public/Value.h include/js -cp extract/js/public/Vector.h include/js -cp extract/js/public/WeakMapPtr.h include/js +mkdir -p include/js +FILES=" + CallArgs.h + CallNonGenericMethod.h + CharacterEncoding.h + Class.h + Conversions.h + Date.h + Debug.h + GCAnnotations.h + GCAPI.h + GCHashTable.h + GCPolicyAPI.h + GCVariant.h + GCVector.h + HashTable.h + HeapAPI.h + Id.h + Initialization.h + LegacyIntTypes.h + MemoryMetrics.h + Principals.h + ProfilingFrameIterator.h + ProfilingStack.h + Proxy.h + Realm.h + RequiredDefines.h + RootingAPI.h + SliceBudget.h + StructuredClone.h + SweepingAPI.h + TraceKind.h + TraceableVector.h + TracingAPI.h + TrackedOptimizationInfo.h + TypeDecls.h + UbiNode.h + UbiNodeBreadthFirst.h + UbiNodeCensus.h + UbiNodeDominatorTree.h + UbiNodePostOrder.h + UbiNodeShortestPaths.h + UniquePtr.h + Utility.h + Value.h + Vector.h + WeakMapPtr.h +" +for F in $FILES; do + [ -f extract/js/public/$F ] && cp extract/js/public/$F include/js +done # this is all of the EXPORTS.mozilla files from the moz.build's -mkdir include/mozilla -cp extract/mfbt/Alignment.h include/mozilla -cp extract/mfbt/AllocPolicy.h include/mozilla -cp extract/mfbt/AlreadyAddRefed.h include/mozilla -cp extract/mfbt/Array.h include/mozilla -cp extract/mfbt/ArrayUtils.h include/mozilla -cp extract/mfbt/Assertions.h include/mozilla -cp extract/mfbt/Atomics.h include/mozilla -cp extract/mfbt/Attributes.h include/mozilla -cp extract/mfbt/BinarySearch.h include/mozilla -cp extract/mfbt/BloomFilter.h include/mozilla -cp extract/mfbt/Casting.h include/mozilla -cp extract/mfbt/ChaosMode.h include/mozilla -cp extract/mfbt/Char16.h include/mozilla -cp extract/mfbt/CheckedInt.h include/mozilla -cp extract/mfbt/Compiler.h include/mozilla -cp extract/mfbt/Compression.h include/mozilla -cp extract/mfbt/DebugOnly.h include/mozilla -cp extract/mfbt/double-conversion/double-conversion.h include/mozilla -cp extract/mfbt/double-conversion/utils.h include/mozilla -cp extract/mfbt/Endian.h include/mozilla -cp extract/mfbt/EnumeratedArray.h include/mozilla -cp extract/mfbt/EnumeratedRange.h include/mozilla -cp extract/mfbt/EnumSet.h include/mozilla -cp extract/mfbt/FastBernoulliTrial.h include/mozilla -cp extract/mfbt/FloatingPoint.h include/mozilla -cp extract/mfbt/GuardObjects.h include/mozilla -cp extract/mfbt/HashFunctions.h include/mozilla -cp extract/mfbt/IntegerPrintfMacros.h include/mozilla -cp extract/mfbt/IntegerRange.h include/mozilla -cp extract/mfbt/IntegerTypeTraits.h include/mozilla -cp extract/mfbt/JSONWriter.h include/mozilla -cp extract/mfbt/Likely.h include/mozilla -cp extract/mfbt/LinkedList.h include/mozilla -cp extract/mfbt/LinuxSignal.h include/mozilla -cp extract/mfbt/WindowsVersion.h include/mozilla -cp extract/mfbt/MacroArgs.h include/mozilla -cp extract/mfbt/MacroForEach.h include/mozilla -cp extract/mfbt/MathAlgorithms.h include/mozilla -cp extract/mfbt/Maybe.h include/mozilla -cp extract/mfbt/MaybeOneOf.h include/mozilla -cp extract/mfbt/MemoryChecking.h include/mozilla -cp extract/mfbt/MemoryReporting.h include/mozilla -cp extract/mfbt/Move.h include/mozilla -cp extract/mfbt/NullPtr.h include/mozilla -cp extract/mfbt/NumericLimits.h include/mozilla -cp extract/mfbt/Opaque.h include/mozilla -cp extract/mfbt/Pair.h include/mozilla -cp extract/mfbt/PodOperations.h include/mozilla -cp extract/mfbt/Poison.h include/mozilla -cp extract/mfbt/Range.h include/mozilla -cp extract/mfbt/RangedPtr.h include/mozilla -cp extract/mfbt/RefCountType.h include/mozilla -cp extract/mfbt/ReentrancyGuard.h include/mozilla -cp extract/mfbt/RefPtr.h include/mozilla -cp extract/mfbt/ReverseIterator.h include/mozilla -cp extract/mfbt/RollingMean.h include/mozilla -cp extract/mfbt/Scoped.h include/mozilla -cp extract/mfbt/ScopeExit.h include/mozilla -cp extract/mfbt/SegmentedVector.h include/mozilla -cp extract/mfbt/SHA1.h include/mozilla -cp extract/mfbt/SizePrintfMacros.h include/mozilla -cp extract/mfbt/Snprintf.h include/mozilla -cp extract/mfbt/SplayTree.h include/mozilla -cp extract/mfbt/TaggedAnonymousMemory.h include/mozilla -cp extract/mfbt/TemplateLib.h include/mozilla -cp extract/mfbt/ThreadLocal.h include/mozilla -cp extract/mfbt/ToString.h include/mozilla -cp extract/mfbt/TypedEnumBits.h include/mozilla -cp extract/mfbt/Types.h include/mozilla -cp extract/mfbt/TypeTraits.h include/mozilla -cp extract/mfbt/UniquePtr.h include/mozilla -cp extract/mfbt/Variant.h include/mozilla -cp extract/mfbt/Vector.h include/mozilla -cp extract/mfbt/WeakPtr.h include/mozilla -cp extract/mfbt/unused.h include/mozilla -cp extract/mfbt/XorShift128PlusRNG.h include/mozilla +mkdir -p include/mozilla +FILES=" + Alignment.h + AllocPolicy.h + AlreadyAddRefed.h + Array.h + ArrayUtils.h + Assertions.h + Atomics.h + Attributes.h + BinarySearch.h + BloomFilter.h + BufferList.h + Casting.h + ChaosMode.h + Char16.h + CheckedInt.h + Compiler.h + Compression.h + DebugOnly.h + decimal/Decimal.h + double-conversion/double-conversion.h + double-conversion/utils.h + Endian.h + EndianUtils.h + EnumeratedArray.h + EnumeratedRange.h + EnumSet.h + EnumTypeTraits.h + FastBernoulliTrial.h + FloatingPoint.h + Function.h + GuardObjects.h + HashFunctions.h + IndexSequence.h + IntegerPrintfMacros.h + IntegerRange.h + IntegerTypeTraits.h + JSONWriter.h + Likely.h + LinkedList.h + LinuxSignal.h + MacroArgs.h + MacroForEach.h + MathAlgorithms.h + Maybe.h + MaybeOneOf.h + MemoryChecking.h + MemoryReporting.h + Move.h + NotNull.h + NullPtr.h + NumericLimits.h + Opaque.h + OperatorNewExtensions.h + Pair.h + PodOperations.h + Poison.h + Range.h + RangedArray.h + RangedPtr.h + ReentrancyGuard.h + RefCounted.h + RefCountType.h + RefPtr.h + ReverseIterator.h + RollingMean.h + Saturate.h + Scoped.h + ScopeExit.h + SegmentedVector.h + SHA1.h + SizePrintfMacros.h + Snprintf.h + SplayTree.h + Sprintf.h + StaticAnalysisFunctions.h + TaggedAnonymousMemory.h + TemplateLib.h + ThreadLocal.h + ToString.h + Tuple.h + TypedEnumBits.h + Types.h + TypeTraits.h + UniquePtr.h + UniquePtrExtensions.h + unused.h + Unused.h + Variant.h + Vector.h + WeakPtr.h + WindowsVersion.h + XorShift128PlusRNG.h +" +for F in $FILES; do + [ -f extract/mfbt/$F ] && cp extract/mfbt/$F include/mozilla +done -# Apply a local patch +# Apply a local patch (best effort) if [ -d mongo_patches ]; then git apply -p4 \ mongo_patches/SERVER-23358.patch \ mongo_patches/SERVER-24400.patch \ - mongo_patches/SERVER-22927-x86_64.patch + mongo_patches/SERVER-22927-x86_64.patch \ + || : fi @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
