summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <william.hubbs@sony.com>2020-01-31 12:03:10 -0600
committerWilliam Hubbs <williamh@gentoo.org>2020-01-31 12:03:28 -0600
commita79e35ebcb4afd3342fccf026d7724f312f04fdd (patch)
tree71a96a75405e1add8cc4ff4a8a0a403573dd4904
parentapp-portage/metagen: 0.7.2 + de-warn PkgMetadataXmlIndentation (diff)
downloadgentoo-a79e35ebcb4afd3342fccf026d7724f312f04fdd.tar.gz
gentoo-a79e35ebcb4afd3342fccf026d7724f312f04fdd.tar.bz2
gentoo-a79e35ebcb4afd3342fccf026d7724f312f04fdd.zip
dev-libs/avro-c: fix previous commit
Signed-off-by: William Hubbs <williamh@gentoo.org>
-rw-r--r--dev-libs/avro-c/Manifest1
-rw-r--r--dev-libs/avro-c/files/avro-c-1.9.1-fix-libdir.patch32
-rw-r--r--dev-libs/avro-c/metadata.xml8
3 files changed, 41 insertions, 0 deletions
diff --git a/dev-libs/avro-c/Manifest b/dev-libs/avro-c/Manifest
new file mode 100644
index 000000000000..a4ee489479c9
--- /dev/null
+++ b/dev-libs/avro-c/Manifest
@@ -0,0 +1 @@
+DIST avro-c-1.9.1.tar.gz 216954 BLAKE2B a1647c8315eaad5af7aabee01b71638261daa82def48227046d05da89ef66e8697d6c31f1a4a7b2b8010e1b471e50e24b85701ad7870e6f1d3495262dfaf00c6 SHA512 68b1f44f870c9b6f0b2380da9e34d91148ff4398cb300f4bdd4e3e1ad00820acd9084b73232b00d4cd4935fb992b41dc65afdafcbea14a3d87259608688df904
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
new file mode 100644
index 000000000000..84843abaa5a3
--- /dev/null
+++ b/dev-libs/avro-c/files/avro-c-1.9.1-fix-libdir.patch
@@ -0,0 +1,32 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6f56597..c22e71a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -109,14 +109,14 @@ install(DIRECTORY
+ if (WIN32)
+ install(TARGETS avro-static
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+ else(WIN32)
+ install(TARGETS avro-static avro-shared
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+ endif(WIN32)
+
+@@ -126,7 +126,7 @@ set(prefix ${CMAKE_INSTALL_PREFIX})
+ set(VERSION ${AVRO_VERSION})
+ configure_file(avro-c.pc.in avro-c.pc)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/avro-c.pc
+- DESTINATION lib/pkgconfig)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+ add_executable(avrocat avrocat.c)
+ target_link_libraries(avrocat avro-static)
diff --git a/dev-libs/avro-c/metadata.xml b/dev-libs/avro-c/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/dev-libs/avro-c/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>