ǝɹʇʇɐʃǝ◖ xıʃǝɟ pushed to branch master at Debian GIS Project / tilemaker
Commits: a94db445 by Felix Delattre at 2021-09-17T12:27:32+00:00 Set DEB_LDFLAGS_MAINT_APPEND. - - - - - e64435d8 by Felix Delattre at 2021-09-19T07:49:38+00:00 Handle build flags. - - - - - 03b624e8 by Felix Delattre at 2021-09-19T07:50:04+00:00 Use cmake build system. - - - - - 7 changed files: - debian/control - debian/patches/0003-Add-man-page-for-tilemaker.patch - debian/patches/0004-Allow-CXXFLAGS-to-be-set-by-environment.patch - − debian/patches/0005-Add-pthread-option-to-LIB-options.patch - + debian/patches/0005-Use-CPPFLAGS.patch - debian/patches/series - debian/rules Changes: ===================================== debian/control ===================================== @@ -3,7 +3,9 @@ Maintainer: Debian GIS Project <[email protected]> Uploaders: Felix Delattre <[email protected]> Section: science Priority: optional -Build-Depends: debhelper-compat (= 12), +Build-Depends: cmake, + dh-cmake, + debhelper-compat (= 12), libboost-dev, libboost-filesystem-dev, libboost-iostreams-dev, @@ -14,7 +16,7 @@ Build-Depends: debhelper-compat (= 12), libshp-dev, libsqlite3-dev, protobuf-compiler, - rapidjson-dev, + rapidjson-dev Standards-Version: 4.6.0 Vcs-Browser: https://salsa.debian.org/debian-gis-team/tilemaker Vcs-Git: https://salsa.debian.org/debian-gis-team/tilemaker.git ===================================== debian/patches/0003-Add-man-page-for-tilemaker.patch ===================================== @@ -5,11 +5,23 @@ Origin: https://github.com/systemed/tilemaker/pull/299/commits/b9226b8b97626f53c Bug: https://github.com/systemed/tilemaker/pull/299 --- + CMakeLists.txt | 2 ++ Makefile | 4 +++- docs/man/tilemaker.1 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 57 insertions(+), 1 deletion(-) + 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 docs/man/tilemaker.1 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 493f57f..a52b8d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -109,4 +109,6 @@ if(MSVC) + target_link_libraries(tilemaker unofficial::sqlite3::sqlite3) + endif() + ++install(FILES docs/man/tilemaker.1 DESTINATION share/man/man1) ++ + install(TARGETS tilemaker RUNTIME DESTINATION bin) diff --git a/Makefile b/Makefile index 4e7f7b7..838c110 100644 --- a/Makefile ===================================== debian/patches/0004-Allow-CXXFLAGS-to-be-set-by-environment.patch ===================================== @@ -17,7 +17,7 @@ index 838c110..1e7bbe1 100644 MANPREFIX := /usr/share/man TM_VERSION ?= $(shell git describe --tags --abbrev=0) -CXXFLAGS := -O3 -Wall -Wno-unknown-pragmas -Wno-sign-compare -std=c++14 -pthread -fPIE -DTM_VERSION=$(TM_VERSION) $(CONFIG) -+CXXFLAGS ?= -O2 -Wall -Wno-unknown-pragmas -Wno-sign-compare -std=c++14 -pthread -fPIE -DTM_VERSION=$(TM_VERSION) $(CONFIG) ++CXXFLAGS ?= -O3 -Wall -Wno-unknown-pragmas -Wno-sign-compare -std=c++14 -pthread -fPIE -DTM_VERSION=$(TM_VERSION) $(CONFIG) LIB := -L/usr/local/lib -lz $(LUA_LIBS) -lboost_program_options -lsqlite3 -lboost_filesystem -lboost_system -lboost_iostreams -lprotobuf -lshp INC := -I/usr/local/include -isystem ./include -I./src $(LUA_CFLAGS) ===================================== debian/patches/0005-Add-pthread-option-to-LIB-options.patch deleted ===================================== @@ -1,23 +0,0 @@ -From: Felix Delattre <[email protected]> -Date: Tue, 7 Sep 2021 20:38:00 +0000 -Subject: Add -pthread option to LIB options. -Origin: https://github.com/systemed/tilemaker/pull/313/commits/7800607d227e939bba597a606223a304d2430add -Bug: https://github.com/systemed/tilemaker/pull/313 - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 1e7bbe1..aa6d486 100644 ---- a/Makefile -+++ b/Makefile -@@ -65,7 +65,7 @@ prefix = /usr/local - MANPREFIX := /usr/share/man - TM_VERSION ?= $(shell git describe --tags --abbrev=0) - CXXFLAGS ?= -O2 -Wall -Wno-unknown-pragmas -Wno-sign-compare -std=c++14 -pthread -fPIE -DTM_VERSION=$(TM_VERSION) $(CONFIG) --LIB := -L/usr/local/lib -lz $(LUA_LIBS) -lboost_program_options -lsqlite3 -lboost_filesystem -lboost_system -lboost_iostreams -lprotobuf -lshp -+LIB := -L/usr/local/lib -lz $(LUA_LIBS) -lboost_program_options -lsqlite3 -lboost_filesystem -lboost_system -lboost_iostreams -lprotobuf -lshp -pthread - INC := -I/usr/local/include -isystem ./include -I./src $(LUA_CFLAGS) - - ===================================== debian/patches/0005-Use-CPPFLAGS.patch ===================================== @@ -0,0 +1,30 @@ +From: Felix Delattre <[email protected]> +Date: Fri, 17 Sep 2021 11:18:14 +0000 +Subject: Use CPPFLAGS. +Forwarded: not-needed + +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 1e7bbe1..eabcdd1 100644 +--- a/Makefile ++++ b/Makefile +@@ -74,13 +74,13 @@ INC := -I/usr/local/include -isystem ./include -I./src $(LUA_CFLAGS) + all: tilemaker + + tilemaker: include/osmformat.pb.o include/vector_tile.pb.o src/mbtiles.o src/pbf_blocks.o src/coordinates.o src/osm_store.o src/helpers.o src/output_object.o src/read_shp.o src/read_pbf.o src/osm_lua_processing.o src/write_geometry.o src/shared_data.o src/tile_worker.o src/tile_data.o src/osm_mem_tiles.o src/shp_mem_tiles.o src/attribute_store.o src/tilemaker.o src/geom.o +- $(CXX) $(CXXFLAGS) -o tilemaker $^ $(INC) $(LIB) $(LDFLAGS) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o tilemaker $^ $(INC) $(LIB) $(LDFLAGS) + + %.o: %.cpp +- $(CXX) $(CXXFLAGS) -o $@ -c $< $(INC) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< $(INC) + + %.o: %.cc +- $(CXX) $(CXXFLAGS) -o $@ -c $< $(INC) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< $(INC) + + %.pb.cc: %.proto + protoc --proto_path=include --cpp_out=include $< ===================================== debian/patches/series ===================================== @@ -2,4 +2,4 @@ 0002-Avoid-calling-git-outside-of-repository.patch 0003-Add-man-page-for-tilemaker.patch 0004-Allow-CXXFLAGS-to-be-set-by-environment.patch -0005-Add-pthread-option-to-LIB-options.patch +0005-Use-CPPFLAGS.patch ===================================== debian/rules ===================================== @@ -10,6 +10,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all include /usr/share/dpkg/pkg-info.mk TM_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//') +export DEB_LDFLAGS_MAINT_APPEND=-pthread + # Allow debug package to be created CONFIG := -g @@ -19,7 +21,7 @@ include /usr/share/dpkg/buildflags.mk CXXFLAGS := -O2 -Wall -Wno-unknown-pragmas -Wno-sign-compare -std=c++14 -pthread -fPIE -DTM_VERSION=$(TM_VERSION) $(CONFIG) $(CPPFLAGS) %: - dh $@ + dh $@ --buildsystem=cmake override_dh_auto_install: dh_auto_install -- prefix=/usr View it on GitLab: https://salsa.debian.org/debian-gis-team/tilemaker/-/compare/7c05e9995c8542afc3af1a5ab0902b938b789a6b...03b624e8149a5ef090d926df1dd22de324fdac97 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/tilemaker/-/compare/7c05e9995c8542afc3af1a5ab0902b938b789a6b...03b624e8149a5ef090d926df1dd22de324fdac97 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
