Remove obsolete protobuf payment requests
This commit is contained in:
@@ -114,31 +114,6 @@ ifneq ($(native_packages),)
|
||||
echo " - $$p: $$f"; \
|
||||
tar --no-same-owner -xzf "$$f" -C "$(build_prefix)"; \
|
||||
done
|
||||
@if [[ " $(native_packages) " == *" native_protobuf "* ]] && [[ ! -x "$(build_prefix)/bin/protoc" ]]; then \
|
||||
found="$$(find "$(build_prefix)" -path '*/bin/protoc' -type f 2>/dev/null | sort | head -n 1)"; \
|
||||
if [[ -n "$$found" ]]; then \
|
||||
echo "== Staging native protoc from: $$found"; \
|
||||
mkdir -p "$(build_prefix)/bin"; \
|
||||
cp "$$found" "$(build_prefix)/bin/protoc"; \
|
||||
chmod +x "$(build_prefix)/bin/protoc"; \
|
||||
fi; \
|
||||
fi
|
||||
@if [[ " $(native_packages) " == *" native_protobuf "* ]] && [[ ! -x "$(build_prefix)/bin/protoc" ]]; then \
|
||||
archive="$$(ls "$(BASE_CACHE)/$(HOST)/native_protobuf/"*.tar.gz 2>/dev/null | sort | tail -n 1)"; \
|
||||
if [[ -n "$$archive" ]] && tar -tzf "$$archive" ./bin/protoc >/dev/null 2>&1; then \
|
||||
echo "== Extracting native protoc directly from: $$archive"; \
|
||||
tar --no-same-owner -xzf "$$archive" -C "$(build_prefix)" ./bin/protoc; \
|
||||
chmod +x "$(build_prefix)/bin/protoc"; \
|
||||
elif [[ -n "$$archive" ]]; then \
|
||||
echo "== native_protobuf archive contents:"; \
|
||||
tar -tzf "$$archive" | sed -n '1,40p'; \
|
||||
fi; \
|
||||
fi
|
||||
@if [[ " $(native_packages) " == *" native_protobuf "* ]] && [[ ! -x "$(build_prefix)/bin/protoc" ]]; then \
|
||||
echo "ERROR: missing native protoc under $(build_prefix)/bin/protoc"; \
|
||||
echo "Fix: make -C $(BASEDIR) HOST=$(HOST) NO_QT=$(NO_QT) native_protobuf"; \
|
||||
exit 1; \
|
||||
fi
|
||||
endif
|
||||
@echo "== Writing config.site: $(host_prefix)/share/config.site"
|
||||
@mkdir -p "$(host_prefix)/share"
|
||||
@@ -154,7 +129,6 @@ endif
|
||||
echo "with_qt_plugindir='$(host_prefix)/plugins'"; \
|
||||
echo "with_qt_translationdir='$(host_prefix)/translations'"; \
|
||||
echo "with_qt_bindir='$(host_prefix)/bin'"; \
|
||||
echo "with_protoc_bindir='$(build_prefix)/bin'"; \
|
||||
echo "CPPFLAGS='-I$(host_prefix)/include'"; \
|
||||
echo "LDFLAGS='-L$(host_prefix)/lib'"; \
|
||||
echo "BOOST_CPPFLAGS='-I$(host_prefix)/include'"; \
|
||||
|
||||
Reference in New Issue
Block a user