Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/avro-c/files/, dev-libs/avro-c/
Date: Fri, 31 Jan 2020 18:03:42
Message-Id: 1580493808.a79e35ebcb4afd3342fccf026d7724f312f04fdd.williamh@gentoo
1 commit: a79e35ebcb4afd3342fccf026d7724f312f04fdd
2 Author: William Hubbs <william.hubbs <AT> sony <DOT> com>
3 AuthorDate: Fri Jan 31 18:03:10 2020 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 31 18:03:28 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a79e35eb
7
8 dev-libs/avro-c: fix previous commit
9
10 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
11
12 dev-libs/avro-c/Manifest | 1 +
13 .../avro-c/files/avro-c-1.9.1-fix-libdir.patch | 32 ++++++++++++++++++++++
14 dev-libs/avro-c/metadata.xml | 8 ++++++
15 3 files changed, 41 insertions(+)
16
17 diff --git a/dev-libs/avro-c/Manifest b/dev-libs/avro-c/Manifest
18 new file mode 100644
19 index 00000000000..a4ee489479c
20 --- /dev/null
21 +++ b/dev-libs/avro-c/Manifest
22 @@ -0,0 +1 @@
23 +DIST avro-c-1.9.1.tar.gz 216954 BLAKE2B a1647c8315eaad5af7aabee01b71638261daa82def48227046d05da89ef66e8697d6c31f1a4a7b2b8010e1b471e50e24b85701ad7870e6f1d3495262dfaf00c6 SHA512 68b1f44f870c9b6f0b2380da9e34d91148ff4398cb300f4bdd4e3e1ad00820acd9084b73232b00d4cd4935fb992b41dc65afdafcbea14a3d87259608688df904
24
25 diff --git a/dev-libs/avro-c/files/avro-c-1.9.1-fix-libdir.patch b/dev-libs/avro-c/files/avro-c-1.9.1-fix-libdir.patch
26 new file mode 100644
27 index 00000000000..84843abaa5a
28 --- /dev/null
29 +++ b/dev-libs/avro-c/files/avro-c-1.9.1-fix-libdir.patch
30 @@ -0,0 +1,32 @@
31 +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
32 +index 6f56597..c22e71a 100644
33 +--- a/src/CMakeLists.txt
34 ++++ b/src/CMakeLists.txt
35 +@@ -109,14 +109,14 @@ install(DIRECTORY
36 + if (WIN32)
37 + install(TARGETS avro-static
38 + RUNTIME DESTINATION bin
39 +- LIBRARY DESTINATION lib
40 +- ARCHIVE DESTINATION lib
41 ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
42 ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
43 + )
44 + else(WIN32)
45 + install(TARGETS avro-static avro-shared
46 + RUNTIME DESTINATION bin
47 +- LIBRARY DESTINATION lib
48 +- ARCHIVE DESTINATION lib
49 ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
50 ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
51 + )
52 + endif(WIN32)
53 +
54 +@@ -126,7 +126,7 @@ set(prefix ${CMAKE_INSTALL_PREFIX})
55 + set(VERSION ${AVRO_VERSION})
56 + configure_file(avro-c.pc.in avro-c.pc)
57 + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/avro-c.pc
58 +- DESTINATION lib/pkgconfig)
59 ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
60 +
61 + add_executable(avrocat avrocat.c)
62 + target_link_libraries(avrocat avro-static)
63
64 diff --git a/dev-libs/avro-c/metadata.xml b/dev-libs/avro-c/metadata.xml
65 new file mode 100644
66 index 00000000000..c36c37139fa
67 --- /dev/null
68 +++ b/dev-libs/avro-c/metadata.xml
69 @@ -0,0 +1,8 @@
70 +<?xml version="1.0" encoding="UTF-8"?>
71 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
72 +<pkgmetadata>
73 + <maintainer type="person">
74 + <email>williamh@g.o</email>
75 + <name>William Hubbs</name>
76 + </maintainer>
77 +</pkgmetadata>