From 533bfd5b55d4dd4ba8cdc27d0fd2e8778f301516 Mon Sep 17 00:00:00 2001 From: boypt <1033514+boypt@users.noreply.github.com> Date: Wed, 18 Dec 2024 15:31:37 +0800 Subject: [PATCH] add dist if not defined --- compile.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/compile.sh b/compile.sh index 6cd228a..4bfa378 100755 --- a/compile.sh +++ b/compile.sh @@ -68,13 +68,19 @@ GUESS_DIST() { BUILD_RPM() { source version.env - SOURCES=( $OPENSSHSRC \ + local SOURCES=( $OPENSSHSRC \ $OPENSSLSRC \ $ASKPASSSRC \ ) + # only on EL5, perl source is needed. [[ $rpmtopdir == "el5" ]] && SOURCES+=($PERLSRC) + # add dist variable if not defined + local OTHERRPMOPTS= + local dist=$(rpm --eval '%{?dist}') + [[ -z $dist ]] && dist=$(rpm -q glibc | rev | cut -d. -f2 | rev) && OTHERRPMOPTS="--define dist ${dist}" + pushd $rpmtopdir for fn in ${SOURCES[@]}; do CHECKEXISTS $fn && \ @@ -89,6 +95,7 @@ BUILD_RPM() { --define 'no_gtk2 1' \ --define 'skip_gnome_askpass 1' \ --define 'skip_x11_askpass 1' \ + "${OTHERRPMOPTS}" \ ; popd }