commit: 3313f9953cbd4607e4ec6277f6565d53c9d8a300
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 10:33:36 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon May 28 10:33:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3313f995
net-libs/grpc: fix libdir in pkgconfig files
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch | 17 +++++++++++++++++
.../grpc/{grpc-1.11.0.ebuild => grpc-1.11.0-r1.ebuild} | 2 ++
2 files changed, 19 insertions(+)
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
new file mode 100644
index 00000000000..257bef8aa14
--- /dev/null
+++ b/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch
@@ -0,0 +1,17 @@
+--- a/Makefile 2018-05-28 17:59:34.631540261 +0800
++++ b/Makefile 2018-05-28 18:01:31.266936000 +0800
+@@ -460,11 +460,11 @@
+ CACHE_MK += HAS_PKG_CONFIG = true,
+ endif
+
+-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)
++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)
+
+-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)
++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)
+
+-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)
++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)
+
+ ifeq ($(SYSTEM),MINGW32)
+ EXECUTABLE_SUFFIX = .exe
diff --git a/net-libs/grpc/grpc-1.11.0.ebuild
b/net-libs/grpc/grpc-1.11.0-r1.ebuild
similarity index 94%
rename from net-libs/grpc/grpc-1.11.0.ebuild
rename to net-libs/grpc/grpc-1.11.0-r1.ebuild
index 1a6156e4625..a232297d5cf 100644
--- a/net-libs/grpc/grpc-1.11.0.ebuild
+++ b/net-libs/grpc/grpc-1.11.0-r1.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
"${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
+ "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
)
src_prepare() {
@@ -42,6 +43,7 @@ src_compile() {
emake \
V=1 \
prefix=/usr \
+ INSTALL_LIBDIR="$(get_libdir)" \
AR="$(tc-getAR)" \
AROPTS="rcs" \
CFLAGS="${CFLAGS}" \
