On 31/07/14 17:37, Chad Versace wrote: > On 07/31/2014 08:15 AM, Chad Versace wrote: >> On 07/31/2014 06:38 AM, Emil Velikov wrote: >>> On 31/07/14 04:06, Chad Versace wrote: >> >>>>> +srcroot=${HOME}/development/waffle >> >>> I'm guessing that you've correctly amended the above line to point to the >>> waffle top folder. >> >> Yes, I patched srcroot. > > Before merging this patch, the hard-coded srcroot needs fixing. > > Fix #1: Rename 'srcroot' -> '_srcroot'. From the PKGBUILD manpage: > > If you need to create any custom variables for use in your build process, it > is recommended to prefix > their name with an _ (underscore). This will prevent any possible name > clashes with internal makepkg > variables. For example, to store the base kernel version in a variable, use > something similar to > $_basekernver. > > Fix #2: Auto-set _srcroot to the *right* thing (the top of the git worktree), > unless the user > overrides it. This is the code-snippet I used when testing the PKGBUILD. The > code works for me: > > if [[ ! -v _srcroot ]]; then > msg "Environment variable _srcroot is unset" > msg "Fall back to using git worktree for _srcroot ..." > _srcroot="$(git rev-parse --show-toplevel)" || exit > msg "Using _srcroot=$_srcroot" > fi > Thanks for the underscore notice. Do you have any additional comments on the series or shall I resend it addressing the current comments only ?
> >> I'll update my system today when I have some downtime available for the >> potential sysadmin breakage, and then try the PKGBUILD again. > > Success! > > $ file pkg/mingw-w64-waffle/usr/x86_64-w64-mingw32/bin/wflinfo.exe > pkg/mingw-w64-waffle/usr/x86_64-w64-mingw32/bin/wflinfo.exe: PE32+ executable > (console) x86-64, for MS Windows > > I just built a Windows executable on my Linux box ?!?!?!?! This feels... > unnatural. > Now try running it to complete the circle :) -Emil _______________________________________________ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle