[osmpbf] 01/02: Add patch to fix duplicate header copy.
Bas Couwenberg
sebastic at xs4all.nl
Mon Mar 17 07:57:13 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch debian
in repository osmpbf.
commit adcf891b95609e375130438dc431e96017bbbbf8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Mar 17 08:46:00 2014 +0100
Add patch to fix duplicate header copy.
---
debian/changelog | 6 ++++++
debian/patches/copy-headers.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 29 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 80e4c3a..2bc42e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmpbf (1.3.3-2) UNRELEASED; urgency=low
+
+ * Add patch to fix duplicate header copy.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl> Mon, 17 Mar 2014 08:42:53 +0100
+
osmpbf (1.3.3-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/copy-headers.patch b/debian/patches/copy-headers.patch
new file mode 100644
index 0000000..8ea99d4
--- /dev/null
+++ b/debian/patches/copy-headers.patch
@@ -0,0 +1,22 @@
+Description: Copy can fail during parallel builds.
+ For example the failed mipsel build:
+ .
+ protoc --proto_path=. --cpp_out=. fileformat.proto
+ protoc --proto_path=. --cpp_out=. osmformat.proto
+ cp *.pb.h ../include/osmpbf/
+ cp *.pb.h ../include/osmpbf/
+ g++ -g -O2 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long -fPIC -c -o osmformat.pb.o osmformat.pb.cc
+ cp: cannot create regular file '../include/osmpbf/fileformat.pb.h': File exists
+ .
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -20,7 +20,7 @@ libosmpbf.a: fileformat.pb.o osmformat.p
+
+ %.pb.cc ../include/osmpbf/%.pb.h: %.proto
+ $(PROTOC) --proto_path=. --cpp_out=. $<
+- cp *.pb.h ../include/osmpbf/
++ cp -v $(subst .proto,.pb.h,$<) ../include/osmpbf/
+
+ install:
+ install -m 755 -d $(DESTDIR)$(PREFIX)/lib
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d270e20
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+copy-headers.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmpbf.git
More information about the Pkg-grass-devel
mailing list