Skip to content
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.

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

Fix mg building on darwin by changing to new upstream #85627

Merged
merged 4 commits into from
May 11, 2020
Merged

Fix mg building on darwin by changing to new upstream #85627

merged 4 commits into from
May 11, 2020

Commits on Feb 1, 2020

  1. Fix mg building on darwin.

    I am not happy with this at all. It avoids using libbsd at all on
    darwin because there are conflicting header files, particularly the
    header string.h.
    
    Ideally that would be the thing to fix. But in the meantime, this patch
    should do the trick.
    
    It declares a header file apple.h, which files include if target is
    darwin (checks for presence of __APPLE__). This header file also
    references the three source files futimens.c, reallocarray.c and
    strtonum.c. The former and  latter are from https://github.com/ibara/mg
    which is another portable fork, but building against more platforms.
    
    From the OpenBSD source tree is _null.h and tree.h. There is a check so
    that if __APPLE__ is present then it will include them from this source
    tree.
    
    Now,the makefile GNUMakefile will not link against libbsd on darwin, by
    checking the output of uname in much the same way as it did already for
    FreeBSD.
    druimalban committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    a0c2892 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2020

  1. Bump package version to 20200215

    The actual most recent version is 20200215, so update the package version to this.
    Furthermore, update the patch accordingly so it still builds. This adds back the
    reallocarray.c file.
    druimalban committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    cdc8f3f View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. Fix the patch: when converting it to the new version (20200215), forg…

    …ot to remove temporary files
    druimalban committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    fcedd9f View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Set upstream to https://github.com/ibara/mg

    As per reasonable suggestion, instead of extensively patching the
    hboetes version of mg to work on MacOS using bits from ibara's mg,
    just set upstream to ibara's mg.
    
    This also removes the dependency on libbsd, although I'm not sure
    if this is a good or bad thing.
    druimalban committed May 7, 2020
    Configuration menu
    Copy the full SHA
    c54d375 View commit details
    Browse the repository at this point in the history