Skip to content

Commit 31c47ef

Browse files
committed
Fix RPM x86_64 dependencies
1 parent d3f05c7 commit 31c47ef

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

ci/build.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,12 @@ if [[ "${BUILD_LITE:-}" == "" ]]; then
109109
export LDNP_DESCRIPTION=""
110110
export LDNP_SHORT_DESCRIPTION=""
111111

112+
rpm_lib_suffix=""
113+
112114
case "$ARCH" in
113115
x86_64)
114116
rpm_build_arch=x86_64
117+
rpm_lib_suffix="()(64bit)"
115118
deb_build_arch=amd64
116119
;;
117120
i?86)
@@ -142,7 +145,16 @@ if [[ "${BUILD_LITE:-}" == "" ]]; then
142145
export LDNP_META_DEB_PRE_DEPENDS="bash"
143146
export LDNP_DEB_EXTRA_DEBIAN_FILES="${BUILD_DIR}/cmake/debian/postinst;${BUILD_DIR}/cmake/debian/postrm"
144147

145-
export LDNP_META_RPM_REQUIRES="systemd libGL.so.1 libfontconfig.so.1 libfreetype.so.6 libfribidi.so.0 libgpg-error.so.0 libharfbuzz.so.0"
148+
rpm_requires=(
149+
"systemd"
150+
"libGL.so.1${rpm_lib_suffix}"
151+
"libfontconfig.so.1${rpm_lib_suffix}"
152+
"libfreetype.so.6${rpm_lib_suffix}"
153+
"libfribidi.so.0${rpm_lib_suffix}"
154+
"libgpg-error.so.0${rpm_lib_suffix}"
155+
"libharfbuzz.so.0${rpm_lib_suffix}"
156+
)
157+
export LDNP_META_RPM_REQUIRES="${rpm_requires[*]}"
146158
export LDNP_META_RPM_BUILD_ARCH="$rpm_build_arch"
147159
export LDNP_RPM_SCRIPTLET_POST="${BUILD_DIR}/cmake/debian/postinst"
148160
export LDNP_RPM_SCRIPTLET_PREUN="${BUILD_DIR}/cmake/debian/postrm"

0 commit comments

Comments
 (0)