-
Notifications
You must be signed in to change notification settings - Fork 8
Add soname to libShowMySky #8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
Reading the bug linked, I don't think soname by itself will help. You'll also need to patch Stellarium to open libShowMySky.so.0 in runtime instead of libShowMySky.so |
|
The Libraries which link during build time, don't have this problem because the executable remembers that it needs to load .so.0. That's why .so is only useful during build time to resolve |
|
Hmm, you're right. Just checked, indeed it doesn't load if I remove |
|
/usr/bin/showmysky itself also opens it like that, so would also need to be moved to the devel package, or patched |
|
I think I'll add a version argument to the |
|
Pushed 8e535d2. |
|
Sorry, I admit I know nearly nothing of programming and I did a shot in the dark here. So, I assume that also stellarium needs a way to read the value of |
|
With current diff --git a/CMakeLists.txt b/CMakeLists.txt
index 902239662d..ef21a6b872 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -685,10 +685,10 @@ SET(CMAKE_AUTOUIC ON) # ?
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
IF(ENABLE_SHOWMYSKY)
- FIND_PACKAGE(ShowMySky REQUIRED)
+ FIND_PACKAGE(ShowMySky-Qt${QT_VERSION_MAJOR} REQUIRED)
ADD_DEFINITIONS(-DENABLE_SHOWMYSKY)
- GET_TARGET_PROPERTY(ShowMySky_INCLUDE_DIRECTORIES ShowMySky::ShowMySky INTERFACE_INCLUDE_DIRECTORIES)
- GET_TARGET_PROPERTY(ShowMySky_LIBRARY ShowMySky::ShowMySky LOCATION)
+ GET_TARGET_PROPERTY(ShowMySky-Qt${QT_VERSION_MAJOR}_INCLUDE_DIRECTORIES ShowMySky::ShowMySky INTERFACE_INCLUDE_DIRECTORIES)
+ GET_TARGET_PROPERTY(ShowMySky-Qt${QT_VERSION_MAJOR}_LIBRARY ShowMySky::ShowMySky LOCATION)
IF(EXISTS ${ShowMySky_LIBRARY})
MESSAGE(STATUS "Found ShowMySky library: ${ShowMySky_LIBRARY}")
ELSE()
diff --git a/src/core/modules/AtmosphereShowMySky.cpp b/src/core/modules/AtmosphereShowMySky.cpp
index 41b3538ca3..f58406d09c 100644
--- a/src/core/modules/AtmosphereShowMySky.cpp
+++ b/src/core/modules/AtmosphereShowMySky.cpp
@@ -407,7 +407,7 @@ void AtmosphereShowMySky::resolveFunctions()
}
AtmosphereShowMySky::AtmosphereShowMySky()
- : showMySkyLib("ShowMySky")
+ : showMySkyLib(SHOWMYSKY_LIB_NAME, ShowMySky_ABI_version)
, viewport(0,0,0,0)
, gridMaxY(44)
, gridMaxX(44) |
To meet criteria for packaging CalcMySky into Fedora, I'd like to propose to add soname to libShowMySky.
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2131842