Skip to content

Instantly share code, notes, and snippets.

diff --git a/hphp/util/generate-buildinfo.sh b/hphp/util/generate-buildinfo.sh
index b3365e0..77195f3 100755
--- a/hphp/util/generate-buildinfo.sh
+++ b/hphp/util/generate-buildinfo.sh
@@ -79,7 +79,7 @@ fi
if [ x"$HHVM_REPO_SCHEMA" = x"" ] ; then
HHVM_REPO_SCHEMA=$(sh -c "$find_files" | \
grep -v '^hphp/\(benchmarks\|bin\|hack\|hphp\|neo\|public_tld\|test\|tools\|util\|vixl\|zend\)' | \
- xargs -d '\n' cat | sha1sum | cut -b-40)
+ xargs -d '\n' cat | shasum -a 1 | cut -b-40)
diff --git a/thrift/CMakeLists.txt b/thrift/CMakeLists.txt
index 8c46fd4..9e0eab8 100644
--- a/thrift/CMakeLists.txt
+++ b/thrift/CMakeLists.txt
@@ -60,6 +60,9 @@ list(REMOVE_ITEM files
list(APPEND CXX_SOURCES ${files})
add_definitions(-DNO_LIB_GFLAGS)
+if (APPLE)
+ add_definitions(-DTHRIFT_MUTEX_EMULATE_PTHREAD_TIMEDLOCK)
#!/bin/sh
CURRENT_DIRECTORY=$PWD
OUTPUT_DIRECTORY=patches/graphql
MAGENTO_DIRECTORY=$1
FROM_VERSION=$2
TO_VERSION=$3
mkdir -p $OUTPUT_DIRECTORY
Common subdirectories: ../244p8/./vendor/wikimedia/less.php/bin and ./vendor/wikimedia/less.php/bin
Common subdirectories: ../244p8/./vendor/wikimedia/less.php/lib and ./vendor/wikimedia/less.php/lib
Common subdirectories: ../244p8/./vendor/mtdowling/jmespath.php/bin and ./vendor/mtdowling/jmespath.php/bin
Common subdirectories: ../244p8/./vendor/mtdowling/jmespath.php/src and ./vendor/mtdowling/jmespath.php/src
--- ../244p8/./vendor/composer/autoload_psr4.php 2024-06-11 10:35:20.813889928 +0200
+++ ./vendor/composer/autoload_psr4.php 2024-06-11 10:35:28.822886888 +0200
@@ -48,7 +48,7 @@
'ReCaptcha\\' => array($vendorDir . '/google/recaptcha/src/ReCaptcha'),
'Ramsey\\Uuid\\' => array($vendorDir . '/ramsey/uuid/src'),
'Ramsey\\Collection\\' => array($vendorDir . '/ramsey/collection/src'),