Skip to content

Commit

Permalink
feat: add protobuf-c and add protobuf support in postgis (backport #1589
Browse files Browse the repository at this point in the history
) (#1610)

This is an automatic backport of pull request #1589 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>
  • Loading branch information
mergify[bot] authored Jul 17, 2023
1 parent 0c31342 commit f7586e7
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .metwork-framework/components.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@
| [pprintpp](https://github.com/wolever/pprintpp) | 0.4.0 | python3 |
| [proj](http://trac.osgeo.org/proj/) | 9.0.1 | scientific_core |
| [prompt-toolkit](https://github.com/prompt-toolkit/python-prompt-toolkit) | 3.0.32 | python3_devtools |
| [protobuf-c](https://github.com/protobuf-c) | 1.4.1 | scientific_core |
| [protobuf](https://developers.google.com/protocol-buffers) | 3.12.2 | scientific_core |
| [psutil](https://github.com/giampaolo/psutil) | 5.9.3 | python3 |
| [psycopg-c](https://psycopg.org/psycopg3/) | 3.1.4 | python3_scientific_core |
| [psycopg](https://psycopg.org/psycopg3/) | 3.1.4 | python3_scientific_core |
Expand Down Expand Up @@ -254,4 +256,4 @@
| [zeromq](https://zeromq.org/) | 4.3.4 | core |
| [zipp](https://github.com/jaraco/zipp) | 3.8.1 | python3_core |

*(253 components)*
*(255 components)*
2 changes: 2 additions & 0 deletions layers/layer1_scientific_core/0006_protobuf/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include ../../../adm/root.mk
include $(MFEXT_HOME)/share/layer_wrapper.mk
19 changes: 19 additions & 0 deletions layers/layer1_scientific_core/0006_protobuf/Makefile.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
include ../../../adm/root.mk
include $(MFEXT_HOME)/share/package.mk

export NAME=protobuf
export VERSION=3.12.2
export EXTENSION=tar.gz
export CHECKTYPE=MD5
export CHECKSUM=434520543ac8bae51f786660bb2dc3bb
DESCRIPTION=\
Protocol buffers are Google's language-neutral, platform-neutral, extensible \
mechanism for serializing structured data – think XML, but smaller, faster, \
and simpler.
WEBSITE=https://developers.google.com/protocol-buffers
LICENSE=Google (https://github.com/protocolbuffers/protobuf/blob/master/LICENSE)

all:: $(PREFIX)/bin/protoc
$(PREFIX)/bin/protoc:
#$(MAKE) --file=$(MFEXT_HOME)/share/Makefile.standard PREFIX=$(PREFIX) OPTIONS="--enable-static=no" download uncompress configure build check install
$(MAKE) --file=$(MFEXT_HOME)/share/Makefile.standard PREFIX=$(PREFIX) OPTIONS="--enable-static=no" download uncompress configure build install
1 change: 1 addition & 0 deletions layers/layer1_scientific_core/0006_protobuf/sources
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://github.com/protocolbuffers/protobuf/releases/download/v3.12.2/protobuf-cpp-3.12.2.tar.gz
2 changes: 2 additions & 0 deletions layers/layer1_scientific_core/0007_protobuf_c/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include ../../../adm/root.mk
include ../../layer_wrapper.mk
17 changes: 17 additions & 0 deletions layers/layer1_scientific_core/0007_protobuf_c/Makefile.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
include ../../../adm/root.mk
include ../../package.mk

export NAME=protobuf-c
export VERSION=1.4.1
export EXTENSION=tar.gz
export CHECKTYPE=MD5
export CHECKSUM=8414a07bd5c7147f01527090c78e1b4b
DESCRIPTION=\
PROTOBUF-C is a C implementation of the Google Protocol Buffers data serialization format
WEBSITE=https://github.com/protobuf-c
LICENSE=Copyright (c) 2008-2022, Dave Benson and the protobuf-c authors

all:: $(PREFIX)/bin/protoc-c

$(PREFIX)/bin/protoc-c:
$(MAKE) --file=../../Makefile.standard PREFIX=$(PREFIX) download uncompress autoreconf configure build install
1 change: 1 addition & 0 deletions layers/layer1_scientific_core/0007_protobuf_c/sources
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://github.com/protobuf-c/protobuf-c/archive/refs/tags/v1.4.1.tar.gz
2 changes: 1 addition & 1 deletion layers/layer1_scientific_core/0070_postgis/Makefile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $(PREFIX)/lib/postgresql/postgis-$(SHORT_VERSION).so:
# EXTENSION is an internal variable used by postgis, for us it is not used anymore after uncompress.
# So we split : "download uncompress" with EXTENSION and "configure build install" without it
export EXTENSION=tar.gz ; $(MAKE) --file=../../Makefile.standard PREFIX=$(PREFIX) download uncompress
$(MAKE) --file=../../Makefile.standard PREFIX=$(PREFIX) OPTIONS="--without-protobuf" configure build install
$(MAKE) --file=../../Makefile.standard PREFIX=$(PREFIX) configure build install

$(PREFIX)/contrib/postgis-$(SHORT_VERSION)/postgis_comments.sql:
mkdir -p $(PREFIX)/contrib/postgis-$(SHORT_VERSION)
Expand Down

0 comments on commit f7586e7

Please sign in to comment.