From adbb86f9f78807b15eb1dd8e3e0bfef979bbd6a6 Mon Sep 17 00:00:00 2001
From: Milan Nikolic <gen2brain@gmail.com>
Date: Thu, 8 Sep 2022 23:36:47 +0200
Subject: [PATCH] Add more architectures

---
 cmd/cbconvert/make.bash | 73 +++++++++++++++++++++++++++--------------
 1 file changed, 48 insertions(+), 25 deletions(-)

diff --git a/cmd/cbconvert/make.bash b/cmd/cbconvert/make.bash
index 1ad7682..d718d3d 100755
--- a/cmd/cbconvert/make.bash
+++ b/cmd/cbconvert/make.bash
@@ -1,37 +1,60 @@
 #!/usr/bin/env bash
 
-MUSL="/usr/x86_64-pc-linux-musl"
-MINGW="/usr/i686-w64-mingw32"
+MUSL_x86_64="/usr/x86_64-pc-linux-musl"
+MINGW_x86_64="/usr/x86_64-w64-mingw32"
+MACOS_x86_64="/usr/x86_64-apple-darwin"
+MACOS_aarch64="/usr/aarch64-apple-darwin"
 
 VERSION="`git --git-dir ../../.git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0'`"
 
-BUILDDIR="cbconvert-${VERSION}"
-mkdir -p ${BUILDDIR}
-
+BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
 CC=x86_64-pc-linux-musl-gcc \
 PKG_CONFIG="x86_64-pc-linux-musl-pkg-config" \
-PKG_CONFIG_PATH="$MUSL/usr/lib/pkgconfig" \
-PKG_CONFIG_LIBDIR="$MUSL/usr/lib/pkgconfig" \
-CGO_CFLAGS="-I$MUSL/usr/include" \
-CGO_LDFLAGS="-L$MUSL/usr/lib" \
+PKG_CONFIG_PATH="$MUSL_x86_64/usr/lib/pkgconfig" \
+PKG_CONFIG_LIBDIR="$MUSL_x86_64/usr/lib/pkgconfig" \
+CGO_CFLAGS="-I$MUSL_x86_64/usr/include" \
+CGO_LDFLAGS="-L$MUSL_x86_64/usr/lib" \
 CGO_ENABLED=1 GOOS=linux GOARCH=amd64 \
-go build -tags 'extlib static' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w '-extldflags=-static'"
-
+go build -trimpath -tags 'extlib static' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w '-extldflags=-static'"
 cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && tar -czf "${BUILDDIR}-linux-x86_64.tar.gz" ${BUILDDIR} 
 rm -rf ${BUILDDIR}
 
-
-BUILDDIR="cbconvert-${VERSION}"
-mkdir -p ${BUILDDIR}
-
-CC=i686-w64-mingw32-gcc \
-PKG_CONFIG="/usr/bin/i686-w64-mingw32-pkg-config" \
-PKG_CONFIG_PATH="$MINGW/usr/lib/pkgconfig" \
-PKG_CONFIG_LIBDIR="$MINGW/usr/lib/pkgconfig" \
-CGO_CFLAGS="-I$MINGW/usr/include" \
-CGO_LDFLAGS="-L$MINGW/usr/lib" \
-CGO_ENABLED=1 GOOS=windows GOARCH=386 \
-go build -tags 'extlib static' -v -o ${BUILDDIR}/cbconvert.exe -ldflags "-s -w '-extldflags=-static -Wl,--allow-multiple-definition'"
-
-cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && zip -rq "${BUILDDIR}-windows-i686.zip" ${BUILDDIR}
+BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
+CC=x86_64-w64-mingw32-gcc \
+PKG_CONFIG="/usr/bin/x86_64-w64-mingw32-pkg-config" \
+PKG_CONFIG_PATH="$MINGW_x86_64/usr/lib/pkgconfig" \
+PKG_CONFIG_LIBDIR="$MINGW_x86_64/usr/lib/pkgconfig" \
+CGO_CFLAGS="-I$MINGW_x86_64/usr/include" \
+CGO_LDFLAGS="-L$MINGW_x86_64/usr/lib" \
+CGO_ENABLED=1 GOOS=windows GOARCH=amd64 \
+go build -trimpath -tags 'extlib static' -v -o ${BUILDDIR}/cbconvert.exe -ldflags "-s -w '-extldflags=-static -Wl,--allow-multiple-definition'"
+cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && zip -rq "${BUILDDIR}-windows-x86_64.zip" ${BUILDDIR}
+rm -rf ${BUILDDIR}
+
+export OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1
+BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
+PATH=${PATH}:${MACOS_x86_64}/bin \
+CC=x86_64-apple-darwin21.1-clang \
+PKG_CONFIG="x86_64-apple-darwin21.1-pkg-config" \
+PKG_CONFIG_PATH="$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
+PKG_CONFIG_LIBDIR="$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
+CGO_CFLAGS="-I$MACOS_x86_64/usr/include -I$MACOS_x86_64/macports/pkgs/opt/local/include" \
+CGO_LDFLAGS="-L$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_x86_64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.13" \
+CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 \
+go build -trimpath -tags 'extlib static' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w"
+cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && zip -rq "${BUILDDIR}-darwin-x86_64.zip" ${BUILDDIR}
+rm -rf ${BUILDDIR}
+
+export OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1
+BUILDDIR="cbconvert-${VERSION}"; mkdir -p ${BUILDDIR}
+PATH=${PATH}:${MACOS_aarch64}/bin \
+CC=aarch64-apple-darwin21.1-clang \
+PKG_CONFIG="aarch64-apple-darwin21.1-pkg-config" \
+PKG_CONFIG_PATH="$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
+PKG_CONFIG_LIBDIR="$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
+CGO_CFLAGS="-I$MACOS_aarch64/usr/include -I$MACOS_aarch64/macports/pkgs/opt/local/include" \
+CGO_LDFLAGS="-L$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_aarch64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.13" \
+CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 \
+go build -trimpath -tags 'extlib static' -v -o ${BUILDDIR}/cbconvert -ldflags "-linkmode external -s -w"
+cp ../../README.md ../../AUTHORS ../../COPYING ${BUILDDIR} && zip -rq "${BUILDDIR}-darwin-aarch64.zip" ${BUILDDIR}
 rm -rf ${BUILDDIR}