Commits on Source (13)
-
The patch doesn't apply and is discarded. A similar fix exists in the version we use.
24e5fb65 -
It takes a lot of time for something we don't use.
eeb3c705 -
75dc8ba5
-
d276e3af
-
Same patch that is in extra/tools with the original patch header.
ff324c26 -
We check if protoc is in the path with the version we want, otherwise we build it. It is extracted "manually" to protoc-VERSION-cpp so it can be built in parallel with protobuf. They don't use each other.
e02c5baf -
It's better handled in contribs were the versions is the same and the system package detection is better. So do not force the rebuild of it in snap.
0f480eca -
Since we built protobuf we also need the matching protoc. This is the same as we do for luac. +factorize some calls to make .luac .protoc
535e284f -
Similar to how we use $host-luac that we build natively.
0298441d -
Similar to how we force detection of luac there. We might be using AC_CHECK_TOOL(PROTOC, protoc, no, [${CONTRIB_DIR}/../bin$PATH_SEPARATOR$PATH]) Which works, but it doesn't keep the full path, so if the PATH is not set in the environment when using HOST-protoc it doesn't find it. So we either have to force everyone to add a new item in their PATH or just use the transparent way that luac is using.
104ac390 -
Otherwise it won't compile compatible code. If protoc is not there we check the version of protobuf we expect so we get the proper error messages on what's really missing.
40e27c4b -
We don't know exactly which compatibility is allowed or not. It doesn't hurt to rebuild when we're not sure. And then we can use the PROTOBUF_VERSION variable consistently.
fc75a318 -
This is the same value set when compiling the contribs.
69a6ac24
Showing
- configure.ac 21 additions, 5 deletionsconfigure.ac
- contrib/src/main.mak 0 additions, 6 deletionscontrib/src/main.mak
- contrib/src/protobuf/protobuf-disable-gmock.patch 11 additions, 0 deletionscontrib/src/protobuf/protobuf-disable-gmock.patch
- contrib/src/protobuf/protobuf-fix-build.patch 27 additions, 0 deletionscontrib/src/protobuf/protobuf-fix-build.patch
- contrib/src/protobuf/protobuf-win32.patch 0 additions, 12 deletionscontrib/src/protobuf/protobuf-win32.patch
- contrib/src/protobuf/rules.mak 36 additions, 5 deletionscontrib/src/protobuf/rules.mak
- extras/ci/gitlab-ci.yml 1 addition, 0 deletionsextras/ci/gitlab-ci.yml
- extras/package/macosx/build.sh 1 addition, 2 deletionsextras/package/macosx/build.sh
- extras/package/raspberry/build.sh 2 additions, 2 deletionsextras/package/raspberry/build.sh
- extras/package/snap/snapcraft.yaml 2 additions, 1 deletionextras/package/snap/snapcraft.yaml
- extras/package/win32/build.sh 6 additions, 5 deletionsextras/package/win32/build.sh
- extras/tools/bootstrap 0 additions, 17 deletionsextras/tools/bootstrap
- extras/tools/packages.mak 0 additions, 3 deletionsextras/tools/packages.mak
- extras/tools/protobuf-fix-build.patch 0 additions, 11 deletionsextras/tools/protobuf-fix-build.patch
- extras/tools/tools.mak 0 additions, 19 deletionsextras/tools/tools.mak