[FlightGear] add libpthread to the linker where needed
Fabrice Bellet
bellet at fedoraproject.org
Wed Mar 6 17:12:31 UTC 2013
commit d821e713bdae9d733808bc4ce80e8676b54c9eba
Author: Fabrice Bellet <fabrice at bellet.info>
Date: Wed Mar 6 18:12:22 2013 +0100
add libpthread to the linker where needed
FlightGear-2.10.0-pthread.patch | 125 +++++++++++++++++++++++++++++++++++++++
FlightGear.spec | 7 ++-
2 files changed, 131 insertions(+), 1 deletions(-)
---
diff --git a/FlightGear-2.10.0-pthread.patch b/FlightGear-2.10.0-pthread.patch
new file mode 100644
index 0000000..e7f9890
--- /dev/null
+++ b/FlightGear-2.10.0-pthread.patch
@@ -0,0 +1,125 @@
+diff -uNrp flightgear-2.10.0.orig/src/FDM/YASim/CMakeLists.txt flightgear-2.10.0.new/src/FDM/YASim/CMakeLists.txt
+--- flightgear-2.10.0.orig/src/FDM/YASim/CMakeLists.txt 2012-06-26 22:06:15.000000000 +0200
++++ flightgear-2.10.0.new/src/FDM/YASim/CMakeLists.txt 2013-03-06 17:33:33.686559740 +0100
+@@ -42,11 +42,13 @@ add_executable(yasim-proptest proptest.c
+
+ target_link_libraries(yasim
+ ${SIMGEAR_CORE_LIBRARIES}
+- ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
++ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
++ pthread)
+
+ target_link_libraries(yasim-proptest
+ ${SIMGEAR_CORE_LIBRARIES}
+- ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
++ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
++ pthread)
+
+ install(TARGETS yasim yasim-proptest RUNTIME DESTINATION bin)
+
+diff -uNrp flightgear-2.10.0.orig/src/Input/CMakeLists.txt flightgear-2.10.0.new/src/Input/CMakeLists.txt
+--- flightgear-2.10.0.orig/src/Input/CMakeLists.txt 2013-02-18 15:59:01.000000000 +0100
++++ flightgear-2.10.0.new/src/Input/CMakeLists.txt 2013-03-06 17:33:07.940618932 +0100
+@@ -50,7 +50,8 @@ add_executable(fgjs ${FGJS_SOURCES})
+ target_link_libraries(fgjs
+ ${SIMGEAR_CORE_LIBRARIES}
+ ${PLIB_LIBRARIES}
+- ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
++ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
++ pthread)
+
+ add_executable(js_demo js_demo.cxx)
+
+diff -uNrp flightgear-2.10.0.orig/src/Main/CMakeLists.txt flightgear-2.10.0.new/src/Main/CMakeLists.txt
+--- flightgear-2.10.0.orig/src/Main/CMakeLists.txt 2013-02-18 15:59:01.000000000 +0100
++++ flightgear-2.10.0.new/src/Main/CMakeLists.txt 2013-03-06 17:34:00.583495717 +0100
+@@ -118,6 +118,7 @@ target_link_libraries(metar
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+ ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
+ ${PLATFORM_LIBS}
++ pthread
+ )
+
+ install(TARGETS metar RUNTIME DESTINATION bin)
+diff -uNrp flightgear-2.10.0.orig/utils/fgadmin/src/CMakeLists.txt flightgear-2.10.0.new/utils/fgadmin/src/CMakeLists.txt
+--- flightgear-2.10.0.orig/utils/fgadmin/src/CMakeLists.txt 2013-03-06 17:32:12.929761489 +0100
++++ flightgear-2.10.0.new/utils/fgadmin/src/CMakeLists.txt 2013-03-06 18:02:13.279210990 +0100
+@@ -13,6 +13,7 @@ target_link_libraries(fgadmin FGAdminUI
+ ${FLTK_LIBRARIES}
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+ ${ZLIB_LIBRARY}
++ pthread
+ )
+
+ install(TARGETS fgadmin RUNTIME DESTINATION bin)
+diff -uNrp flightgear-2.10.0.orig/utils/fgelev/CMakeLists.txt flightgear-2.10.0.new/utils/fgelev/CMakeLists.txt
+--- flightgear-2.10.0.orig/utils/fgelev/CMakeLists.txt 2013-01-28 18:03:22.000000000 +0100
++++ flightgear-2.10.0.new/utils/fgelev/CMakeLists.txt 2013-03-06 17:43:33.880343665 +0100
+@@ -5,6 +5,7 @@ target_link_libraries(fgelev
+ ${OPENSCENEGRAPH_LIBRARIES}
+ ${OPENGL_LIBRARIES}
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
++ pthread
+ )
+
+ install(TARGETS fgelev RUNTIME DESTINATION bin)
+diff -uNrp flightgear-2.10.0.orig/utils/fgpanel/CMakeLists.txt flightgear-2.10.0.new/utils/fgpanel/CMakeLists.txt
+--- flightgear-2.10.0.orig/utils/fgpanel/CMakeLists.txt 2012-06-26 22:06:15.000000000 +0200
++++ flightgear-2.10.0.new/utils/fgpanel/CMakeLists.txt 2013-03-06 18:02:30.239178786 +0100
+@@ -31,6 +31,7 @@ if(GLUT_FOUND)
+ ${OPENGL_LIBRARIES}
+ ${PLIB_LIBRARIES}
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
++ pthread
+ )
+
+ include_directories(${PNG_INCLUDE_DIR})
+Binary files flightgear-2.10.0.orig/utils/fgpanel/.CMakeLists.txt.swp and flightgear-2.10.0.new/utils/fgpanel/.CMakeLists.txt.swp differ
+diff -uNrp flightgear-2.10.0.orig/utils/fgviewer/CMakeLists.txt flightgear-2.10.0.new/utils/fgviewer/CMakeLists.txt
+--- flightgear-2.10.0.orig/utils/fgviewer/CMakeLists.txt 2013-01-28 18:03:22.000000000 +0100
++++ flightgear-2.10.0.new/utils/fgviewer/CMakeLists.txt 2013-03-06 17:37:50.008007338 +0100
+@@ -48,5 +48,6 @@ target_link_libraries(fgviewer
+ ${OPENSCENEGRAPH_LIBRARIES}
+ ${OPENGL_LIBRARIES}
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
++ pthread
+ )
+ install(TARGETS fgviewer RUNTIME DESTINATION bin)
+diff -uNrp flightgear-2.10.0.orig/utils/GPSsmooth/CMakeLists.txt flightgear-2.10.0.new/utils/GPSsmooth/CMakeLists.txt
+--- flightgear-2.10.0.orig/utils/GPSsmooth/CMakeLists.txt 2012-06-26 22:06:15.000000000 +0200
++++ flightgear-2.10.0.new/utils/GPSsmooth/CMakeLists.txt 2013-03-06 17:54:34.672054435 +0100
+@@ -21,6 +21,7 @@ target_link_libraries(GPSsmooth
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+ ${PLIB_SG_LIBRARY}
+ ${PLIB_UL_LIBRARY}
++ pthread
+ )
+
+ target_link_libraries(MIDGsmooth
+@@ -28,6 +29,7 @@ target_link_libraries(MIDGsmooth
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+ ${PLIB_SG_LIBRARY}
+ ${PLIB_UL_LIBRARY}
++ pthread
+ )
+
+ target_link_libraries(UGsmooth
+@@ -36,6 +38,7 @@ target_link_libraries(UGsmooth
+ ${PLIB_SG_LIBRARY}
+ ${PLIB_UL_LIBRARY}
+ ${ZLIB_LIBRARY}
++ pthread
+ )
+
+ install(TARGETS GPSsmooth MIDGsmooth UGsmooth RUNTIME DESTINATION bin)
+diff -uNrp flightgear-2.10.0.orig/utils/TerraSync/CMakeLists.txt flightgear-2.10.0.new/utils/TerraSync/CMakeLists.txt
+--- flightgear-2.10.0.orig/utils/TerraSync/CMakeLists.txt 2012-06-26 22:06:15.000000000 +0200
++++ flightgear-2.10.0.new/utils/TerraSync/CMakeLists.txt 2013-03-06 17:41:40.679528071 +0100
+@@ -4,6 +4,7 @@ add_executable(terrasync terrasync.cxx)
+ target_link_libraries(terrasync
+ ${SIMGEAR_CORE_LIBRARIES}
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
++ pthread
+ )
+
+ install(TARGETS terrasync RUNTIME DESTINATION bin)
diff --git a/FlightGear.spec b/FlightGear.spec
index 264b1e5..bb0ff5e 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,7 +1,7 @@
Name: FlightGear
Summary: The FlightGear Flight Simulator
Version: 2.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Amusements/Games
Source0: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
@@ -17,6 +17,7 @@ Source7: COPYING
Patch1: 0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
Patch2: 0002-use-snprintf-for-rotor-strings.patch
Patch3: 0003-make-ShivaVG-and-FGAdminUI-static-libraries.patch
+Patch4: FlightGear-2.10.0-pthread.patch
URL: http://www.flightgear.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +40,7 @@ expanded and improved upon by anyone interested in contributing
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# make rpmlint happy
find -name \*.h -o -name \*.cpp -o -name \*.cxx -o -name \*.hxx \
@@ -120,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Wed Mar 06 2013 Fabrice Bellet <fabrice at bellet.info> - 2.10.0-2
+- add libpthread to the linker where needed
+
* Mon Feb 18 2013 Fabrice Bellet <fabrice at bellet.info> - 2.10.0-1
- new upstream release
More information about the scm-commits
mailing list