gcc-9.x で作成&インストールして使っていた fprintd-0.8.1 が何の問題もなく動作していたので
まったく気づかなかったが、gcc-10.x 開発環境下でコンパイルに失敗することがわかった。
調べてみたら Arch Linux で対策パッチが提供されていることがわかり、パッチを拝借して
slackware64-current 環境下でパッケージを再作成してみた。
1. fprintd.SlackBuild
#!/bin/sh # Slackware build script for <appname> # Copyright <year> <you> <where you live> # All rights reserved. # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # |-----------------------------------------------------------------| # # REMOVE THIS ENTIRE BLOCK OF TEXT # # # A license is required, and we strongly suggest you use the above # BSD/MIT style license. We DO NOT accept "Public Domain" scripts. # Public domain is not valid in some countries, and no license is # worse than a "bad" license in those countries. # # This template is not meant to be a 'cut and paste' script to # enable any random user to make a working package. While # we're certainly not discouraging use of this template, if # you haven't manually gone through each step of the process # without the build script (typically as a normal user, as this # will reveal problems that you won't see as root), then there's # a good chance that something important is missing from your # submission. # When using this template script, please remove as many of # these unnecessary comments as possible. Commented code is # a good thing, but if it's obvious, there's no need to comment it. # # AGAIN, REMOVE THE COMMENTS IF THEY ARE NOT NEEDED - DON'T JUST # DELETE THIS BLOCK OF TEXT WITHOUT BOTHERING TO READ WHAT'S IN IT. # # |-----------------------------------------------------------------| # PRGNAM=fprintd # replace with name of program VERSION=${VERSION:-0.8.1} # replace with version of program SRCVER=${SRCVER:-9e32cd525724f21eebf2336a06b13a39c6616ab0} BUILD=${BUILD:-2} TAG=${TAG:-jw} # the "_SBo" is required # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; arm*) ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} # For consistency's sake, use this PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} # Drop the package in /tmp if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi set -e # Exit on most errors # If you prefer to do selective error checking with # command || exit 1 # then that's also acceptable. # get source wget https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/${SRCVER}/$PRGNAM-$SRCVER.tar.bz2 rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$SRCVER tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2 cd $PRGNAM-$SRCVER # Apply Arch patches patch -p1 < $CWD/gcc10-workaround.patch patch -p1 < $CWD/disable-systemd-protection.patch chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Your application will probably need different configure flags; # these are provided as an example only. # Be sure to build only shared libraries unless there's some need for # static. CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./autogen.sh ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-pam \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux # Compile the application and install it into the $PKG directory make make install DESTDIR=$PKG # Move dbus configs to system location: mkdir -p $PKG/usr/share/dbus-1/system.d/ mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/ rmdir --parents --ignore-fail-on-non-empty $PKG/etc/dbus-1/system.d/ # Strip binaries and libraries - this can be done with 'make install-strip' # in many source trees, and that's usually acceptable if so, but if not, # use this: find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # Compress man pages # If the man pages are installed to /usr/share/man instead, you'll need to either # add the --mandir=/usr/man flag to configure or move them manually after the # make install process is run. find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Compress info pages and remove the package's dir file # If no info pages are installed by the software, don't leave this in the script #rm -f $PKG/usr/info/dir #gzip -9 $PKG/usr/info/*.info* # Remove perllocal.pod and other special files that don't need to be installed, # as they will overwrite what's already on the system. If this is not needed, # remove it from the script. # Remove 'special' files find $PKG -name perllocal.pod \ -o -name ".packlist" \ -o -name "*.bs" \ | xargs rm -f # Copy program documentation into the package # The included documentation varies from one application to another, so be sure # to adjust your script as needed # Also, include the SlackBuild script in the documentation directory mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ README TODO AUTHORS COPYING NEWS INSTALL ChangeLog \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cp $CWD/gcc10-workaround.patch $PKG/usr/doc/$PRGNAM-$VERSION/ cp $CWD/disable-systemd-protection.patch $PKG/usr/doc/$PRGNAM-$VERSION/ # Copy the slack-desc (and a custom doinst.sh if necessary) into ./install mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc #cat $CWD/doinst.sh > $PKG/install/doinst.sh # Make the package; be sure to leave it in $OUTPUT # If package symlinks need to be created during install *before* # your custom contents of doinst.sh runs, then add the -p switch to # the makepkg command below -- see makepkg(8) for details cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} |
2. 関連パッチ
2-1. gcc10-workaround.patch
diff --git a/configure.ac b/configure.ac index 9c8d979..069b496 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,7 @@ AC_PREREQ([2.50]) AC_PROG_LIBTOOL AC_PROG_CC AM_PROG_CC_C_O +CFLAGS+=" -fcommon" GETTEXT_PACKAGE=fprintd AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name]) |
2-2. disable-systemd-protection.patch
diff --git a/data/fprintd.service.in b/data/fprintd.service.in index 5f46810..a308ee3 100644 --- a/data/fprintd.service.in +++ b/data/fprintd.service.in @@ -8,12 +8,9 @@ BusName=net.reactivated.Fprint ExecStart=@libexecdir@/fprintd # Filesystem lockdown -ProtectSystem=strict ProtectKernelTunables=true ProtectControlGroups=true -ReadWritePaths=@localstatedir@/lib/fprint ProtectHome=true -PrivateTmp=true # Network PrivateNetwork=true |
---------