Skip to content

Commit 754a5d3

Browse files
author
Mike Trinkala
authored
Merge pull request #269 from ameihm0912/opensslfedora
fix issue in openssl test on fedora:latest
2 parents 3159759 + ed09144 commit 754a5d3

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

build/run.sh

+2-4
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,8 @@ build_lua_sandbox_extensions() {
106106
fi
107107
cmake_args="$cmake_args -DEXT_$ext=true"
108108
elif [ "$CPACK_GENERATOR" = "RPM" ]; then
109-
if rpm -qa | grep -q compat-openssl10; then
110-
# Newer Fedora installs 1.1 by default but also installs a 1.0
111-
# compat package; if we see that installed also grab the devel version
112-
# of it
109+
if [ -f "/etc/redhat-release" ] && grep -q '^Fedora' /etc/redhat-release; then
110+
# Newer Fedora installs 1.1 by default, install the 1.0 compat package as well
113111
packages="$packages compat-openssl10-devel"
114112
else
115113
packages="$packages openssl-devel"

sax/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ project(sax LANGUAGES NONE)
88
externalproject_add(
99
ep_sax
1010
GIT_REPOSITORY https://github.com/trink/symtseries.git
11-
GIT_TAG bd2426c93d0d55977ca7b21354105463b0470a49
11+
GIT_TAG 62fbe4df396e68de637aca0cdb597e3593bab754
1212
CMAKE_ARGS ${EP_CMAKE_ARGS}
1313
UPDATE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.${PROJECT_NAME} <SOURCE_DIR>/CMakeLists.txt
1414
)

0 commit comments

Comments
 (0)