cnijfilter2: needs -fcommon for gcc10

[ci skip]

srcpkgs/cnijfilter2/template

@@ -1,13 +1,11 @@
 # Template file for 'cnijfilter2'
-
-_upstreamversion="5.70-1"
-
 pkgname=cnijfilter2
 version=5.70
 revision=1
-wrksrc=cnijfilter2-source-${_upstreamversion}
+_uprevision=-1
 archs="i686 x86_64"
-repository=nonfree
+wrksrc=cnijfilter2-source-${version}${_uprevision}
+build_style=gnu-configure
 hostmakedepends="automake autoconf libtool"
 makedepends="cups-devel glib-devel libusb-devel libxml2-devel"
 depends="cups libusb libxml2"
@@ -15,61 +13,48 @@ short_desc="Canon printer drivers for a number of PIXMA models"
 maintainer="Ralph van Etten <ralph@et10.org>"
 license="custom:canon,GPL-2.0-or-later"
 homepage="https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_ts_series/pixma-ts9540.html?type=drivers&driverdetailid=tcm:13-1714899"
-distfiles="http://gdlp01.c-wss.com/gds/0/0100009930/01/cnijfilter2-source-${_upstreamversion}.tar.gz"
+distfiles="http://gdlp01.c-wss.com/gds/0/0100009930/01/cnijfilter2-source-${version}${_uprevision}.tar.gz"
 checksum=999a0649d865e40bc5cceb8661a4b1018750d3fa0a27a75fc757a2333d7d5fb3
-nocross="Binary drivers provided by Canon are only available for i686 and x86_64"
+repository=nonfree
 
-case $XBPS_TARGET_MACHINE in
+CFLAGS="-fcommon"
-	x86_64)
-		_arc=64
-		;;
-	i686)
-		_arc=32
-		;;
-	*)
-		_arc=0
-		;;
-esac
 
 do_configure() {
-	if [ "_arc" = "0" ]
+	local _libs="-L../../com/libs_bin${XBPS_TARGET_WORDSIZE}"
-	then
+	for pkg in cmdtocanonij{2,3} cnijbe2 lgmon3 {raster,}tocanonij tocnpwg; do
-		echo "Unsupported architecture $XBPS_TARGET_MACHINE"
+		msg_normal "Configuring ${pkg} ...\n"
-		exit 1
+		cd ${wrksrc}/${pkg}
-	fi
+		./autogen.sh ${configure_args} \
-
+			--enable-progpath=/usr/bin \
-	( cd ./cmdtocanonij2 && ./autogen.sh --prefix=/usr --datadir=/usr/share LDFLAGS="-L../../com/libs_bin${_arc}" )
+			--enable-libpath=/usr/lib/bjlib2 \
-	( cd ./cmdtocanonij3 && ./autogen.sh --prefix=/usr --datadir=/usr/share LDFLAGS="-L../../com/libs_bin${_arc}" )
+			CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS $_libs"
-	( cd ./cnijbe2 && ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin )
+		# Force submodules to use our CFLAGS
-	( cd ./lgmon3 && ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --enable-libpath=/usr/lib/bjlib2 --datadir=/usr/share LDFLAGS="-L../../com/libs_bin${_arc}" )
+		vsed -i */Makefile -e "s;^CFLAGS =.*;& $CFLAGS;"
-	( cd ./rastertocanonij && ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin )
+	done
-	( cd ./tocanonij && ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin )
-	( cd ./tocnpwg && ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin )
 }
 
 do_build() {
-	( cd ./cmdtocanonij2 && make clean && make )
+	for pkg in cmdtocanonij{2,3} cnijbe2 lgmon3 {raster,}tocanonij tocnpwg; do
-	( cd ./cmdtocanonij3 && make clean && make )
+		msg_normal "Building ${pkg} ...\n"
-	( cd ./cnijbe2 && make clean && make )
+		cd ${wrksrc}/${pkg}
-	( cd ./lgmon3 && make clean && make )
+		make clean
-	( cd ./rastertocanonij && make clean && make )
+		make ${makejobs}
-	( cd ./tocanonij && make clean && make )
+	done
-	( cd ./tocnpwg && make clean && make )
 }
 
 do_install() {
-	( cd ./cmdtocanonij2 && make install DESTDIR=${DESTDIR} )
+	local _libs="com/libs_bin${XBPS_TARGET_WORDSIZE}"
-	( cd ./cmdtocanonij3 && make install DESTDIR=${DESTDIR} )
+	for pkg in cmdtocanonij{2,3} cnijbe2 lgmon3 {raster,}tocanonij tocnpwg; do
-	( cd ./cnijbe2 && make install DESTDIR=${DESTDIR} )
+		msg_normal "Installing ${pkg} ...\n"
-	( cd ./lgmon3 && make install DESTDIR=${DESTDIR} )
+		cd ${wrksrc}/${pkg}
-	( cd ./rastertocanonij && make install DESTDIR=${DESTDIR} )
+		make DESTDIR=${DESTDIR} install
-	( cd ./tocanonij && make install DESTDIR=${DESTDIR} )
+	done
-	( cd ./tocnpwg && make install DESTDIR=${DESTDIR} )
+	cd ${wrksrc}
 
-	vmkdir /usr/lib/bjlib2
+	vmkdir usr/lib/bjlib2
-	vinstall com/ini/cnnet.ini 644 /usr/lib/bjlib2
+	vinstall com/ini/cnnet.ini 644 usr/lib/bjlib2
 	vmkdir /usr/share/ppd/cnijfilter2
-	vcopy "com/libs_bin${_arc}/lib*" /usr/lib
+	vcopy "${_libs}/lib*" usr/lib
-	vcopy "ppd/*.ppd" /usr/share/ppd/cnijfilter2
+	vcopy "ppd/*.ppd" usr/share/ppd/cnijfilter2
 	vlicense doc/LICENSE-cnijfilter-5.70EN.txt LICENSE.txt
 }