add x86 feature level support and move config to pbuilderrc rather than cmdline

debian/changelog

@@ -1,4 +1,4 @@
-pika-pbuilder (0.1.1-102pika1) nest; urgency=medium
+pika-pbuilder (0.2.0-101pika1) nest; urgency=medium
 
   * Initial release. (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 

pika-pbuilder/etc/pbuilderrc

@@ -1,7 +1,7 @@
+# pbuilder standard config
 USENETWORK=yes
 HOOKDIR="/var/cache/pbuilder/hook.d/"
 APTCACHEHARDLINK=no
-export DEBIAN_FRONTEND="noninteractive"
+# pbuilder dist config
-export DEB_BUILD_MAINT_OPTIONS="-march=x86-64-v3 -O3"
+DIST="sid"
-export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
+EXTRAPACKAGES="ca-certificates"
-export DEB_LDFLAGS_MAINT_APPEND="-O3"

pika-pbuilder/usr/bin/pika-pbuilder-amd64-build

@@ -1,2 +0,0 @@
-#! /bin/bash
-DIST=sid ARCH=amd64 pbuilder build --distribution sid --architecture amd64 --debootstrapopts --include=ca-certificates --buildresult . --logfile buildlog.log "$@"

pika-pbuilder/usr/bin/pika-pbuilder-amd64-build

@@ -0,0 +1 @@
+pika-pbuilder-amd64-v3-lto-build

pika-pbuilder/usr/bin/pika-pbuilder-amd64-init

@@ -1,2 +1,2 @@
 #! /bin/bash
-DIST=sid ARCH=amd64 pbuilder create --distribution sid --architecture amd64 --debootstrapopts --include=ca-certificates "$@"
+ARCH=amd64 pbuilder create --architecture amd64 "$@"

pika-pbuilder/usr/bin/pika-pbuilder-amd64-v2-build

@@ -0,0 +1,4 @@
+#! /bin/bash
+echo "Using x86_64-v2 pbuilder config!"
+cp -vf /var/cache/pbuilder/rc.examples/pbuilderrc-v2 /etc/pbuilderrc
+ARCH=amd64 pbuilder build --architecture amd64 --buildresult . --logfile buildlog.log "$@"

pika-pbuilder/usr/bin/pika-pbuilder-amd64-v2-lto-build

@@ -0,0 +1,4 @@
+#! /bin/bash
+echo "Using x86_64-v2-lto pbuilder config!"
+cp -vf /var/cache/pbuilder/rc.examples/pbuilderrc-v2-lto /etc/pbuilderrc
+ARCH=amd64 pbuilder build --architecture amd64 --buildresult . --logfile buildlog.log "$@"

pika-pbuilder/usr/bin/pika-pbuilder-amd64-v3-build

@@ -0,0 +1,4 @@
+#! /bin/bash
+echo "Using x86_64-v3 pbuilder config!"
+cp -vf /var/cache/pbuilder/rc.examples/pbuilderrc-v3 /etc/pbuilderrc
+ARCH=amd64 pbuilder build --architecture amd64 --buildresult . --logfile buildlog.log "$@"

pika-pbuilder/usr/bin/pika-pbuilder-amd64-v3-lto-build

@@ -0,0 +1,4 @@
+#! /bin/bash
+echo "Using x86_64-v3-lto pbuilder config!"
+cp -vf /var/cache/pbuilder/rc.examples/pbuilderrc-v3-lto /etc/pbuilderrc
+ARCH=amd64 pbuilder build --architecture amd64 --buildresult . --logfile buildlog.log "$@"

pika-pbuilder/usr/bin/pika-pbuilder-amd64-v4-build

@@ -0,0 +1,4 @@
+#! /bin/bash
+echo "Using x86_64-v4 pbuilder config!"
+cp -vf /var/cache/pbuilder/rc.examples/pbuilderrc-v4 /etc/pbuilderrc
+ARCH=amd64 pbuilder build --architecture amd64 --buildresult . --logfile buildlog.log "$@"

pika-pbuilder/usr/bin/pika-pbuilder-amd64-v4-lto-build

@@ -0,0 +1,4 @@
+#! /bin/bash
+echo "Using x86_64-v4-lto pbuilder config!"
+cp -vf /var/cache/pbuilder/rc.examples/pbuilderrc-v4-lto /etc/pbuilderrc
+ARCH=amd64 pbuilder build --architecture amd64 --buildresult . --logfile buildlog.log "$@"

pika-pbuilder/usr/bin/pika-pbuilder-i386-build

@@ -1,2 +1,2 @@
 #! /bin/bash
-DIST=sid ARCH=i386 pbuilder build "$@" --distribution sid --architecture i386 --debootstrapopts --include=ca-certificates 
+ARCH=i386 pbuilder build --architecture i386 --buildresult . --logfile buildlog.log "$@"

pika-pbuilder/usr/bin/pika-pbuilder-i386-init

@@ -1,2 +1,2 @@
 #! /bin/bash
-DIST=sid ARCH=i386 pbuilder create --distribution sid --architecture i386 --debootstrapopts --include=ca-certificates "$@"
+ARCH=i386 pbuilder create --architecture i386 "$@"

pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v2

@@ -0,0 +1,13 @@
+# pbuilder standard config
+USENETWORK=yes
+HOOKDIR="/var/cache/pbuilder/hook.d/"
+APTCACHEHARDLINK=no
+# pbuilder dist config
+DIST="sid"
+EXTRAPACKAGES="ca-certificates"
+# pbuilder build options
+export DEBIAN_FRONTEND="noninteractive"
+export DEB_BUILD_MAINT_OPTIONS="-march=x86-64-v2 -O3"
+export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v2 -O3"
+export DEB_LDFLAGS_MAINT_APPEND="-O3"
+DEBBUILDOPTS="-march=x86-64-v2 -O3"

pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v2-lto

@@ -0,0 +1,13 @@
+# pbuilder standard config
+USENETWORK=yes
+HOOKDIR="/var/cache/pbuilder/hook.d/"
+APTCACHEHARDLINK=no
+# pbuilder dist config
+DIST="sid"
+EXTRAPACKAGES="ca-certificates"
+# pbuilder build options
+export DEBIAN_FRONTEND="noninteractive"
+export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v2 -O3"
+export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v2 -O3 -flto=auto -ffat-lto-objects"
+export DEB_LDFLAGS_MAINT_APPEND="-flto=auto -ffat-lto-objects -O3 -shared"
+DEBBUILDOPTS="-march=x86-64-v2 -flto=auto -ffat-lto-objects -O3 -shared"

pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v3

@@ -0,0 +1,13 @@
+# pbuilder standard config
+USENETWORK=yes
+HOOKDIR="/var/cache/pbuilder/hook.d/"
+APTCACHEHARDLINK=no
+# pbuilder dist config
+DIST="sid"
+EXTRAPACKAGES="ca-certificates"
+# pbuilder build options
+export DEBIAN_FRONTEND="noninteractive"
+export DEB_BUILD_MAINT_OPTIONS="-march=x86-64-v3 -O3"
+export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
+export DEB_LDFLAGS_MAINT_APPEND="-O3"
+DEBBUILDOPTS="-march=x86-64-v3 -O3"

pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v3-lto

@@ -0,0 +1,13 @@
+# pbuilder standard config
+USENETWORK=yes
+HOOKDIR="/var/cache/pbuilder/hook.d/"
+APTCACHEHARDLINK=no
+# pbuilder dist config
+DIST="sid"
+EXTRAPACKAGES="ca-certificates"
+# pbuilder build options
+export DEBIAN_FRONTEND="noninteractive"
+export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3"
+export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto -ffat-lto-objects"
+export DEB_LDFLAGS_MAINT_APPEND="-flto=auto -ffat-lto-objects -O3 -shared"
+DEBBUILDOPTS="-march=x86-64-v3 -flto=auto -ffat-lto-objects -O3 -shared"

pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v4

@@ -0,0 +1,13 @@
+# pbuilder standard config
+USENETWORK=yes
+HOOKDIR="/var/cache/pbuilder/hook.d/"
+APTCACHEHARDLINK=no
+# pbuilder dist config
+DIST="sid"
+EXTRAPACKAGES="ca-certificates"
+# pbuilder build options
+export DEBIAN_FRONTEND="noninteractive"
+export DEB_BUILD_MAINT_OPTIONS="-march=x86-64-v4 -O3"
+export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v4 -O3"
+export DEB_LDFLAGS_MAINT_APPEND="-O3"
+DEBBUILDOPTS="-march=x86-64-v4 -O3"

pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v4-lto

@@ -0,0 +1,13 @@
+# pbuilder standard config
+USENETWORK=yes
+HOOKDIR="/var/cache/pbuilder/hook.d/"
+APTCACHEHARDLINK=no
+# pbuilder dist config
+DIST="sid"
+EXTRAPACKAGES="ca-certificates"
+# pbuilder build options
+export DEBIAN_FRONTEND="noninteractive"
+export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v4 -O3"
+export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v4 -O3 -flto=auto -ffat-lto-objects"
+export DEB_LDFLAGS_MAINT_APPEND="-flto=auto -ffat-lto-objects -O3 -shared"
+DEBBUILDOPTS="-march=x86-64-v4 -flto=auto -ffat-lto-objects -O3 -shared"