forked from pool/gzdoom
28 lines
22 KiB
Diff
28 lines
22 KiB
Diff
|
From: Jan Engelhardt <jengelh@inai.de>
|
||
|
|
Date: 2019-12-19 22:50:13.191470704 +0100
|
||
|
|
|
||
|
|
Fix linker error on i586(only) on -ldl.
|
||
|
|
|
||
|
|
[ 756s] cd /home/abuild/rpmbuild/BUILD/gzdoom-g4.2.4/build/src && /usr/bin/cmake -E cmake_link_script CMakeFiles/zdoom.dir/link.txt --verbose=1
|
||
|
|
[ 757s] /usr/bin/c++ -std=gnu++14 -Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers -ffp-contract=off -Wno-unused-result -fomit-frame-pointer -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -msse -msse2 -DNDEBUG -ffp-contract=off -fPIE -fopenmp -fno-rtti -fomit-frame-pointer -O2 -g -DNDEBUG -pie -rdynamic CMakeFiles/zdoom.dir/__autostart.cpp.o CMakeFiles/zdoom.dir/posix/i_steam.cpp.o CMakeFiles/zdoom.dir/posix/sdl/crashcatcher.c.o CMakeFiles/zdoom.dir/posix/sdl/hardware.cpp.o CMakeFiles/zdoom.dir/posix/sdl/i_gui.cpp.o CMakeFiles/zdoom.dir/posix/sdl/i_input.cpp.o CMakeFiles/zdoom.dir/posix/sdl/i_joystick.cpp.o CMakeFiles/zdoom.dir/posix/sdl/i_main.cpp.o CMakeFiles/zdoom.dir/posix/sdl/i_system.cpp.o CMakeFiles/zdoom.dir/posix/sdl/sdlglvideo.cpp.o CMakeFiles/zdoom.dir/posix/sdl/st_start.cpp.o CMakeFiles/zdoom.dir/posix/unix/i_specialpaths.cpp.o CMakeFiles/zdoom.dir/posix/unix/gtk_dialogs.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx_asm/hq2x_asm.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx_asm/hq3x_asm.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx_asm/hq4x_asm.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx_asm/hqnx_asm_Image.cpp.o CMakeFiles/zdoom.dir/rendering/swrenderer/r_all.cpp.o CMakeFiles/zdoom.dir/rendering/swrenderer/r_swscene.cpp.o CMakeFiles/zdoom.dir/rendering/polyrenderer/poly_all.cpp.o CMakeFiles/zdoom.dir/sound/music/music_midi_base.cpp.o CMakeFiles/zdoom.dir/sound/backend/oalsound.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx/init.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx/hq2x.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx/hq3x.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx/hq4x.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/xbr/xbrz.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/xbr/xbrz_old.cpp.o CMakeFiles/zdoom.dir/rendering/gl_load/gl_load.c.o CMakeFiles/zdoom.dir/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/dynlights/hw_dynlightdata.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_bsp.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_fakeflat.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_decal.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_drawinfo.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_drawlist.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_clipper.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_flats.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_portal.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_renderhacks.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_sky.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_skyportal.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_sprites.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_spritelight.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_walls.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_walls_vertex.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_weapon.cpp.o CMakeFiles/zdoom.dir/r_data/models/models.cpp.o CMakeFiles/zdoom.dir/utility/matrix.cpp.o CMakeFiles/zdoom.dir/am_map.cpp.o CMakeFiles/zdoom.dir/playsim/bots/b_bot.cpp.o CMakeFiles/zdoom.dir/playsim/bots/b_func.cpp.o CMakeFiles/zdoom.dir/playsim/bots/b_game.cpp.o CMakeFiles/zdoom.dir/playsim/bots/b_move.cpp.o CMakeFiles/zdoom.dir/playsim/bots/b_think.cpp.o CMakeFiles/zdoom.dir/bbannouncer.cpp.o CMakeFiles/zdoom.dir/console/c_bind.cpp.o CMakeFiles/zdoom.dir/console/c_cmds.cpp.o CMakeFiles/zdoom.dir/console/c_console.cpp.o CMakeFiles/zdoom.dir/console/c_consolebuffer.cpp.o CMakeFiles/zdoom.dir/console/c_cvars.cpp.o CMakeFiles/zdoom.dir/console/c_dispatch.cpp.o CMakeFiles/zdoom.dir/console/c_expr.cpp.o CMakeFiles/zdoom.dir/console/c_functions.cpp.o CMakeFiles/zdoom.dir/ct_chat.cpp.o CM
|
||
|
|
[ 757s] /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ../libraries/zmusic/libzmusic.a(i_module.cpp.o): undefined reference to symbol 'dlclose@@GLIBC_2.0'
|
||
|
|
[ 757s] /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: /usr/lib/gcc/i586-suse-linux/9/../../../libdl.so: error adding symbols: DSO missing from command line
|
||
|
|
|
||
|
|
---
|
||
|
|
libraries/zmusic/CMakeLists.txt | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
Index: gzdoom-g4.2.4/libraries/zmusic/CMakeLists.txt
|
||
|
|
===================================================================
|
||
|
|
--- gzdoom-g4.2.4.orig/libraries/zmusic/CMakeLists.txt
|
||
|
|
+++ gzdoom-g4.2.4/libraries/zmusic/CMakeLists.txt
|
||
|
|
@@ -94,7 +94,7 @@ add_library( zmusic STATIC
|
||
|
|
zmusic/zmusic.cpp
|
||
|
|
${PLAT_SOURCES}
|
||
|
|
)
|
||
|
|
-target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
|
||
|
|
+target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi -ldl )
|
||
|
|
|
||
|
|
if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
|
||
|
|
include_directories( "${SNDFILE_INCLUDE_DIRS}" )
|