| 1 |
commit: 636a457ddfdef16faef6d374298123bc4cee5438 |
| 2 |
Author: John Duncan <1i5t5.duncan <AT> cox <DOT> net> |
| 3 |
AuthorDate: Thu Nov 4 21:03:22 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 4 21:03:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=636a457d |
| 7 |
|
| 8 |
dev-libs/protobuf-c: fix include path |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/818775 |
| 11 |
Signed-off-by: John Duncan <1i5t5.duncan <AT> cox.net> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/protobuf-c-1.4.0-include-path.patch | 105 +++++++++++++++++++++ |
| 15 |
dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild | 4 + |
| 16 |
2 files changed, 109 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-libs/protobuf-c/files/protobuf-c-1.4.0-include-path.patch b/dev-libs/protobuf-c/files/protobuf-c-1.4.0-include-path.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..ae3fa26e6ab |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-libs/protobuf-c/files/protobuf-c-1.4.0-include-path.patch |
| 23 |
@@ -0,0 +1,105 @@ |
| 24 |
+https://bugs.gentoo.org/818775 |
| 25 |
+ |
| 26 |
+--- a/Makefile.am |
| 27 |
++++ b/Makefile.am |
| 28 |
+@@ -111,7 +111,7 @@ protoc_c_protoc_gen_c_LDADD = \ |
| 29 |
+ -lprotoc |
| 30 |
+ |
| 31 |
+ protobuf-c/protobuf-c.pb.cc protobuf-c/protobuf-c.pb.h: @PROTOC@ $(top_srcdir)/protobuf-c/protobuf-c.proto |
| 32 |
+- $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/protobuf-c/protobuf-c.proto |
| 33 |
++ $(AM_V_GEN)@PROTOC@ -I@includedir@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/protobuf-c/protobuf-c.proto |
| 34 |
+ |
| 35 |
+ BUILT_SOURCES += \ |
| 36 |
+ protobuf-c/protobuf-c.pb.cc \ |
| 37 |
+@@ -174,16 +174,16 @@ t_generated_code2_cxx_generate_packed_da |
| 38 |
+ $(protobuf_LIBS) |
| 39 |
+ |
| 40 |
+ t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto |
| 41 |
+- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto |
| 42 |
++ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I@includedir@ -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto |
| 43 |
+ |
| 44 |
+ t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto |
| 45 |
+- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto |
| 46 |
++ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I@includedir@ -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto |
| 47 |
+ |
| 48 |
+ t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto |
| 49 |
+- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
| 50 |
++ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I@includedir@ -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
| 51 |
+ |
| 52 |
+ t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto |
| 53 |
+- $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
| 54 |
++ $(AM_V_GEN)@PROTOC@ -I@includedir@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
| 55 |
+ |
| 56 |
+ t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) |
| 57 |
+ $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc |
| 58 |
+@@ -214,7 +214,7 @@ t_generated_code3_test_generated_code3_S |
| 59 |
+ t/test-proto3.pb-c.c |
| 60 |
+ |
| 61 |
+ t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto |
| 62 |
+- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto |
| 63 |
++ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I@includedir@ -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto |
| 64 |
+ |
| 65 |
+ BUILT_SOURCES += \ |
| 66 |
+ t/test-proto3.pb-c.c t/test-proto3.pb-c.h |
| 67 |
+@@ -237,7 +237,7 @@ t_issue204_issue204_SOURCES = \ |
| 68 |
+ t_issue204_issue204_LDADD = \ |
| 69 |
+ protobuf-c/libprotobuf-c.la |
| 70 |
+ t/issue204/issue204.pb-c.c t/issue204/issue204.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue204/issue204.proto |
| 71 |
+- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue204/issue204.proto |
| 72 |
++ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I@includedir@ -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue204/issue204.proto |
| 73 |
+ BUILT_SOURCES += \ |
| 74 |
+ t/issue204/issue204.pb-c.c t/issue204/issue204.pb-c.h |
| 75 |
+ EXTRA_DIST += \ |
| 76 |
+@@ -254,7 +254,7 @@ t_issue220_issue220_SOURCES = \ |
| 77 |
+ t_issue220_issue220_LDADD = \ |
| 78 |
+ protobuf-c/libprotobuf-c.la |
| 79 |
+ t/issue220/issue220.pb-c.c t/issue220/issue220.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue220/issue220.proto |
| 80 |
+- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue220/issue220.proto |
| 81 |
++ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I@includedir@ -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue220/issue220.proto |
| 82 |
+ BUILT_SOURCES += \ |
| 83 |
+ t/issue220/issue220.pb-c.c t/issue220/issue220.pb-c.h |
| 84 |
+ EXTRA_DIST += \ |
| 85 |
+@@ -271,7 +271,7 @@ t_issue251_issue251_SOURCES = \ |
| 86 |
+ t_issue251_issue251_LDADD = \ |
| 87 |
+ protobuf-c/libprotobuf-c.la |
| 88 |
+ t/issue251/issue251.pb-c.c t/issue251/issue251.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue251/issue251.proto |
| 89 |
+- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue251/issue251.proto |
| 90 |
++ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I@includedir@ -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue251/issue251.proto |
| 91 |
+ BUILT_SOURCES += \ |
| 92 |
+ t/issue251/issue251.pb-c.c t/issue251/issue251.pb-c.h |
| 93 |
+ EXTRA_DIST += \ |
| 94 |
+@@ -289,14 +289,14 @@ t_issue330_issue330_SOURCES = \ |
| 95 |
+ t_issue330_issue330_LDADD = \ |
| 96 |
+ protobuf-c/libprotobuf-c.la |
| 97 |
+ t/issue330/issue330.pb-c.c t/issue330/issue330.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue330/issue330.proto |
| 98 |
+- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue330/issue330.proto |
| 99 |
++ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I@includedir@ -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue330/issue330.proto |
| 100 |
+ BUILT_SOURCES += \ |
| 101 |
+ t/issue330/issue330.pb-c.c t/issue330/issue330.pb-c.h |
| 102 |
+ |
| 103 |
+ t_issue330_issue330_SOURCES += \ |
| 104 |
+ t/issue389/issue389.pb-c.c # Tack onto issue330 since there is no need for a separate binary here |
| 105 |
+ t/issue389/issue389.pb-c.c t/issue389/issue389.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue389/issue389.proto |
| 106 |
+- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue389/issue389.proto |
| 107 |
++ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I@includedir@ -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue389/issue389.proto |
| 108 |
+ BUILT_SOURCES += \ |
| 109 |
+ t/issue389/issue389.pb-c.c t/issue389/issue389.pb-c.h |
| 110 |
+ EXTRA_DIST += \ |
| 111 |
+@@ -312,7 +312,7 @@ t_issue440_issue440_SOURCES = \ |
| 112 |
+ t_issue440_issue440_LDADD = \ |
| 113 |
+ protobuf-c/libprotobuf-c.la |
| 114 |
+ t/issue440/issue440.pb-c.c t/issue440/issue440.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue440/issue440.proto |
| 115 |
+- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue440/issue440.proto |
| 116 |
++ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I@includedir@ -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue440/issue440.proto |
| 117 |
+ BUILT_SOURCES += \ |
| 118 |
+ t/issue440/issue440.pb-c.c t/issue440/issue440.pb-c.h |
| 119 |
+ EXTRA_DIST += \ |
| 120 |
+@@ -332,7 +332,7 @@ t_issue375_issue375_SOURCES = \ |
| 121 |
+ t_issue375_issue375_LDADD = \ |
| 122 |
+ protobuf-c/libprotobuf-c.la |
| 123 |
+ t/issue375/issue375.pb-c.c t/issue375/issue375.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue375/issue375.proto |
| 124 |
+- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue375/issue375.proto |
| 125 |
++ $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I@includedir@ -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue375/issue375.proto |
| 126 |
+ BUILT_SOURCES += \ |
| 127 |
+ t/issue375/issue375.pb-c.c t/issue375/issue375.pb-c.h |
| 128 |
+ EXTRA_DIST += \ |
| 129 |
|
| 130 |
diff --git a/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild |
| 131 |
index b14451d4492..7a7d74d82d1 100644 |
| 132 |
--- a/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild |
| 133 |
+++ b/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild |
| 134 |
@@ -24,6 +24,10 @@ DEPEND=">=dev-libs/protobuf-3:0=[${MULTILIB_USEDEP}]" |
| 135 |
RDEPEND="${DEPEND}" |
| 136 |
BDEPEND="virtual/pkgconfig" |
| 137 |
|
| 138 |
+PATCHES=( |
| 139 |
+ "${FILESDIR}"/${PN}-1.4.0-include-path.patch |
| 140 |
+) |
| 141 |
+ |
| 142 |
src_prepare() { |
| 143 |
default |
Archives