diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml index 7aaa5e25d..30f504827 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -46,8 +46,6 @@ - - diff --git a/php/generate_test_protos.sh b/php/generate_test_protos.sh index e86ca07a6..44bf4fcca 100755 --- a/php/generate_test_protos.sh +++ b/php/generate_test_protos.sh @@ -4,8 +4,6 @@ set -e cd `dirname $0` -./prepare_c_extension.sh - if ../src/protoc --help > /dev/null; then PROTOC=src/protoc else @@ -13,7 +11,6 @@ else 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 deleted file mode 100755 index 1b6b9f1da..000000000 --- a/php/prepare_c_extension.sh +++ /dev/null @@ -1,20 +0,0 @@ - -cd $(dirname $0) - -if [[ -f ext/google/protobuf/third_party/wyhash/wyhash.h && -z $(find ../third_party/wyhash -newer ext/google/protobuf/third_party) ]]; then - # Generated protos are already present and up to date, so we can skip protoc. - # - # Protoc is very fast, but sometimes it is not available (like if we haven't - # built it in Docker). Skipping it helps us proceed in this case. - echo "wyhash is up to date, skipping." - exit 0 -fi - -# wyhash has to live in the base third_party directory. -# We copy it into the ext/google/protobuf directory for the build -# (and for the release to PECL). -rm -rf ext/google/protobuf/third_party -mkdir -p ext/google/protobuf/third_party/wyhash -cp ../third_party/wyhash/* ext/google/protobuf/third_party/wyhash - -echo "Copied wyhash from ../third_party -> ext/google/protobuf/third_party" diff --git a/php/tests/compile_extension.sh b/php/tests/compile_extension.sh index fce046952..80378f02d 100755 --- 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)")