Skip to content

Commit 9e81c0f

Browse files
committed
Adjusted rpm packaging to allow empty manifest lists such as debug symbols
Some dependencies don't generate symbols even when BUILD_TYPE=DEBUG aka with_debugsym 0 and __strip /bin/true as options to rpmbuild. Ticket: ENT-13016 Changelog: none
1 parent a7dd737 commit 9e81c0f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

deps-packaging/pkg-build-rpm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,15 @@ if [ $TARGET != native ]; then
7676
exit 42
7777
fi
7878

79+
# deps packages may result in binaries without debug symbols even when debugsym=yes aka BUILD_TYPE=DEBUG
80+
# to avoid rpmbuild errors when this occurs, allow empties
81+
RPMBUILD_OPTIONS="$RPMBUILD_OPTIONS --define '_empty_manifest_terminate_build 0'"
82+
7983
case "$TESTS" in
8084
no)
81-
RPMBUILD_OPTIONS="--define 'with_testsuite 0'";;
85+
RPMBUILD_OPTIONS="$RPMBUILD_OPTIONS --define 'with_testsuite 0'";;
8286
yes)
83-
RPMBUILD_OPTIONS="--define 'with_testsuite 1'";;
87+
RPMBUILD_OPTIONS="$RPMBUILD_OPTIONS --define 'with_testsuite 1'";;
8488
*)
8589
fatal "Unknown tests option: $TESTS";;
8690
esac

0 commit comments

Comments
 (0)