Update pika-build-config/amd64-v3.sh

Reviewed-on: #2
Reviewed-by: ferreo <ferreo@noreply.pika>
Co-authored-by: Renaud Lepage <root@cybikbase.com>
Co-committed-by: Renaud Lepage <root@cybikbase.com>

.github/build-nest-v3

@@ -1 +1 @@
-21
+23

debian/changelog

@@ -1,3 +1,16 @@
+sbctl (0.16.0-101pika2) pika; urgency=low
+
+  * Build proper version sources
+
+ -- cybik <root@cybik.moe>  Wed, 13 Nov 2024 11:15:00 -0800
+
+sbctl (0.16.0-101pika1) pika; urgency=low
+
+  * Upstream release
+  * Rename pkexec intermediate script to match original command
+
+ -- cybik <root@cybik.moe>  Wed, 13 Nov 2024 10:45:00 -0800
+
 sbctl (0.15.4-101pika1) pika; urgency=low
 
   * Initial release.

debian/rules

@@ -53,7 +53,7 @@ export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch)
 
 override_dh_auto_install:
 	dh_auto_install
-	install -Dm755 debian/sbctl-pkexec debian/sbctl/usr/bin/sbctl-pkexec
+	install -Dm755 debian/sbctl-pkexec debian/sbctl/usr/bin/sbctl
 
 override_dh_usrlocal:
 	echo "disabled"

main.sh

@@ -6,13 +6,13 @@ set -e
 
 echo "$PIKA_BUILD_ARCH" > pika-build-arch
 
-VERSION="0.15.4"
+VERSION="0.16"
 
 # Clone Upstream
 UPSTREAM_NAME="sbctl"
 
 # Checkout and munch
-git clone https://github.com/Foxboron/sbctl.git "${UPSTREAM_NAME}"
+git clone https://github.com/Foxboron/sbctl.git "${UPSTREAM_NAME}" -b "${VERSION}"
 cp -rvf ./debian ./${UPSTREAM_NAME}/
 
 # easier than figuring out the right way to override the prefix in the makefile
@@ -22,8 +22,16 @@ sed -i "s/\$(PREFIX)\/bin/\$(PREFIX)\/sbin/" "${UPSTREAM_NAME}/Makefile"
 # Get in there.
 pushd "./${UPSTREAM_NAME}/" || exit 1
 
+# Clever way to auto-add a .0 if the upstream version is not semver
+VER_PER_COUNT="${VERSION//[^\.]}"
+if (( ${#VER_PER_COUNT} < 2 )); then
+    TRUE_VERSION="${VERSION}.0"
+else
+    TRUE_VERSION="${VERSION}"
+fi
+
 # Get build deps
-LOGNAME=root dh_make --createorig -y -l -p ${UPSTREAM_NAME}_"$VERSION" || echo "dh-make: Ignoring Last Error"
+LOGNAME=root dh_make --createorig -y -l -p "${UPSTREAM_NAME}_$TRUE_VERSION" || echo "dh-make: Ignoring Last Error"
 apt-get build-dep ./ -y
 
 # Build package

pika-build-config/amd64-v3.sh

@@ -1,10 +1,10 @@
 #! /bin/bash
 export PIKA_BUILD_ARCH="amd64-v3"
 export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
-export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
+export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto=auto"
+export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
+export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
+export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
+export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
 export DEB_BUILD_OPTIONS="nocheck notest terse"
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0