[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1033067: marked as done (unblock: glide/2002.04.10ds1-21)

Your message dated Mon, 10 Apr 2023 10:28:18 +0200
with message-id <CAM8zJQuePd-V8UBvvmgnxWuNYdBppFL6Le5sk6DCDdTGZxMbKQ@mail.gmail.com>
and subject line unblock: glide/2002.04.10ds1-21
has caused the Debian Bug report #1033067,
regarding unblock: glide/2002.04.10ds1-21
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1033067: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1033067
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: glide@packages.debian.org
Control: affects -1 + src:glide

Please unblock package glide

[ Reason ]

This non-key package does not currently contain autopkgtests.

These two releases include a couple of changes to make the package
finally reproducible, as the generated shared libraries would change
the optimized objects being linked to depending on the build system
(for host=i386 build=amd64).

[ Impact ]

Same generated objects regardless of the build system being used.

[ Tests ]

The tests were performed locally in an amd64 host and an i386 chroot,
before and after the fixes, and the reproducible builds are now green
for i386 for this package.

[ Risks ]

The risks seem minimal, as this is just making sure the build always
behaves in the same way.

[ Checklist ]

  [√] all changes are documented in the d/changelog
    (There is the grammar fix in the changelog itself, which I do not
     tend to mention explicitly as it seems unnecessary verbiage.)
  [√] I reviewed all changes and I approve them
  [√] attach debdiff against the package in testing

[ Other info ]

(nothing)


unblock glide/2002.04.10ds1-21

Thanks,
Guillem

diff -Nru glide-2002.04.10ds1/debian/changelog glide-2002.04.10ds1/debian/changelog
--- glide-2002.04.10ds1/debian/changelog	2023-02-26 23:15:35.000000000 +0100
+++ glide-2002.04.10ds1/debian/changelog	2023-03-10 02:37:51.000000000 +0100
@@ -1,6 +1,20 @@
+glide (2002.04.10ds1-21) unstable; urgency=medium
+
+  * Pass --build and --host to configure via chores.3dfx.
+
+ -- Guillem Jover <guillem@debian.org>  Fri, 10 Mar 2023 02:37:51 +0100
+
+glide (2002.04.10ds1-20) unstable; urgency=medium
+
+  * Use autoconf $host_cpu instead of «uname -m» to decide how to optimize
+    and what to compile into the resulting objects, which was making the
+    build unreproducible on i386 when built on an amd64 build system.
+
+ -- Guillem Jover <guillem@debian.org>  Sat, 04 Mar 2023 13:24:56 +0100
+
 glide (2002.04.10ds1-19) unstable; urgency=medium
 
-  * Enable LFS build options. This should ABI safe as the shared library
+  * Enable LFS build options. This should be ABI safe as the shared library
     does not expose any problematic type.
   * Actually show the debconf error when the target is not a symlink.
 
diff -Nru glide-2002.04.10ds1/debian/patches/no-uname.patch glide-2002.04.10ds1/debian/patches/no-uname.patch
--- glide-2002.04.10ds1/debian/patches/no-uname.patch	1970-01-01 01:00:00.000000000 +0100
+++ glide-2002.04.10ds1/debian/patches/no-uname.patch	2023-03-04 13:38:57.000000000 +0100
@@ -0,0 +1,30 @@
+Description: Use autoconf $host_cpu instead of «uname -m»
+ This was making the build unreproducible as the uname will return the build
+ system CPU and not the host one.
+Author: Guillem Jover <guillem@hadrons.org>
+Origin: vendor
+Forwarded: no
+
+---
+ glide3x/configure.in |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/glide3x/configure.in
++++ b/glide3x/configure.in
+@@ -142,6 +142,7 @@ AM_CONDITIONAL(FX_GLIDE_CVG, test x$FX_G
+ #
+ # Architecture
+ #
++AC_CANONICAL_HOST
+ AC_ARG_ENABLE([build-architecture],
+               [dnl
+   --enable-build-architecture Enable AMD 3DNow instructions [default=current]],
+@@ -152,7 +153,7 @@ AC_ARG_ENABLE([build-architecture],
+                *)
+                    AC_MSG_ERROR([Illegal value (${enableval}) for --enable-build-architecture])
+                    ;;
+-               esac],[FX_GLIDE_BUILD_ARCHITECTURE=`uname -m`])
++               esac],[FX_GLIDE_BUILD_ARCHITECTURE=$host_cpu])
+ AC_SUBST(FX_GLIDE_BUILD_ARCHITECTURE)
+ #
+ # Various tests needed at points in the build
diff -Nru glide-2002.04.10ds1/debian/patches/series glide-2002.04.10ds1/debian/patches/series
--- glide-2002.04.10ds1/debian/patches/series	2022-07-17 18:28:36.000000000 +0200
+++ glide-2002.04.10ds1/debian/patches/series	2023-03-04 13:16:21.000000000 +0100
@@ -36,3 +36,4 @@
 z12-local-libtool
 z13-install-perms
 no-x11.patch
+no-uname.patch
diff -Nru glide-2002.04.10ds1/debian/rules glide-2002.04.10ds1/debian/rules
--- glide-2002.04.10ds1/debian/rules	2023-02-25 15:42:22.000000000 +0100
+++ glide-2002.04.10ds1/debian/rules	2023-03-10 01:34:56.000000000 +0100
@@ -10,6 +10,12 @@
 
 include /usr/share/dpkg/default.mk
 
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 ifeq ($(DEB_HOST_ARCH),alpha)
   CFLAGS += -mcpu=ev5 -fomit-frame-pointer \
@@ -32,6 +38,7 @@
   cd $(CURDIR)/glide3x; \
   mkdir $(CURDIR)/debian/tmp.$(1); \
   ./chores.3dfx --generate "--configure=--enable-fx-glide-hw=$(1) \
+    $(confflags) \
     --prefix=/usr" --build-dir=build.$(1); \
   cd build.$(1); \
   ./build.3dfx --no-x DESTDIR="$(CURDIR)/debian/tmp.$(1)/" \

--- End Message ---
--- Begin Message --- 
Unblocked, thanks.

--- End Message ---
Reply to: