Here's a new patch. It's the same as before, but with sed to modify the config files appropriately. I'd have smashed the sed commands together if not for readability, and for the text alignment being so nice as-is 😀
--- pari-2.13.0.orig/debian/rules 2020-10-22 11:41:11.000000000 -0400
+++ pari-2.13.0/debian/rules 2021-01-14 17:17:00.244609455 -0500
@@ -2,6 +2,7 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
# Adapted for the PARI Debian package by Bill Allombert 2001-2011
+# SPDX-FileContributor: 2021 John Scott <jsc...@posteo.net>
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -44,6 +45,11 @@
CFLAGS_LTO = $(CFLAGS) -flto
endif
+include /usr/share/dpkg/architecture.mk
+ifeq ($(origin CC),default)
+CC = $(DEB_HOST_GNU_TYPE)-gcc
+endif
+
libpkg = libpari-gmp-tls7
libtriplet = usr/lib/$(DEB_HOST_MULTIARCH)
inctriplet = usr/include/$(DEB_HOST_MULTIARCH)
@@ -53,31 +59,31 @@
config: config-stamp
config-stamp:
dh_testdir
- CC=cc CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" DLLDFLAGS="$(LDFLAGS)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" DLLDFLAGS="$(LDFLAGS)" \
./Configure --mt=pthread\
--prefix=/usr --host=$(PARI_CPU)-$(PARI_SYSTEM) \
--libdir=/$(libtriplet) --sysdatadir=/$(libtriplet)/pari \
--includedir=/$(inctriplet) \
--builddir=obj-dyn --graphic=X11 --with-gmp
- CC=cc CFLAGS="$(CFLAGS_NOMAP)" LDFLAGS="$(LDFLAGS)" DLLDFLAGS="$(LDFLAGS)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS_NOMAP)" LDFLAGS="$(LDFLAGS)" DLLDFLAGS="$(LDFLAGS)" \
./Configure --mt=pthread\
--prefix=/usr --host=$(PARI_CPU)-$(PARI_SYSTEM) \
--libdir=/$(libtriplet) --sysdatadir=/$(libtriplet)/pari \
--includedir=/$(inctriplet) \
--builddir=obj-cfg --graphic=X11 --with-gmp
- CC=cc CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" DLLDFLAGS="$(LDFLAGS)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" DLLDFLAGS="$(LDFLAGS)" \
./Configure --mt=pthread \
--prefix=/usr --host=$(PARI_CPU)-$(PARI_SYSTEM) \
--libdir=/$(libtriplet) --sysdatadir=/$(libtriplet)/pari \
--includedir=/$(inctriplet) \
--builddir=obj-sta --graphic=X11 --with-gmp
- CC=cc CFLAGS="$(CFLAGS_LTO)" LDFLAGS="$(LDFLAGS)" DLLDFLAGS="$(LDFLAGS)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS_LTO)" LDFLAGS="$(LDFLAGS)" DLLDFLAGS="$(LDFLAGS)" \
./Configure --mt=pthread \
--prefix=/usr --host=$(PARI_CPU)-$(PARI_SYSTEM) \
--libdir=/$(libtriplet) --sysdatadir=/$(libtriplet)/pari \
--includedir=/$(inctriplet) \
--builddir=obj-lto --graphic=X11 --with-gmp
- CC=cc CFLAGS="$(CFLAGS_DBG)" LDFLAGS="$(LDFLAGS)" DLLDFLAGS="$(LDFLAGS)" \
+ CC="$(CC)" CFLAGS="$(CFLAGS_DBG)" LDFLAGS="$(LDFLAGS)" DLLDFLAGS="$(LDFLAGS)" \
./Configure --mt=pthread \
--prefix=/usr --host=$(PARI_CPU)-$(PARI_SYSTEM) \
--libdir=/$(libtriplet) --sysdatadir=/$(libtriplet)/pari \
@@ -90,7 +96,7 @@
$(MAKE) -C obj-dyn lib-dyn #"LIBS=-lc -lm -lgmp"
$(MAKE) -C obj-sta lib-sta DLCFLAGS=
$(MAKE) -C obj-lto gp-sta RUNPTH=
-ifeq (,$(findstring notest,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
$(MAKE) -C obj-dyn gp-dyn
$(MAKE) dobench -C obj-dyn
$(MAKE) dobench -C obj-sta
@@ -138,8 +144,10 @@
mv debian/$(libpkg)/$(libtriplet)/libpari.so debian/libpari-dev/$(libtriplet)
dh_install -a
sed -ne '/^TOP=/ !p' < obj-cfg/pari.cfg > obj-cfg/pari.cfg.deb
+ sed -ie "s/CC='$(CC)/CC='\/usr\/bin\/cc/" obj-cfg/pari.cfg.deb
install -p -m 644 obj-cfg/pari.cfg.deb debian/libpari-dev/$(libtriplet)/pari/pari.cfg
sed -ne '/^TOP=/ !p' < obj-dbg/pari.cfg > obj-dbg/pari.cfg.deb
+ sed -ie "s/CC='$(CC)/CC='\/usr\/bin\/cc/" obj-dbg/pari.cfg.deb
install -p -m 644 obj-dbg/pari.cfg.deb debian/libpari-dev/$(libtriplet)/pari/pari.cfg.dbg
install -p -m 644 debian/misc-readme debian/pari-gp/usr/share/doc/pari-gp/misc/README.Debian
install -p -m 644 debian/gprc.dft debian/pari-gp/etc/gprc
signature.asc
Description: This is a digitally signed message part.
