Skip to content

Update vendor/github.com/mattn/go-sqlite3#5162

Merged
lunny merged 1 commit into
go-gitea:masterfrom
typeless:fix-build-failure-on-windows-386
Oct 24, 2018
Merged

Update vendor/github.com/mattn/go-sqlite3#5162
lunny merged 1 commit into
go-gitea:masterfrom
typeless:fix-build-failure-on-windows-386

Conversation

@typeless
Copy link
Copy Markdown
Contributor

To fix build failure on Windows/386

Tested with make release-windows

@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5162      +/-   ##
==========================================
+ Coverage   37.47%   37.47%   +<.01%     
==========================================
  Files         309      309              
  Lines       45782    45782              
==========================================
+ Hits        17158    17159       +1     
+ Misses      26161    26160       -1     
  Partials     2463     2463
Impacted Files Coverage Δ
models/repo_list.go 62.2% <0%> (-1.17%) ⬇️
models/user.go 44.3% <0%> (+0.28%) ⬆️

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 efa4e6b...35b1688. Read the comment docs.

@bkcsoft bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 24, 2018
@typeless
Copy link
Copy Markdown
Contributor Author

typeless commented Oct 24, 2018

Edit: I figured it out. The command should be TAGS='bindata sqlite sqlite_unlock_notify' make release-windows. And this PR does fix the bug.

 TAGS='bindata sqlite sqlite_unlock_notify' make release-windows
xgo -dest dist/binaries -tags 'netgo bindata sqlite sqlite_unlock_notify' -ldflags '-linkmode external -extldflags "-static" -X "main.Version=1.6.0+rc1-36-g35b1688b9" -X "main.Tags=bindata sqlite sqlite_unlock_notify"' -targets 'windows/*' -out gitea-master .
Checking docker installation...
Client:
 Version:      17.03.2-ce
 API version:  1.27
 Go version:   go1.6.2
 Git commit:   f5ec1e2
 Built:        Thu Jul  5 23:07:48 2018
 OS/Arch:      linux/amd64

Server:
 Version:      17.03.2-ce
 API version:  1.27 (minimum version 1.12)
 Go version:   go1.6.2
 Git commit:   f5ec1e2
 Built:        Thu Jul  5 23:07:48 2018
 OS/Arch:      linux/amd64
 Experimental: false

Checking for required docker image karalabe/xgo-latest... found.
Cross compiling code.gitea.io/gitea...
Building locally code.gitea.io/gitea...
Compiling for windows-4.0/amd64...
Compiling for windows-4.0/386...
 TAGS='bindata sqlite sqlite_unlock_notify' make release-windowsCleaning up build environment...
mura@DIR-101:~/devel/go/src/code.gitea.io/gitea$  TAGS='bindata sqlite sqlite_unlock_notify' make release-windows

Without the patch:

TAGS='bindata sqlite sqlite_unlock_notify' make release-windows
xgo -dest dist/binaries -tags 'netgo bindata sqlite sqlite_unlock_notify' -ldflags '-linkmode external -extldflags "-static" -X "main.Version=1.6.0+rc1-35-gefa4e6bc6" -X "main.Tags=bindata s
qlite sqlite_unlock_notify"' -targets 'windows/*' -out gitea-master .
Checking docker installation...
Client:
 Version:      17.03.2-ce
 API version:  1.27
 Go version:   go1.6.2
 Git commit:   f5ec1e2
 Built:        Thu Jul  5 23:07:48 2018
 OS/Arch:      linux/amd64

Server:
 Version:      17.03.2-ce
 API version:  1.27 (minimum version 1.12)
 Go version:   go1.6.2
 Git commit:   f5ec1e2
 Built:        Thu Jul  5 23:07:48 2018
 OS/Arch:      linux/amd64
 Experimental: false

Checking for required docker image karalabe/xgo-latest... found.
Cross compiling code.gitea.io/gitea...
Building locally code.gitea.io/gitea...
Compiling for windows-4.0/amd64...
Compiling for windows-4.0/386...
# code.gitea.io/gitea/vendor/github.com/mattn/go-sqlite3
vendor/github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.go:62:16: type [1073741824]*[1]uint larger than address space
vendor/github.com/mattn/go-sqlite3/sqlite3_opt_unlock_notify.go:62:16: type [1073741824]*[1]uint too large
2018/10/24 11:57:12 Failed to cross compile package: exit status 2.
Makefile:264: recipe for target 'release-windows' failed
make: *** [release-windows] Error 1

Copy link
Copy Markdown
Member

@sapk sapk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

@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 Oct 24, 2018
@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 Oct 24, 2018
@appleboy appleboy added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label Oct 24, 2018
@appleboy appleboy added this to the 1.7.0 milestone Oct 24, 2018
@lunny lunny merged commit 317ddb7 into go-gitea:master Oct 24, 2018
@typeless typeless deleted the fix-build-failure-on-windows-386 branch April 3, 2019 05:00
@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.

6 participants