diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-08-14 16:58:35 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-08-14 16:58:35 +0000 |
| commit | b41e1a01e256978d696131ace193357bea31a9a6 (patch) | |
| tree | e622960e442e720df47daf8cc1630047cae637fe /dev-libs | |
| parent | Stable for amd64 wrt bug #480036 (diff) | |
| download | gentoo-2-b41e1a01e256978d696131ace193357bea31a9a6.tar.gz gentoo-2-b41e1a01e256978d696131ace193357bea31a9a6.tar.bz2 gentoo-2-b41e1a01e256978d696131ace193357bea31a9a6.zip | |
Fix build on systems that do not have a separate libdl wrt bug #478644. Patch by Yuta SATOH <nigoro.gentoo@0x100.com>.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/soprano/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/soprano/files/soprano-2.9.3-libdl.patch | 28 | ||||
| -rw-r--r-- | dev-libs/soprano/soprano-2.9.3.ebuild | 3 |
3 files changed, 36 insertions, 2 deletions
diff --git a/dev-libs/soprano/ChangeLog b/dev-libs/soprano/ChangeLog index 56785876923f..daccfb03cfae 100644 --- a/dev-libs/soprano/ChangeLog +++ b/dev-libs/soprano/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/soprano # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/ChangeLog,v 1.116 2013/07/12 17:02:41 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/ChangeLog,v 1.117 2013/08/14 16:58:35 kensington Exp $ + + 14 Aug 2013; Michael Palimaka <kensington@gentoo.org> + +files/soprano-2.9.3-libdl.patch, soprano-2.9.3.ebuild: + Fix build on systems that do not have a separate libdl wrt bug #478644. Patch + by Yuta SATOH <nigoro.gentoo@0x100.com>. *soprano-2.9.3 (12 Jul 2013) diff --git a/dev-libs/soprano/files/soprano-2.9.3-libdl.patch b/dev-libs/soprano/files/soprano-2.9.3-libdl.patch new file mode 100644 index 000000000000..35b4761be9d5 --- /dev/null +++ b/dev-libs/soprano/files/soprano-2.9.3-libdl.patch @@ -0,0 +1,28 @@ +From 4dc66bee545e1aeb4e61a9fdcc35b28ddfeee141 Mon Sep 17 00:00:00 2001 +From: Yuta SATOH <nigoro.gentoo@0x100.com> +Date: Thu, 15 Aug 2013 02:27:20 +1000 +Subject: [PATCH] Use CMAKE_DL_LIBS instead of hardcoding dl. + +This fixes build on systems that do not provide a separate libdl. + +REVIEW: 111813 +--- + cmake/modules/FindRedland.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindRedland.cmake b/cmake/modules/FindRedland.cmake +index 4eddb84..b5b74f6 100644 +--- a/cmake/modules/FindRedland.cmake ++++ b/cmake/modules/FindRedland.cmake +@@ -108,7 +108,7 @@ if(NOT WIN32) + try_run(_TEST_EXITCODE _TEST_COMPILED + "${CMAKE_CURRENT_BINARY_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/CheckLibraryLoads.c" +- CMAKE_FLAGS "-DLINK_LIBRARIES=dl" ++ CMAKE_FLAGS "-DLINK_LIBRARIES=${CMAKE_DL_LIBS}" + RUN_OUTPUT_VARIABLE _OUTPUT + ARGS ${_REDLAND_STORAGE_LIBS} + ) +-- +1.8.3.2 + diff --git a/dev-libs/soprano/soprano-2.9.3.ebuild b/dev-libs/soprano/soprano-2.9.3.ebuild index 9635749fc923..8ea610d074af 100644 --- a/dev-libs/soprano/soprano-2.9.3.ebuild +++ b/dev-libs/soprano/soprano-2.9.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.9.3.ebuild,v 1.1 2013/07/12 17:02:41 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.9.3.ebuild,v 1.2 2013/08/14 16:58:35 kensington Exp $ EAPI=5 @@ -47,6 +47,7 @@ CMAKE_IN_SOURCE_BUILD="1" PATCHES=( "${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake" + "${FILESDIR}/${P}-libdl.patch" ) pkg_setup() { |