Merge pull request #380 from Kegeruneku/bug_5055/int/5055_fix_lmdb_li…

…nking_in_rpm_packages

Fixes #5055: Fix a LMDB linking issue in the configure stage of rudder-a...

rudder-agent/SPECS/rudder-agent.spec

@@ -194,20 +194,23 @@ rm -rf %{buildroot}
 # Compile LMDB library and install it in /opt/rudder/lib
 
 # LMDB's Makefile does not know how to create destination files, do it ourselves
-for i in bin lib include man/man1; do mkdir -p %{buildroot}%{rudderdir}/$i; done
+for i in bin lib include man/man1; do mkdir -p %{rudderdir}/$i; done
 
 cd %{_sourcedir}/lmdb-source/libraries/liblmdb
 
 make %{?_smp_mflags}
-make install prefix=%{rudderdir} DESTDIR=%{buildroot}
+
+# First install goes to the local %{rudderdir} to prevent linking issues during
+# CFEngine build
+make install prefix=%{rudderdir}
 %endif
 
 # Prepare CFEngine build
 cd %{_sourcedir}/cfengine-source
 
 %if "%{is_lmdb_here}" != "true"
 ## Define path of LMDB if built before instead of being provided by the system.
-%define lmdb_arg "--with-lmdb=%{buildroot}%{rudderdir}"
+%define lmdb_arg "--with-lmdb=%{rudderdir}"
 %else
 %define lmdb_arg ""
 %endif
@@ -240,6 +243,8 @@ rm -rf %{buildroot}
 # LMDB's Makefile does not know how to create destination files, do it ourselves
 for i in bin lib include man/man1; do mkdir -p %{buildroot}%{rudderdir}/$i; done
 cd %{_sourcedir}/lmdb-source/libraries/liblmdb
+
+# Now, we install lmdb in %{buildroot} to package it
 make install prefix=%{rudderdir} DESTDIR=%{buildroot}
 %endif