diff options
| author |   William Lallemand <wlallemand@gmail.com> | 2019-04-08 14:36:12 +0200 |
|---|---|---|
| committer | William Lallemand <wlallemand@gmail.com> | 2019-04-08 15:27:08 +0000 |
| commit | 6565a227f5953a2648783f12870dc181d1168f73 (patch) | |
| tree | fe305705308a8ca4d1cdb5551896772566bf4975 /dev-libs | |
| parent | net-im/riot-web: update to 1.0.7 (diff) | |
| download | matrix-6565a227f5953a2648783f12870dc181d1168f73.tar.gz matrix-6565a227f5953a2648783f12870dc181d1168f73.tar.bz2 matrix-6565a227f5953a2648783f12870dc181d1168f73.zip | |
dev-libs/sortfilterproxymodel: multilib-strict check failed
This patch fixes the multilib-strict check by installing the library in
the right path.
Files matching a file type that is not allowed:
usr/lib/libSortFilterProxyModel.so.0.2.0
* ERROR: dev-libs/sortfilterproxymodel-9999::matrix failed:
* multilib-strict check failed!
*
* Call stack:
* misc-functions.sh, line 586: Called install_qa_check
* misc-functions.sh, line 132: Called source 'install_symlink_html_docs'
* 80multilib-strict, line 46: Called multilib_strict_check
* 80multilib-strict, line 42: Called die
* The specific snippet of code:
* [[ ${abort} == yes ]] && die "multilib-strict check failed!"
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/sortfilterproxymodel/files/sortfilterproxymodel-libdir.patch | 24 | ||||
| -rw-r--r-- | dev-libs/sortfilterproxymodel/sortfilterproxymodel-9999.ebuild | 5 |
2 files changed, 28 insertions, 1 deletions
diff --git a/dev-libs/sortfilterproxymodel/files/sortfilterproxymodel-libdir.patch b/dev-libs/sortfilterproxymodel/files/sortfilterproxymodel-libdir.patch new file mode 100644 index 0000000..358b055 --- /dev/null +++ b/dev-libs/sortfilterproxymodel/files/sortfilterproxymodel-libdir.patch @@ -0,0 +1,24 @@ +diff --git a/SortFilterProxyModel.pro b/SortFilterProxyModel.pro +index 57e3175..dea9731 100644 +--- a/SortFilterProxyModel.pro ++++ b/SortFilterProxyModel.pro +@@ -16,6 +16,10 @@ unix:!mac:isEmpty(PREFIX) { + PREFIX = /usr/local + } + ++isEmpty(LIB_DIR){ ++ LIB_DIR = $${PREFIX}/lib ++} ++ + headers.path = $${PREFIX}/include/SortFilterProxyModel + headers.files = $$PWD/qqmlsortfilterproxymodel.h + +@@ -50,7 +54,7 @@ proxyrole_headers.files = $$PWD/proxyroles/proxyrole.h \ + $$PWD/proxyroles/regexprole.h \ + $$PWD/proxyroles/filterrole.h + +-target.path = $${PREFIX}/lib ++target.path = $${LIB_DIR} + + QMAKE_PKGCONFIG_NAME = SortFilterProxyModel + QMAKE_PKGCONFIG_DESCRIPTION = A nicely exposed QSortFilterProxyModel for QML diff --git a/dev-libs/sortfilterproxymodel/sortfilterproxymodel-9999.ebuild b/dev-libs/sortfilterproxymodel/sortfilterproxymodel-9999.ebuild index 0952704..cb6291e 100644 --- a/dev-libs/sortfilterproxymodel/sortfilterproxymodel-9999.ebuild +++ b/dev-libs/sortfilterproxymodel/sortfilterproxymodel-9999.ebuild @@ -6,6 +6,8 @@ EAPI=6 DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix" HOMEPAGE="https://gitlab.com/b0/sortfilterproxymodel" +PATCHES=( "${FILESDIR}"/sortfilterproxymodel-libdir.patch ) + inherit eutils qmake-utils if [[ ${PV} == "9999" ]]; then @@ -30,7 +32,8 @@ DEPEND="${RDEPEND} src_configure() { eqmake5 \ - PREFIX=/usr + PREFIX=/usr \ + LIB_DIR=/usr/$(get_libdir)/ } src_install() { |