On 09/30/2013 02:45 PM, Stuart Hughes wrote:
> Hi Peter,
>
> Sounds reasonable, but could you send a unified patch so my head doesn't
> hurt.
Sure, attached.
>
> Regards, Stuart
>
> On 30/09/13 17:42, Peter Barada wrote:
>> 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...
>>
>>
>>
>> _______________________________________________
>> LTIB home page: http://ltib.org
>>
>> Ltib mailing list
>> [email protected]
>> https://lists.nongnu.org/mailman/listinfo/ltib
>>
--
Peter Barada
[email protected]
Index: ltib
===================================================================
RCS file: /sources/ltib/ltib/ltib,v
retrieving revision 1.90
diff -u -r1.90 ltib
--- ltib 15 May 2013 16:39:23 -0000 1.90
+++ ltib 30 Sep 2013 20:56:14 -0000
@@ -1239,14 +1239,14 @@
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
+cd $cf->{rpmdir}/BUILD/$pkg_dir_name
if [ "$tok->{name}" = "kernel" ]; then
make ARCH=$pcf->{LINTARCH} distclean
else
make distclean
fi
cd -
+mv $cf->{rpmdir}/BUILD/$pkg_dir_name $cf->{rpmdir}/BUILD/$pkg_dir_name.modified
$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
diff --exclude CVS --exclude .git -uNr $pkg_dir_name $pkg_dir_name.modified > $cf->{lpp}/$pname
_______________________________________________
LTIB home page: http://ltib.org
Ltib mailing list
[email protected]
https://lists.nongnu.org/mailman/listinfo/ltib
