From b5b44570883f7e62d3b320298d81dca1f1bce633 Mon Sep 17 00:00:00 2001
From: Milan Nikolic <gen2brain@gmail.com>
Date: Fri, 13 Jan 2023 18:33:57 +0100
Subject: [PATCH] Update build

---
 cmd/cbconvert/go.mod    |  2 +-
 cmd/cbconvert/go.sum    |  4 ++--
 cmd/cbconvert/make.bash | 25 +++++++++++++++++++------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/cmd/cbconvert/go.mod b/cmd/cbconvert/go.mod
index e182955..ec5b337 100644
--- a/cmd/cbconvert/go.mod
+++ b/cmd/cbconvert/go.mod
@@ -3,7 +3,7 @@ module github.com/gen2brain/cbconvert/cmd/cbconvert
 go 1.19
 
 require (
-	github.com/gen2brain/cbconvert v0.0.0-20220909080114-0963cb176280
+	github.com/gen2brain/cbconvert v0.0.0-20230112123620-c24d7b7e18c4
 	github.com/schollz/progressbar/v3 v3.10.0
 	github.com/spf13/pflag v1.0.5
 )
diff --git a/cmd/cbconvert/go.sum b/cmd/cbconvert/go.sum
index fe8d7d8..f6cd08a 100644
--- a/cmd/cbconvert/go.sum
+++ b/cmd/cbconvert/go.sum
@@ -7,8 +7,8 @@ github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/fvbommel/sortorder v1.0.2 h1:mV4o8B2hKboCdkJm+a7uX/SIpZob4JzUpc5GGnM45eo=
 github.com/fvbommel/sortorder v1.0.2/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
-github.com/gen2brain/cbconvert v0.0.0-20220909080114-0963cb176280 h1:wtlm/hA4mVv/CcUCm3gWGOH5oA3qNodLh7zoGjQO7cA=
-github.com/gen2brain/cbconvert v0.0.0-20220909080114-0963cb176280/go.mod h1:GO5h+s7160FK66rth/0QS06HgXFwE57jaP3OTX/8Rv0=
+github.com/gen2brain/cbconvert v0.0.0-20230112123620-c24d7b7e18c4 h1:DMAjwfDN0yhxfJjrZLqCjL1CSEvcBUbOGPPEW1WhYXw=
+github.com/gen2brain/cbconvert v0.0.0-20230112123620-c24d7b7e18c4/go.mod h1:GO5h+s7160FK66rth/0QS06HgXFwE57jaP3OTX/8Rv0=
 github.com/gen2brain/go-fitz v1.20.2 h1:4FPJCU/ImQ32oojBsYn/+oTkRORxbAhAA+Yw1Fm97MA=
 github.com/gen2brain/go-fitz v1.20.2/go.mod h1:YbQPODTC/UnQ/RK4JyD3zfpDQ19UKiV85nMMT3XpT0s=
 github.com/gen2brain/go-unarr v0.1.6 h1:2TtfIQ2dGuCkgEYa+vPE1ydcpkB3CtBbdYMfRSGLdA8=
diff --git a/cmd/cbconvert/make.bash b/cmd/cbconvert/make.bash
index f710b3f..1821b48 100755
--- a/cmd/cbconvert/make.bash
+++ b/cmd/cbconvert/make.bash
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+GLIBC_x86_64="/usr/x86_64-pc-linux-gnu-static"
 MUSL_x86_64="/usr/x86_64-pc-linux-musl"
 MUSL_aarch64="/usr/aarch64-pc-linux-musl"
 MINGW_x86_64="/usr/x86_64-w64-mingw32"
@@ -9,17 +10,29 @@ 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}
-CC=x86_64-pc-linux-musl-gcc \
-PKG_CONFIG="x86_64-pc-linux-musl-pkg-config" \
-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" \
+CC=x86_64-pc-linux-gnu-gcc \
+PKG_CONFIG="x86_64-pc-linux-gnu-pkg-config" \
+PKG_CONFIG_PATH="$GLIBC_x86_64/usr/lib64/pkgconfig" \
+PKG_CONFIG_LIBDIR="$GLIBC_x86_64/usr/lib64/pkgconfig" \
+CGO_CFLAGS="-I$GLIBC_x86_64/usr/include" \
+CGO_LDFLAGS="-L$GLIBC_x86_64/usr/lib64" \
 CGO_ENABLED=1 GOOS=linux GOARCH=amd64 \
 go build -trimpath -tags 'extlib pkgconfig' -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=x86_64-pc-linux-musl-gcc \
+#PKG_CONFIG="x86_64-pc-linux-musl-pkg-config" \
+#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 -trimpath -tags 'extlib pkgconfig' -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=aarch64-pc-linux-musl-gcc \
 PKG_CONFIG="aarch64-pc-linux-musl-pkg-config" \