| 1 |
commit: 3313f9953cbd4607e4ec6277f6565d53c9d8a300 |
| 2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 28 10:33:36 2018 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 28 10:33:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3313f995 |
| 7 |
|
| 8 |
net-libs/grpc: fix libdir in pkgconfig files |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch | 17 +++++++++++++++++ |
| 13 |
.../grpc/{grpc-1.11.0.ebuild => grpc-1.11.0-r1.ebuild} | 2 ++ |
| 14 |
2 files changed, 19 insertions(+) |
| 15 |
|
| 16 |
diff --git a/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch b/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..257bef8aa14 |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch |
| 21 |
@@ -0,0 +1,17 @@ |
| 22 |
+--- a/Makefile 2018-05-28 17:59:34.631540261 +0800 |
| 23 |
++++ b/Makefile 2018-05-28 18:01:31.266936000 +0800 |
| 24 |
+@@ -460,11 +460,11 @@ |
| 25 |
+ CACHE_MK += HAS_PKG_CONFIG = true, |
| 26 |
+ endif |
| 27 |
+ |
| 28 |
+-CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) |
| 29 |
++CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) |
| 30 |
+ |
| 31 |
+-CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) |
| 32 |
++CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) |
| 33 |
+ |
| 34 |
+-CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) |
| 35 |
++CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE) |
| 36 |
+ |
| 37 |
+ ifeq ($(SYSTEM),MINGW32) |
| 38 |
+ EXECUTABLE_SUFFIX = .exe |
| 39 |
|
| 40 |
diff --git a/net-libs/grpc/grpc-1.11.0.ebuild b/net-libs/grpc/grpc-1.11.0-r1.ebuild |
| 41 |
similarity index 94% |
| 42 |
rename from net-libs/grpc/grpc-1.11.0.ebuild |
| 43 |
rename to net-libs/grpc/grpc-1.11.0-r1.ebuild |
| 44 |
index 1a6156e4625..a232297d5cf 100644 |
| 45 |
--- a/net-libs/grpc/grpc-1.11.0.ebuild |
| 46 |
+++ b/net-libs/grpc/grpc-1.11.0-r1.ebuild |
| 47 |
@@ -30,6 +30,7 @@ PATCHES=( |
| 48 |
"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch" |
| 49 |
"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" |
| 50 |
"${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch" |
| 51 |
+ "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" |
| 52 |
) |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
@@ -42,6 +43,7 @@ src_compile() { |
| 56 |
emake \ |
| 57 |
V=1 \ |
| 58 |
prefix=/usr \ |
| 59 |
+ INSTALL_LIBDIR="$(get_libdir)" \ |
| 60 |
AR="$(tc-getAR)" \ |
| 61 |
AROPTS="rcs" \ |
| 62 |
CFLAGS="${CFLAGS}" \ |
Archives