Skip to content

Commit

Permalink
ci_build.sh: hot-fix issue networkupstools#2782 on OmniOS
Browse files Browse the repository at this point in the history
Signed-off-by: Jim Klimov <[email protected]>
  • Loading branch information
jimklimov committed Jan 24, 2025
1 parent 65ca55b commit dec587a
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,13 @@ detect_platform_PKG_CONFIG_PATH_and_FLAGS() {
if [ -n "${_BITS}" ] ; then
if [ -d "${D}/${_BITS}/pkgconfig" ] ; then
SYS_PKG_CONFIG_PATH="${SYS_PKG_CONFIG_PATH}:${D}/${_BITS}/pkgconfig"
# Here and below: hot-fix for https://github.com/networkupstools/nut/issues/2782
# situation on OmniOS with Extra repository,
# assumed only useful if we use it via pkgconfig
case "${D}" in
/usr/lib) ;;
*) LDFLAGS="${LDFLAGS} -R${D}/${_BITS}" ;;
esac
else
if [ -d "${D}/pkgconfig" ] ; then
case "`LANG=C LC_ALL=C file $(ls -1 $D/*.so | head -1)`" in
Expand All @@ -864,6 +871,10 @@ detect_platform_PKG_CONFIG_PATH_and_FLAGS() {
for _ARCH in $_ARCHES ; do
if [ -d "${D}/${_ARCH}/pkgconfig" ] ; then
SYS_PKG_CONFIG_PATH="${SYS_PKG_CONFIG_PATH}:${D}/${_ARCH}/pkgconfig"
case "${D}" in
/usr/lib) ;;
*) LDFLAGS="${LDFLAGS} -R${D}/${_ARCH}" ;;
esac
else
if [ -d "${D}/pkgconfig" ] ; then
case "`LANG=C LC_ALL=C file $(ls -1 $D/*.so | head -1)`" in
Expand Down Expand Up @@ -893,6 +904,10 @@ detect_platform_PKG_CONFIG_PATH_and_FLAGS() {
done
if [ "${_ADDSHORT}" = true ] ; then
SYS_PKG_CONFIG_PATH="${SYS_PKG_CONFIG_PATH}:${D}/pkgconfig"
case "${D}" in
/usr/lib) ;;
*) LDFLAGS="${LDFLAGS} -R${D}" ;;
esac
fi
fi
done
Expand Down

0 comments on commit dec587a

Please sign in to comment.