diff options
| author |   Jason Zaman <perfinion@gentoo.org> | 2018-05-28 18:33:36 +0800 |
|---|---|---|
| committer | Jason Zaman <perfinion@gentoo.org> | 2018-05-28 18:33:36 +0800 |
| commit | 3313f9953cbd4607e4ec6277f6565d53c9d8a300 (patch) | |
| tree | 8b672e31784997fd92bd5d915109cc666e72d23b /net-libs | |
| parent | app-admin/setools: respect libdir when cross compiling (diff) | |
| download | gentoo-3313f9953cbd4607e4ec6277f6565d53c9d8a300.tar.gz gentoo-3313f9953cbd4607e4ec6277f6565d53c9d8a300.tar.bz2 gentoo-3313f9953cbd4607e4ec6277f6565d53c9d8a300.zip | |
net-libs/grpc: fix libdir in pkgconfig files
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch | 17 | ||||
| -rw-r--r-- | net-libs/grpc/grpc-1.11.0-r1.ebuild (renamed from net-libs/grpc/grpc-1.11.0.ebuild) | 2 |
2 files changed, 19 insertions, 0 deletions
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 000000000000..257bef8aa140 --- /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 index 1a6156e46259..a232297d5cfc 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}" \ |