From 9e8fd0fc89486aef076f4cfef4e906b56a8241f2 Mon Sep 17 00:00:00 2001 From: trilkk Date: Wed, 18 Jan 2023 20:01:32 +0200 Subject: [PATCH 1/2] Fix build.sh to work on FreeBSD. --- build.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/build.sh b/build.sh index 2409c5b..cb70007 100755 --- a/build.sh +++ b/build.sh @@ -1,2 +1,28 @@ #!/bin/sh + +CGO_EXTRA_CPPFLAGS="" +CGO_EXTRA_LDFLAGS="" +if [ `uname` = "FreeBSD" ] ; then + CGO_EXTRA_CPPFLAGS="-I/usr/local/include" + CGO_EXTRA_LDFLAGS="-L/usr/local/lib" +fi + +if [ -n "${CGO_EXTRA_CPPFLAGS}" ] ; then + if [ -z "${CGO_CPPFLAGS}" ] ; then + export CGO_CPPFLAGS="${CGO_EXTRA_CPPFLAGS}" + else + CGO_CPPFLAGS_OLD="${CGO_CPPFLAGS}" + export CGO_CPPFLAGS="${CGO_CPPFLAGS_OLD} ${CGO_EXTRA_CPPFLAGS}" + fi +fi + +if [ -n "${CGO_EXTRA_LDFLAGS}" ] ; then + if [ -z "${CGO_LDFLAGS}" ] ; then + export CGO_LDFLAGS="${CGO_EXTRA_LDFLAGS}" + else + CGO_LDFLAGS_OLD="${CGO_LDFLAGS}" + export CGO_LDFLAGS="${CGO_LDFLAGS_OLD} ${CGO_EXTRA_LDFLAGS}" + fi +fi + go build -ldflags "-X main.Tag=$(git describe --exact-match --tags 2>/dev/null) -X main.Commit=$(git rev-parse HEAD) -X 'main.BuildTime=`date '+%b %_d %Y, %H:%M:%S'`'" "$@" From 012432b282d1d3d9a3637709e42166613c0be5ca Mon Sep 17 00:00:00 2001 From: trilkk Date: Wed, 18 Jan 2023 20:05:19 +0200 Subject: [PATCH 2/2] Remove extra lines. --- build.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index cb70007..d729189 100755 --- a/build.sh +++ b/build.sh @@ -11,8 +11,7 @@ if [ -n "${CGO_EXTRA_CPPFLAGS}" ] ; then if [ -z "${CGO_CPPFLAGS}" ] ; then export CGO_CPPFLAGS="${CGO_EXTRA_CPPFLAGS}" else - CGO_CPPFLAGS_OLD="${CGO_CPPFLAGS}" - export CGO_CPPFLAGS="${CGO_CPPFLAGS_OLD} ${CGO_EXTRA_CPPFLAGS}" + export CGO_CPPFLAGS="${CGO_CPPFLAGS} ${CGO_EXTRA_CPPFLAGS}" fi fi @@ -20,8 +19,7 @@ if [ -n "${CGO_EXTRA_LDFLAGS}" ] ; then if [ -z "${CGO_LDFLAGS}" ] ; then export CGO_LDFLAGS="${CGO_EXTRA_LDFLAGS}" else - CGO_LDFLAGS_OLD="${CGO_LDFLAGS}" - export CGO_LDFLAGS="${CGO_LDFLAGS_OLD} ${CGO_EXTRA_LDFLAGS}" + export CGO_LDFLAGS="${CGO_LDFLAGS} ${CGO_EXTRA_LDFLAGS}" fi fi