mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 12:50:22 +02:00
devtools: remove protobuf*
The protobuf recipes are in meta-oe, and were only here to support higher order virtualization tasks. Dropping the recipes and we'll use the ones directly from meta-oe, since the versions and compatibility should be fine. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Bruce Ashfield
parent
c1b428f3d2
commit
b44a92c0f3
|
|
@ -1,19 +0,0 @@
|
|||
diff -Naur protobuf-c-0.15.old/src/Makefile.am protobuf-c-0.15/src/Makefile.am
|
||||
--- protobuf-c-0.15.old/src/Makefile.am 2012-11-28 14:59:57.845251943 +0100
|
||||
+++ protobuf-c-0.15/src/Makefile.am 2012-11-28 15:00:23.549252632 +0100
|
||||
@@ -1,5 +1,5 @@
|
||||
if BUILD_PROTOC_C
|
||||
-SUBDIRS = . test
|
||||
+
|
||||
bin_PROGRAMS = protoc-c
|
||||
protoc_c_SOURCES = \
|
||||
google/protobuf/compiler/c/c_service.cc \
|
||||
@@ -23,7 +23,7 @@
|
||||
lib_LTLIBRARIES = libprotobuf-c.la
|
||||
protobufcincludedir = $(includedir)/google/protobuf-c
|
||||
|
||||
-EXTRA_DIST = CMakeLists.txt test/CMakeLists.txt
|
||||
+EXTRA_DIST = CMakeLists.txt
|
||||
|
||||
libprotobuf_c_la_SOURCES = \
|
||||
google/protobuf-c/protobuf-c-dispatch.c \
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From 46e331263eb92e47510e88478b255f226d30245c Mon Sep 17 00:00:00 2001
|
||||
From: Keith Holman <Keith.Holman@windriver.com>
|
||||
Date: Mon, 18 Aug 2014 15:19:35 -0400
|
||||
Subject: [PATCH] protobuf: allow running python scripts from anywhere
|
||||
|
||||
The Makefile to generate the examples with Google Protocol Buffers
|
||||
generates some scripts for python. However, these generated scripts
|
||||
only work if they are ran in the same directory as the source files.
|
||||
This fix generates scripts to execute from anywhere on the system.
|
||||
|
||||
Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
|
||||
---
|
||||
examples/Makefile | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/examples/Makefile b/examples/Makefile
|
||||
index 8dc9083..a993d63 100644
|
||||
--- a/examples/Makefile
|
||||
+++ b/examples/Makefile
|
||||
@@ -48,11 +48,13 @@ list_people_java: javac_middleman
|
||||
add_person_python: add_person.py protoc_middleman
|
||||
@echo "Writing shortcut script add_person_python..."
|
||||
@echo '#! /bin/sh' > add_person_python
|
||||
- @echo './add_person.py "$$@"' >> add_person_python
|
||||
+ @echo 'SCRIPT_DIR=$$(dirname $$0)' >> add_person_python
|
||||
+ @echo '$$SCRIPT_DIR/add_person.py "$$@"' >> add_person_python
|
||||
@chmod +x add_person_python
|
||||
|
||||
list_people_python: list_people.py protoc_middleman
|
||||
@echo "Writing shortcut script list_people_python..."
|
||||
@echo '#! /bin/sh' > list_people_python
|
||||
- @echo './list_people.py "$$@"' >> list_people_python
|
||||
+ @echo 'SCRIPT_DIR=$$(dirname $$0)' >> list_people_python
|
||||
+ @echo '$$SCRIPT_DIR/list_people.py "$$@"' >> list_people_python
|
||||
@chmod +x list_people_python
|
||||
--
|
||||
1.9.3
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
#!/bin/bash
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
TEST_FILE="/tmp/test.data"
|
||||
|
||||
RETVAL=0
|
||||
# Test every writing test application
|
||||
for write_exe_full_path in ${DIR}/add_person_*; do
|
||||
if [ -x "${write_exe_full_path}" ]; then
|
||||
write_exe=`basename ${write_exe_full_path}`
|
||||
echo "Generating new test file using ${write_exe}..."
|
||||
${write_exe_full_path} "${TEST_FILE}"
|
||||
RETVAL=$?
|
||||
|
||||
# Test every reading test application
|
||||
for read_exe_full_path in ${DIR}/list_people_*; do
|
||||
read_exe=`basename ${read_exe_full_path}`
|
||||
echo "Test: Write with ${write_exe}; Read with ${read_exe}..."
|
||||
if [ -x "${read_exe_full_path}" ]; then
|
||||
${read_exe_full_path} "${TEST_FILE}"
|
||||
RETVAL=$?
|
||||
fi
|
||||
done
|
||||
|
||||
# Cleanup...
|
||||
if [ -e "${TEST_FILE}" ]; then
|
||||
rm "${TEST_FILE}"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
SUMMARY = "protobuf-c"
|
||||
DESCRIPTION = "This package provides a code generator and runtime libraries to use Protocol Buffers from pure C"
|
||||
HOMEPAGE = "http://code.google.com/p/protobuf-c/"
|
||||
SECTION = "console/tools"
|
||||
LICENSE = "Apache-2.0"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=235c3195a3968524dc1524b4ebea0c0e"
|
||||
|
||||
COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux"
|
||||
|
||||
DEPENDS = "protobuf protobuf-c-native"
|
||||
|
||||
SRC_URI[md5sum] = "e544249c329391fff512c3874895cfbe"
|
||||
SRC_URI[sha256sum] = "846eb4846f19598affdc349d817a8c4c0c68fd940303e6934725c889f16f00bd"
|
||||
SRC_URI = "https://github.com/protobuf-c/protobuf-c/releases/download/v1.2.1/protobuf-c-1.2.1.tar.gz "
|
||||
#SRC_URI_append_class-target ="file://0001-protobuf-c-Remove-the-rules-which-depend-on-the-nati.patch"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
do_configure_prepend_class-target() {
|
||||
export PKG_CONFIG_PATH="${STAGING_LIBDIR_NATIVE}/pkgconfig:${PKG_CONFIG_PATH}"
|
||||
}
|
||||
|
||||
do_install_append_class-native() {
|
||||
install -m 755 ${B}/t/generated-code2/cxx-generate-packed-data ${D}/${bindir}
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
SUMMARY = "protobuf"
|
||||
DESCRIPTION = "Protocol Buffers are a way of encoding structured data in \
|
||||
an efficient yet extensible format. Google uses Protocol Buffers for \
|
||||
almost all of its internal RPC protocols and file formats."
|
||||
HOMEPAGE = "http://code.google.com/p/protobuf/"
|
||||
SECTION = "console/tools"
|
||||
LICENSE = "BSD-3-Clause"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095"
|
||||
|
||||
SRC_URI[md5sum] = "14a532a7538551d5def317bfca41dace"
|
||||
SRC_URI[sha256sum] = "0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7"
|
||||
SRC_URI = "https://github.com/google/protobuf/archive/v3.1.0.tar.gz;downloadfilename=protobuf-3.1.0.tar.gz \
|
||||
"
|
||||
|
||||
EXTRA_OECONF += " --with-protoc=echo"
|
||||
|
||||
inherit native autotools
|
||||
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
SUMMARY = "protobuf"
|
||||
DESCRIPTION = "Protocol Buffers are a way of encoding structured data in \
|
||||
an efficient yet extensible format. Google uses Protocol Buffers for \
|
||||
almost all of its internal RPC protocols and file formats."
|
||||
HOMEPAGE = "http://code.google.com/p/protobuf/"
|
||||
SECTION = "console/tools"
|
||||
LICENSE = "BSD-3-Clause"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095"
|
||||
|
||||
PR = "r0"
|
||||
EXCLUDE_FROM_WORLD = "1"
|
||||
|
||||
SRC_URI[md5sum] = "14a532a7538551d5def317bfca41dace"
|
||||
SRC_URI[sha256sum] = "0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7"
|
||||
SRC_URI = "https://github.com/google/protobuf/archive/v3.1.0.tar.gz;downloadfilename=protobuf-3.1.0.tar.gz\
|
||||
file://protobuf-allow-running-python-scripts-from-anywhere.patch \
|
||||
file://run-ptest \
|
||||
"
|
||||
|
||||
COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux"
|
||||
|
||||
EXTRA_OECONF += " --with-protoc=${STAGING_BINDIR_NATIVE}/protoc"
|
||||
inherit autotools setuptools ptest
|
||||
|
||||
DEPENDS += "protobuf-native"
|
||||
RDEPENDS_${PN}-ptest = "bash"
|
||||
|
||||
PYTHON_SRC_DIR="python"
|
||||
TEST_SRC_DIR="examples"
|
||||
LANG_SUPPORT="cpp python"
|
||||
|
||||
do_compile() {
|
||||
# Compile protoc compiler
|
||||
base_do_compile
|
||||
}
|
||||
|
||||
do_compile_ptest() {
|
||||
# Modify makefile to use the cross-compiler
|
||||
sed -e "s|c++|${CXX} \$(LDFLAGS)|g" -i "${S}/${TEST_SRC_DIR}/Makefile"
|
||||
|
||||
mkdir -p "${B}/${TEST_SRC_DIR}"
|
||||
|
||||
# Add the location of the cross-compiled header and library files
|
||||
# which haven't been installed yet.
|
||||
cp "${B}/protobuf.pc" "${B}/${TEST_SRC_DIR}/protobuf.pc"
|
||||
sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
|
||||
sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
|
||||
sed -e 's|Libs:|Libs: -L${B}/src/.libs|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc"
|
||||
export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}"
|
||||
|
||||
# Save the pkgcfg sysroot variable, and update it to nothing so
|
||||
# that it doesn't append the sysroot to the beginning of paths.
|
||||
# The header and library files aren't installed to the target
|
||||
# system yet. So the absolute paths were specified above.
|
||||
save_pkg_config_sysroot_dir=$PKG_CONFIG_SYSROOT_DIR
|
||||
export PKG_CONFIG_SYSROOT_DIR=
|
||||
|
||||
# Compile the tests
|
||||
for lang in ${LANG_SUPPORT}; do
|
||||
oe_runmake -C "${S}/${TEST_SRC_DIR}" ${lang}
|
||||
done
|
||||
|
||||
# Restore the pkgconfig sysroot variable
|
||||
export PKG_CONFIG_SYSROOT_DIR=$save_pkg_config_sysroot_dir
|
||||
}
|
||||
|
||||
do_install() {
|
||||
local olddir=`pwd`
|
||||
|
||||
# Install protoc compiler
|
||||
autotools_do_install
|
||||
|
||||
# Install header files
|
||||
export PROTOC="${STAGING_BINDIR_NATIVE}/protoc"
|
||||
cd "${S}/${PYTHON_SRC_DIR}"
|
||||
distutils_do_install
|
||||
|
||||
cd "$olddir"
|
||||
}
|
||||
|
||||
do_install_ptest() {
|
||||
local olddir=`pwd`
|
||||
|
||||
cd "${S}/${TEST_SRC_DIR}"
|
||||
install -d "${D}/${PTEST_PATH}"
|
||||
for i in add_person* list_people*; do
|
||||
if [ -x "$i" ]; then
|
||||
install "$i" "${D}/${PTEST_PATH}"
|
||||
fi
|
||||
done
|
||||
cp "${S}/${TEST_SRC_DIR}/addressbook_pb2.py" "${D}/${PTEST_PATH}"
|
||||
|
||||
cd "$olddir"
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "nativesdk"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user