MTSR/mapserver
4
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases 1 Wiki Activity

release fixes

Browse Source
This commit is contained in:
BuckarooBanzay 2021-01-05 14:10:43 +01:00
parent c1236ab209
commit 7338ffcc3c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -49,7 +49,7 @@ $(OUT_DIR)/mapserver-linux-x86_64: $(OUT_DIR)
$(OUT_DIR)/mapserver-linux-x86: $(OUT_DIR) $(OUT_DIR)/mapserver-linux-x86: $(OUT_DIR)
# apt install gcc-8-i686-linux-gnu # apt install gcc-8-i686-linux-gnu
GOOS=linux GOARCH=386 CC=i686-linux-gnu-gcc-7 $(GO_BUILD) $(GO_LDFLAGS) -o $@ GOOS=linux GOARCH=386 CC=i686-linux-gnu-gcc $(GO_BUILD) $(GO_LDFLAGS) -o $@
$(OUT_DIR)/mapserver-windows-x86.exe: $(OUT_DIR) $(OUT_DIR)/mapserver-windows-x86.exe: $(OUT_DIR)
# apt install gcc-mingw-w64 # apt install gcc-mingw-w64
@ -60,7 +60,7 @@ $(OUT_DIR)/mapserver-windows-x86-64.exe: $(OUT_DIR)
$(OUT_DIR)/mapserver-linux-arm: $(OUT_DIR) $(OUT_DIR)/mapserver-linux-arm: $(OUT_DIR)
# apt install gcc-5-arm-linux-gnueabihf # apt install gcc-5-arm-linux-gnueabihf
GOARCH=arm GOARM=7 CC=arm-linux-gnueabihf-gcc-5 $(GO_BUILD) $(GO_LDFLAGS) -o $@ GOARCH=arm GOARM=7 CC=arm-linux-gnueabihf-gcc-8 $(GO_BUILD) $(GO_LDFLAGS) -o $@
release: builder_image $(OUT_DIR) $(MOD_ZIP) release: builder_image $(OUT_DIR) $(MOD_ZIP)

22
docker_builder/Dockerfile
View File

@ -1,18 +1,18 @@
FROM ubuntu:bionic FROM ubuntu:focal
# cross compile stuff # for tzdata
RUN apt-get update &&\ ENV DEBIAN_FRONTEND=noninteractive
apt-get install -y gcc-mingw-w64 gcc-5-arm-linux-gnueabihf gcc-i686-linux-gnu &&\
apt-get install -y software-properties-common git
# go stuff RUN apt-get update
RUN add-apt-repository ppa:longsleep/golang-backports &&\
apt-get update &&\
apt-get install -y golang-go
# cross compile and go stuff
RUN apt-get install -y gcc-mingw-w64 gcc-8-arm-linux-gnueabihf gcc-i686-linux-gnu &&\
apt-get install -y software-properties-common git golang-go
# TODO: move this to a separate package.json and docker container
# jshint # jshint
RUN apt-get install -y nodejs npm RUN apt-get install -y nodejs npm
RUN npm install -g jshint RUN npm install -g jshint@2.12.0
# rollup # rollup
RUN npm install -g rollup RUN npm install -g rollup@2.35.1