Removed PHP support for third_party/wyhash in favor of ABSL wyhash.

eikemeier · Aug 2, 2021 · c5960fd · c5960fd
1 parent 9d578a3
commit c5960fd
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 26 deletions.
diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml
@@ -46,8 +46,6 @@
     <file baseinstalldir="/" name="protobuf.c" role="src"/>
     <file baseinstalldir="/" name="protobuf.h" role="src"/>
     <file baseinstalldir="/" name="wkt.inc" role="src"/>
-    <file baseinstalldir="/" name="third_party/wyhash/wyhash.h" role="src"/>
-    <file baseinstalldir="/" name="third_party/wyhash/LICENSE" role="doc"/>
     <file baseinstalldir="/" name="LICENSE" role="doc"/>
   </dir>
  </contents>

diff --git a/php/generate_test_protos.sh b/php/generate_test_protos.sh
@@ -4,16 +4,13 @@ set -e
 
 cd `dirname $0`
 
-./prepare_c_extension.sh
-
 if ../src/protoc --help > /dev/null; then
   PROTOC=src/protoc
 else
   (cd .. && bazel build -c opt :protoc)
   PROTOC=bazel-bin/protoc
 fi
 
-
 if [[ -d tmp && -z $(find tests/proto ../$PROTOC -newer tmp) ]]; then
   # Generated protos are already present and up to date, so we can skip protoc.
   #

diff --git a/php/prepare_c_extension.sh b/php/prepare_c_extension.sh
diff --git a/php/tests/compile_extension.sh b/php/tests/compile_extension.sh
@@ -4,7 +4,6 @@ set -e
 
 cd $(dirname $0)
 
-../prepare_c_extension.sh
 pushd  ../ext/google/protobuf > /dev/null
 
 CONFIGURE_OPTIONS=("./configure" "--with-php-config=$(which php-config)")