Package: freeglut
Version: 2.8.1-5
Severity: minor
Tags: patch
User: [email protected]
Usertags: origin-ubuntu groovy ubuntu-patch
Hi Anton,
In Ubuntu, we have moved the i386 architecture to a compatibility-only layer
on amd64, and therefore we are also moving our autopkgtest infrastructure to
test i386 binaries in a cross-environment.
This requires changes to some tests so that they are cross-aware and can do
the right thing.
The freeglut tests currently fail in this environment, because they include
build tests that do not invoke the toolchain in a cross-aware manner, and do
not declare their test dependencies in a cross-friendly matter. I've
verified that the attached patch lets the tests successfully build i386
tests on an amd64 host.
Note that upstream autopkgtest doesn't currently set DEB_HOST_ARCH so this
is a complete no-op in Debian for the moment. Support for cross-testing in
autopkgtest is currently awaiting review at
https://salsa.debian.org/ci-team/autopkgtest/merge_requests/69 and once
landed, will still have no effect unless autopkgtest is invoked with a '-a'
option. So this change should be safe to land in your package despite this
not being upstream in autopkgtest.
Thanks for considering,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
[email protected] [email protected]
diff -Nru freeglut-2.8.1/debian/tests/build1 freeglut-2.8.1/debian/tests/build1
--- freeglut-2.8.1/debian/tests/build1 2014-05-23 14:30:30.000000000 -0700
+++ freeglut-2.8.1/debian/tests/build1 2020-05-07 13:19:37.000000000 -0700
@@ -4,6 +4,12 @@
set -e
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
WORKDIR=$(mktemp -d)
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
cd $WORKDIR
@@ -389,7 +395,7 @@
EOF
-gcc -o demo demo.c -lglut -lGL -lm
+${CROSS_COMPILE}gcc -o demo demo.c -lglut -lGL -lm
echo "build: OK"
[ -x demo ]
#./demo
diff -Nru freeglut-2.8.1/debian/tests/build2 freeglut-2.8.1/debian/tests/build2
--- freeglut-2.8.1/debian/tests/build2 2014-05-24 00:15:59.000000000 -0700
+++ freeglut-2.8.1/debian/tests/build2 2020-05-07 13:19:52.000000000 -0700
@@ -4,6 +4,12 @@
set -e
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
WORKDIR=$(mktemp -d)
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
cd $WORKDIR
@@ -264,7 +270,7 @@
}
EOF
-g++ -o demo demo.cpp -lglut -lGL -lGLU
+${CROSS_COMPILE}g++ -o demo demo.cpp -lglut -lGL -lGLU
echo "build: OK"
[ -x demo ]
#./demo
diff -Nru freeglut-2.8.1/debian/tests/build3 freeglut-2.8.1/debian/tests/build3
--- freeglut-2.8.1/debian/tests/build3 2014-05-23 14:29:49.000000000 -0700
+++ freeglut-2.8.1/debian/tests/build3 2020-05-07 13:20:01.000000000 -0700
@@ -4,6 +4,12 @@
set -e
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
WORKDIR=$(mktemp -d)
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
cd $WORKDIR
@@ -416,7 +422,7 @@
EOF
-gcc -o demo demo.c -lglut -lGL
+${CROSS_COMPILE}gcc -o demo demo.c -lglut -lGL
echo "build: OK"
[ -x demo ]
#./demo
diff -Nru freeglut-2.8.1/debian/tests/build4 freeglut-2.8.1/debian/tests/build4
--- freeglut-2.8.1/debian/tests/build4 2014-05-23 23:46:28.000000000 -0700
+++ freeglut-2.8.1/debian/tests/build4 2020-05-07 13:20:09.000000000 -0700
@@ -4,6 +4,12 @@
set -e
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
WORKDIR=$(mktemp -d)
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
cd $WORKDIR
@@ -515,7 +521,7 @@
EOF
-gcc -o demo demo.c -lglut -lGL
+${CROSS_COMPILE}gcc -o demo demo.c -lglut -lGL
echo "build: OK"
[ -x demo ]
#./demo
diff -Nru freeglut-2.8.1/debian/tests/build5 freeglut-2.8.1/debian/tests/build5
--- freeglut-2.8.1/debian/tests/build5 2014-05-23 23:50:02.000000000 -0700
+++ freeglut-2.8.1/debian/tests/build5 2020-05-07 13:19:05.000000000 -0700
@@ -4,6 +4,12 @@
set -e
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
WORKDIR=$(mktemp -d)
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
cd $WORKDIR
@@ -389,7 +395,7 @@
EOF
-gcc -o demo demo.c -lglut -lGL -lm
+${CROSS_COMPILE}gcc -o demo demo.c -lglut -lGL -lm
echo "build: OK"
[ -x demo ]
#./demo
