Skip to content

Build adjustments needed for newer rpm-based platforms (3.21) #2022

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
craigcomstock merged 3 commits into from
Nov 5, 2025
Merged

Build adjustments needed for newer rpm-based platforms (3.21) #2022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
899e0f9
Adjusted apache patch spec file for newer Patch N style
craigcomstock Oct 24, 2025
8379b0b
Removed not needed libtool control la files in dependencies
craigcomstock Oct 24, 2025
61fb15d
Adjusted rpm deps and packaging to allow /var/cfengine/lib as an RPAT…
craigcomstock Oct 24, 2025
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
2 changes: 2 additions & 0 deletions build-scripts/package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ case "$PACKAGING" in
# - argv[2] = a b
# Also note that $RPMBUILD_OPTIONS might have spaces
# which must be preserved
# rhel-10 rpmbuild is more picky about /var/cfengine/lib RPATH we need
export QA_RPATHS=2 # this is a set of bit flags, we just want 0x0002 here
eval "$RPMBUILD_CMD" -bb \
--define "'_topdir $BASEDIR/$PKG'" \
--define "'buildprefix $BUILDPREFIX'" \
Expand Down
4 changes: 3 additions & 1 deletion deps-packaging/apache/cfbuild-apache.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Release: 1
Source0: httpd-%{apache_version}.tar.gz
Source1: httpd.conf
Patch0: apachectl.patch
Patch1: fixed-implicit-decl-gettid.patch
License: MIT
Group: Other
Url: https://cfengine.com
Expand All @@ -21,7 +22,8 @@ AutoReqProv: no
mkdir -p %{_builddir}
%setup -q -n httpd-%{apache_version}

%patch0 -p0
%patch -P 0
%patch -P 1 -p1

CPPFLAGS=-I%{buildprefix}/include

Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/libyaml/cfbuild-libyaml.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ $MAKE
%install
rm -rf ${RPM_BUILD_ROOT}
$MAKE DESTDIR=${RPM_BUILD_ROOT} install
rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/libyaml.la

%clean
rm -rf $RPM_BUILD_ROOT
Expand Down Expand Up @@ -65,7 +66,6 @@ CFEngine Build Automation -- lmdb -- development files
%dir %{prefix}/lib
%{prefix}/lib/pkgconfig
%{prefix}/lib/*.a
%{prefix}/lib/*.la

%changelog

Expand Down
14 changes: 12 additions & 2 deletions deps-packaging/pkg-build-rpm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,15 @@ if [ $TARGET != native ]; then
exit 42
fi

# deps packages may result in binaries without debug symbols even when debugsym=yes aka BUILD_TYPE=DEBUG
# to avoid rpmbuild errors when this occurs, allow empties
RPMBUILD_OPTIONS="$RPMBUILD_OPTIONS --define '_empty_manifest_terminate_build 0'"

case "$TESTS" in
no)
RPMBUILD_OPTIONS="--define 'with_testsuite 0'";;
RPMBUILD_OPTIONS="$RPMBUILD_OPTIONS --define 'with_testsuite 0'";;
yes)
RPMBUILD_OPTIONS="--define 'with_testsuite 1'";;
RPMBUILD_OPTIONS="$RPMBUILD_OPTIONS --define 'with_testsuite 1'";;
*)
fatal "Unknown tests option: $TESTS";;
esac
Expand Down Expand Up @@ -112,6 +116,12 @@ fi
# example cmd --define 'a b':
# - argv[1] = --define
# - argv[2] = a b

# We have /var/cfengine/lib in RPATHS which should be OK
# We asked in https://github.com/rpm-software-management/rpm/issues/3982, and it seems allowing this is OK
# 0x0002 - contains an invalid RPATH - in our case /var/cfengine/lib is OK so allow it as an exception
# Here we only want to specify this one flag: 0x0002. Sadly these scripts run on POSIX shell (especially e.g. aix71 runs as /bin/sh which is ksh) so no bitwise operators. Add them together manually to a decimal integer.
export QA_RPATHS=2 # 0x0002 all by itself, no &(ands)
eval $RPMBUILD_CMD -bb \
--define "'_system_ssl $SYSTEM_SSL'" \
--define "'_topdir $BASEDIR/$PKGNAME'" \
Expand Down