Attachment #689868 for bug #773211

View | Details | Raw Unified | Return to bug 773211 | Differences between
Collapse All | Expand All




This condition makes it link to wrong library on Gentoo Prefix on Debian
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -246,11 +246,7 @@ target_link_libraries(components
     RecastNavigation::Recast
     )
 
-if (BULLET_USE_DOUBLES AND (UBUNTU_FOUND OR DEBIAN_FOUND) AND OPENMW_USE_SYSTEM_BULLET)
-    target_link_libraries(components BulletCollision-float64 LinearMath-float64)
-else()
     target_link_libraries(components ${BULLET_LIBRARIES})
-endif()
 
 if (WIN32)
     target_link_libraries(components




# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

# used when BUILD_OPENCS flag is enabled. See bug #676266.

RDEPEND="
	app-arch/lz4
	dev-games/mygui
	dev-games/recastnavigation
	dev-libs/boost:=[threads]


PATCHES=(
	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
	"${FILESDIR}"/openmw-0.47.0-bullet-debian.patch
)

src_prepare() {


	# Use the system tinyxml headers
	rm -v extern/oics/tiny{str,xml}* || die

	# Unbundle recastnavigation
	rm -vr extern/recastnavigation || die
	sed -i "s#GENTOO_RECAST_LIBDIR#${EPREFIX}/usr/$(get_libdir)#" CMakeLists.txt || die
}

src_configure() {

		-DICONDIR="${EPREFIX}/usr/share/icons/hicolor/256x256/apps"
		-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data"
		-DUSE_SYSTEM_TINYXML=ON
		-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
		-DDESIRED_QT_VERSION=5
		-DBULLET_USE_DOUBLES=ON
	)

Return to bug 773211

Line 0 Link Here

(-)a/games-engines/openmw/files/openmw-0.47.0-bullet-debian.patch (+15 lines)
	1	This condition makes it link to wrong library on Gentoo Prefix on Debian
	2	--- a/components/CMakeLists.txt
	3	+++ b/components/CMakeLists.txt
	4	@@ -246,11 +246,7 @@ target_link_libraries(components
	5	RecastNavigation::Recast
	6	)
	7
	8	-if (BULLET_USE_DOUBLES AND (UBUNTU_FOUND OR DEBIAN_FOUND) AND OPENMW_USE_SYSTEM_BULLET)
	9	- target_link_libraries(components BulletCollision-float64 LinearMath-float64)
	10	-else()
	11	target_link_libraries(components ${BULLET_LIBRARIES})
	12	-endif()
	13
	14	if (WIN32)
	15	target_link_libraries(components

Lines 1-4 Link Here

(-)a/games-engines/openmw/openmw-9999.ebuild (-6 / +4 lines)
1	# Copyright 1999-2020 Gentoo Authors	1	# Copyright 1999-2021 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	EAPI=7	4	EAPI=7
Lines 26-31 RESTRICT="!test? ( test )" Link Here
26	# used when BUILD_OPENCS flag is enabled. See bug #676266.	26	# used when BUILD_OPENCS flag is enabled. See bug #676266.
27		27
28	RDEPEND="	28	RDEPEND="
		29	app-arch/lz4
29	dev-games/mygui	30	dev-games/mygui
30	dev-games/recastnavigation	31	dev-games/recastnavigation
31	dev-libs/boost:=[threads]	32	dev-libs/boost:=[threads]
Lines 62-68 BDEPEND=" Link Here
62		63
63	PATCHES=(	64	PATCHES=(
64	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch	65	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
65	"${FILESDIR}"/openmw-0.46.0-recastnavigation.patch	66	"${FILESDIR}"/openmw-0.47.0-bullet-debian.patch
66	)	67	)
67		68
68	src_prepare() {	69	src_prepare() {
Lines 70-79 src_prepare() { Link Here
70		71
71	# Use the system tinyxml headers	72	# Use the system tinyxml headers
72	rm -v extern/oics/tiny{str,xml}* \|\| die	73	rm -v extern/oics/tiny{str,xml}* \|\| die
73
74	# Unbundle recastnavigation
75	rm -vr extern/recastnavigation \|\| die
76	sed -i "s#GENTOO_RECAST_LIBDIR#${EPREFIX}/usr/$(get_libdir)#" CMakeLists.txt \|\| die
77	}	74	}
78		75
79	src_configure() {	76	src_configure() {
Lines 95-100 src_configure() { Link Here
95	-DICONDIR="${EPREFIX}/usr/share/icons/hicolor/256x256/apps"	92	-DICONDIR="${EPREFIX}/usr/share/icons/hicolor/256x256/apps"
96	-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data"	93	-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data"
97	-DUSE_SYSTEM_TINYXML=ON	94	-DUSE_SYSTEM_TINYXML=ON
		95	-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
98	-DDESIRED_QT_VERSION=5	96	-DDESIRED_QT_VERSION=5
99	-DBULLET_USE_DOUBLES=ON	97	-DBULLET_USE_DOUBLES=ON
100	)	98	)