From 8ba065e68be29adf47def68ef5f8cb9226ee4aca Mon Sep 17 00:00:00 2001 From: Milan Nikolic Date: Thu, 12 Jan 2023 13:18:42 +0100 Subject: [PATCH] Use pkgconfig --- cmd/cbconvert/make.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/cbconvert/make.bash b/cmd/cbconvert/make.bash index e4760b9..f710b3f 100755 --- a/cmd/cbconvert/make.bash +++ b/cmd/cbconvert/make.bash @@ -54,7 +54,7 @@ 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" && \ +go build -trimpath -tags 'extlib pkgconfig' -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} @@ -68,6 +68,6 @@ 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" && \ +go build -trimpath -tags 'extlib pkgconfig' -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}