Stuart,
I've been hacking away at Qt5, and noticed a problem while trying to
generate a patch via "-m patchmerge". Qt5 uses qmake to do its
distclean (and doesn't do a good job at it), and usign the current ltib
script it fails since the code to handle patchmerge renames the build
directory to <pkg>.modified and _then_ does the distclean. This breaks
in Qt5 due to internal dependencies that contain the full pathname.
Attached is a patch (against current ltib source) that rearranges the
order to be:
1) cd into the pkg build directory
2) "make distclean"
3) mv pkg build directory to pkg build directory .modified
4) cd -
So far it looks to work for me...
--
Peter Barada
[email protected]
*** ltib.~1.91.~ 2013-06-22 10:50:13.000000000 -0400
--- ltib 2013-09-30 12:37:33.301732421 -0400
***************
*** 1239,1251 ****
system_nb(<<TXT) == 0 or die;
set -x
! mv $cf->{rpmdir}/BUILD/$pkg_dir_name $cf->{rpmdir}/BUILD/$pkg_dir_name.modified
! cd $cf->{rpmdir}/BUILD/$pkg_dir_name.modified
if [ "$tok->{name}" = "kernel" ]; then
make ARCH=$pcf->{LINTARCH} distclean
else
make distclean
fi
cd -
$cf->{rpmbuild} --dbpath $cf->{rpmroot}/$cf->{rpmdb} --define '_target_cpu $pcf->{RPMTARCH}' --define '_topdir $cf->{rpmdir}' --define '_prefix $cf->{prefix}' --define '_tmppath $cf->{projtmp}' --define '_mandir $cf->{prefix}/$cf->{mandir}' --define '_sysconfdir $cf->{sysconfdir}' -bp $specout >/dev/null || exit 1
cd $cf->{rpmdir}/BUILD
--- 1239,1251 ----
system_nb(<<TXT) == 0 or die;
set -x
! cd $cf->{rpmdir}/BUILD/$pkg_dir_name
if [ "$tok->{name}" = "kernel" ]; then
make ARCH=$pcf->{LINTARCH} distclean
else
make distclean
fi
+ mv $cf->{rpmdir}/BUILD/$pkg_dir_name $cf->{rpmdir}/BUILD/$pkg_dir_name.modified
cd -
$cf->{rpmbuild} --dbpath $cf->{rpmroot}/$cf->{rpmdb} --define '_target_cpu $pcf->{RPMTARCH}' --define '_topdir $cf->{rpmdir}' --define '_prefix $cf->{prefix}' --define '_tmppath $cf->{projtmp}' --define '_mandir $cf->{prefix}/$cf->{mandir}' --define '_sysconfdir $cf->{sysconfdir}' -bp $specout >/dev/null || exit 1
cd $cf->{rpmdir}/BUILD
_______________________________________________
LTIB home page: http://ltib.org
Ltib mailing list
[email protected]
https://lists.nongnu.org/mailman/listinfo/ltib
