git: 1955155ac2df - main - databases/imposm3: fix build on arm64, riscv64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 06 Nov 2024 15:18:39 UTC
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1955155ac2df53b15a650e1da2f640b4a1db080b commit 1955155ac2df53b15a650e1da2f640b4a1db080b Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2024-11-06 12:18:54 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2024-11-06 15:14:32 +0000 databases/imposm3: fix build on arm64, riscv64 Bump golang.org/x/sys dependency to a version new enough to support aarch64-freebsd and riscv64-freebsd. Approved by: portmgr (build fix blanket) MFH: 2024Q4 --- databases/imposm3/Makefile | 8 ++++- databases/imposm3/distinfo | 4 ++- databases/imposm3/files/patch-go.mod | 28 +++++++++++++++ databases/imposm3/files/patch-go.sum | 13 +++++++ databases/imposm3/files/patch-vendor_modules.txt | 44 ++++++++++++++++++++++++ 5 files changed, 95 insertions(+), 2 deletions(-) diff --git a/databases/imposm3/Makefile b/databases/imposm3/Makefile index 58705c51d880..ae34b89f74e3 100644 --- a/databases/imposm3/Makefile +++ b/databases/imposm3/Makefile @@ -1,7 +1,7 @@ PORTNAME= imposm3 DISTVERSIONPREFIX= v DISTVERSION= 0.11.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= databases geography MAINTAINER= darcy@dbitech.ca @@ -15,6 +15,8 @@ LIB_DEPENDS= libgeos.so:graphics/geos \ libleveldb.so:databases/leveldb USES= go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:sys:v0.26.0:sys GO_MODULE= github.com/omniscale/imposm3 GO_TARGET= ./cmd/imposm GO_BUILDFLAGS= -ldflags "\ @@ -25,6 +27,10 @@ PLIST_FILES= bin/imposm PORTEXAMPLES= example-mapping.json example-mapping.yml OPTIONS_DEFINE= EXAMPLES +pre-patch: + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys + post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR}) diff --git a/databases/imposm3/distinfo b/databases/imposm3/distinfo index bf2a56fa976b..bb4d7162be2e 100644 --- a/databases/imposm3/distinfo +++ b/databases/imposm3/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1675057218 +TIMESTAMP = 1730895212 SHA256 (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.mod) = 9aa4a2a81d8d8bdce8b45ad927017112d345d37ba85954c942dd49422c78a9da SIZE (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.mod) = 589 SHA256 (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.zip) = 1887daa48293a460bb64cae3800162329d7e7d455f1421bd3c8bffbc39544cec SIZE (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.zip) = 834723 +SHA256 (go/databases_imposm3/imposm3-v0.11.1/golang-sys-v0.26.0_GH0.tar.gz) = 584b9e1f84f2edfddedc60727a0296b053688fb30c4097490942981283c683e4 +SIZE (go/databases_imposm3/imposm3-v0.11.1/golang-sys-v0.26.0_GH0.tar.gz) = 1508756 diff --git a/databases/imposm3/files/patch-go.mod b/databases/imposm3/files/patch-go.mod new file mode 100644 index 000000000000..23a415f2e199 --- /dev/null +++ b/databases/imposm3/files/patch-go.mod @@ -0,0 +1,28 @@ +--- go.mod.orig 2024-11-06 12:16:45 UTC ++++ go.mod +@@ -1,17 +1,20 @@ module github.com/omniscale/imposm3 + module github.com/omniscale/imposm3 + +-go 1.12 ++go 1.17 + + require ( +- github.com/fsnotify/fsnotify v1.4.7 // indirect + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 + github.com/jmhodges/levigo v0.0.0-20161115193449-c42d9e0ca023 +- github.com/kr/pretty v0.1.0 // indirect + github.com/lib/pq v1.8.0 + github.com/omniscale/go-osm v0.2.1 + github.com/pkg/errors v0.8.0 +- golang.org/x/sys v0.0.0-20171114162044-bf42f188b9bc // indirect ++ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 ++) ++ ++require ( ++ github.com/fsnotify/fsnotify v1.4.7 // indirect ++ github.com/kr/pretty v0.1.0 // indirect ++ golang.org/x/sys v0.26.0 // indirect + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect + gopkg.in/fsnotify.v1 v1.4.2 // indirect +- gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 + ) diff --git a/databases/imposm3/files/patch-go.sum b/databases/imposm3/files/patch-go.sum new file mode 100644 index 000000000000..ea0b3abe7abb --- /dev/null +++ b/databases/imposm3/files/patch-go.sum @@ -0,0 +1,13 @@ +--- go.sum.orig 2024-11-06 12:16:42 UTC ++++ go.sum +@@ -15,8 +15,8 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2h + github.com/omniscale/go-osm v0.2.1/go.mod h1:JRbRitKdvYZcmq+6PhI81NP9b5B7sJSvxN9jCc4XGEc= + github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= + github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +-golang.org/x/sys v0.0.0-20171114162044-bf42f188b9bc h1:pt5pMsz4A/sZRT17MOvX/nidmCt7n6ILLJBkNh5QqC8= +-golang.org/x/sys v0.0.0-20171114162044-bf42f188b9bc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= ++golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/fsnotify.v1 v1.4.2 h1:AwZiD/bIUttYJ+n/k1UwlSUsM+VSE6id7UAnSKqQ+Tc= diff --git a/databases/imposm3/files/patch-vendor_modules.txt b/databases/imposm3/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..f99485acd29b --- /dev/null +++ b/databases/imposm3/files/patch-vendor_modules.txt @@ -0,0 +1,44 @@ +--- vendor/modules.txt.orig 2024-11-06 12:17:08 UTC ++++ vendor/modules.txt +@@ -1,15 +1,23 @@ ++# github.com/fsnotify/fsnotify v1.4.7 ++## explicit + # github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 ++## explicit + github.com/gogo/protobuf/gogoproto + github.com/gogo/protobuf/proto + github.com/gogo/protobuf/protoc-gen-gogo/descriptor + # github.com/jmhodges/levigo v0.0.0-20161115193449-c42d9e0ca023 ++## explicit + github.com/jmhodges/levigo ++# github.com/kr/pretty v0.1.0 ++## explicit + # github.com/lib/pq v1.8.0 ++## explicit; go 1.13 + github.com/lib/pq + github.com/lib/pq/hstore + github.com/lib/pq/oid + github.com/lib/pq/scram + # github.com/omniscale/go-osm v0.2.1 ++## explicit + github.com/omniscale/go-osm + github.com/omniscale/go-osm/parser/diff + github.com/omniscale/go-osm/parser/pbf +@@ -19,10 +27,16 @@ github.com/omniscale/go-osm/state + github.com/omniscale/go-osm/replication/internal/source + github.com/omniscale/go-osm/state + # github.com/pkg/errors v0.8.0 ++## explicit + github.com/pkg/errors +-# golang.org/x/sys v0.0.0-20171114162044-bf42f188b9bc ++# golang.org/x/sys v0.26.0 ++## explicit; go 1.18 + golang.org/x/sys/unix ++# gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 ++## explicit + # gopkg.in/fsnotify.v1 v1.4.2 ++## explicit + gopkg.in/fsnotify.v1 + # gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 ++## explicit + gopkg.in/yaml.v2