Skip to content
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

Arch detection woth OpenSUSE requires a patch #14

Open
dominig opened this issue Mar 9, 2016 · 0 comments
Open

Arch detection woth OpenSUSE requires a patch #14

dominig opened this issue Mar 9, 2016 · 0 comments

Comments

@dominig
Copy link
Contributor

dominig commented Mar 9, 2016

Hello

the ARCH dectection has been modified between 4.0 and 4.2 and the new code fails with OpenSUSE.
(actuall only Debian and Fedora case are supported) what leads to a systematic failure on 34 bit architecture.
The following patch adds OpenSUSE support.
The test is written in order to work on Workstation and the OBS Cloud building system.

Dominig

---------- Patch ----------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b568241..fe35443 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,6 @@ IF (NOT WIN32)
ENDIF (PREFIX)

 IF (EXISTS /etc/debian_version)
  •  MESSAGE (STATUS "**\* Debian detected")
    
    SET (PACKAGE_FORMAT "DEB")
    SET (PACKAGE_DEPS "libc6, libwxgtk2.8-0 (>= 2.8.7.1), libglu1-mesa (>= 7.0.0), libgl1-mesa-glx (>= 7.0.0), zlib1g, bzip2")
    SET (LIB_INSTALL_DIR "lib")
    @@ -60,8 +59,7 @@ IF (NOT WIN32)
    SET (ARCH "i386")
    ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
    ENDIF (EXISTS /etc/debian_version)
  • IF (EXISTS /etc/redhat-release OR EXISTS /etc/susehelp.d)
  • MESSAGE (STATUS "*** Redhat or OpenSUSE detected")
  • IF (EXISTS /etc/redhat-release)^M
    SET (PACKAGE_FORMAT "RPM")
    SET (PACKAGE_DEPS "opencpn zlib bzip2")
    IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
    @@ -71,7 +69,7 @@ IF (NOT WIN32)
    SET (ARCH "i386")
    SET (LIB_INSTALL_DIR "lib")
    ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
  • ENDIF (EXISTS /etc/redhat-release OR EXISTS /etc/susehelp.d)
  • ENDIF (EXISTS /etc/redhat-release)^M
    ENDIF (UNIX AND NOT APPLE)
    endif(NOT WIN32)

diff --git a/buildlinux64/OCPNsenc/OCPNsenc b/buildlinux64/OCPNsenc/OCPNsenc
index 7c62f75..1e01dcf 100644
Binary files a/buildlinux64/OCPNsenc/OCPNsenc and b/buildlinux64/OCPNsenc/OCPNsenc differ

bdbcat added a commit that referenced this issue Apr 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant