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

Add BSDmakefile to prevent errors when make is called under FreeBSD #4446

Merged
merged 3 commits into from Jul 16, 2018

Conversation

mqudsi
Copy link
Contributor

@mqudsi mqudsi commented Jul 14, 2018

The syntax of the gitea Makefile is not platform-agnostic and is
specific to the GNU version of make. BSD platforms such as FreeBSD
ship with bmake (BSD make) as their default make program; attempting
to compile gitea by simply executing make causes a wall of errors to
show as a result of syntax incompatible with BSD make.

If a file named BSDmakefile is present, bmake will give it
preference over a generic Makefile. This BSDmakefile is taken from
the BSD-licensed gmake-proxy project, which transparently proxies
all make commands to gmake (GNU make) on systems where bmake is
the default, and if gmake is not installed an error message is
displayed.

The syntax of the gitea Makefile is not platform-agnostic and is
specific to the GNU version of `make`. BSD platforms such as FreeBSD
ship with bmake (BSD make) as their default `make` program; attempting
to compile gitea by simply executing `make` causes a wall of errors to
show as a result of syntax incompatible with BSD make.

If a file named `BSDmakefile` is present, `bmake` will give it
preference over a generic `Makefile`. This `BSDmakefile` is taken from
the BSD-licensed `gmake-proxy` project [0], which transparently proxies
all `make` commands to `gmake` (GNU make) on systems where `bmake` is
the default, and if `gmake` is not installed an error message is
displayed.

[0]: https://github.com/neosmart/gmake-proxy
@codecov-io
Copy link

codecov-io commented Jul 14, 2018

Codecov Report

Merging #4446 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4446      +/-   ##
==========================================
+ Coverage   20.03%   20.04%   +<.01%     
==========================================
  Files         153      153              
  Lines       30796    30796              
==========================================
+ Hits         6171     6174       +3     
+ Misses      23681    23679       -2     
+ Partials      944      943       -1
Impacted Files Coverage Δ
modules/process/manager.go 73.91% <0%> (+4.34%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ef6813a...c64b5c6. Read the comment docs.

@bkcsoft bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 14, 2018
@bkcsoft bkcsoft added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 14, 2018
@lafriks lafriks added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label Jul 14, 2018
@lunny
Copy link
Member

lunny commented Jul 15, 2018

LGTM

@bkcsoft bkcsoft added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 15, 2018
@jonasfranz jonasfranz merged commit 7be5935 into go-gitea:master Jul 16, 2018
@lunny lunny added this to the 1.6.0 milestone Aug 10, 2018
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants