Skip to content

Add -fPIC to abichecker for qt dependent builds #848

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 3, 2022
Merged

Add -fPIC to abichecker for qt dependent builds #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions jenkins-scripts/docker/ignition-abichecker.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ then
fi
fi

if [[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-gazebo" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 7 ]] || \
[[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-gui" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 7 ]] || \
[[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-launch" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 6 ]] || \
[[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-sensors" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 7 ]] || \
[[ "${ABI_JOB_SOFTWARE_NAME}" = "ign-rendering" && ${GZ_NAME_PREFIX_MAJOR_VERSION} -ge 7 ]]
then
# -fPIC needed to compile Qt
export ABI_JOB_EXTRA_GCC_OPTIONS="-fPIC"
fi

# default to use stable repos
export ABI_JOB_REPOS="stable"

Expand Down
5 changes: 5 additions & 0 deletions jenkins-scripts/docker/lib/generic-abi-base.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
# ABI_JOB_CMAKE_PARAMS: (option) cmake parameters to be pased to cmake configuration
# ABI_JOB_IGNORE_HEADERS: (optional) relative (to root project path) list (space separated)
# of path headers to ignore
# ABI_JOB_EXTRA_GCC_OPTIONS: (optional) inject gcc_options in the descriptor file
# one per line

# Jenkins variables:
# DEST_BRANCH
Expand Down Expand Up @@ -100,6 +102,7 @@ sudo perl Makefile.pl -install --prefix=/usr

mkdir -p $WORKSPACE/abi_checker
cd $WORKSPACE/abi_checker

cat > pkg.xml << CURRENT_DELIM
<version>
branch: $DEST_BRANCH
Expand All @@ -126,6 +129,7 @@ cat >> pkg.xml << CURRENT_DELIM_LIBS

<gcc_options>
-std=${ABI_CXX_STANDARD}
${ABI_JOB_EXTRA_GCC_OPTIONS}
</gcc_options>
CURRENT_DELIM_LIBS

Expand Down Expand Up @@ -156,6 +160,7 @@ cat >> devel.xml << DEVEL_DELIM_LIBS

<gcc_options>
-std=${ABI_CXX_STANDARD}
${ABI_JOB_EXTRA_GCC_OPTIONS}
</gcc_options>
DEVEL_DELIM_LIBS
echo '# END SECTION'
Expand Down