summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-02-11 23:35:41 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-13 09:17:46 +0700
commit88a39ebeffc08c9ab23cc9bacf81c3a668dd373b (patch)
tree6e031408d5530ccd0d49a5849522f4b4c2e2e5fc
parent1adf230977759308876f6e7b8702635fdf78ac38 (diff)
downloadslackbuilds-88a39ebeffc08c9ab23cc9bacf81c3a668dd373b.tar.gz
system/argyllcms: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/argyllcms/argyllcms.SlackBuild14
1 files changed, 9 insertions, 5 deletions
diff --git a/system/argyllcms/argyllcms.SlackBuild b/system/argyllcms/argyllcms.SlackBuild
index d08edfa5ce..2b80f26a2e 100644
--- a/system/argyllcms/argyllcms.SlackBuild
+++ b/system/argyllcms/argyllcms.SlackBuild
@@ -25,6 +25,8 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220211 bkw: Modified by SlackBuilds.org, fix build on 15.0.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM="argyllcms"
@@ -43,9 +45,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -74,15 +73,20 @@ set -e
rm -rf $TMP/$SRCNAM-$SRCVERSION $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
+rm -rf $TMP/${SRCNAM}_${SRCVERSION}
unzip $CWD/${SRCNAM}_${SRCVERSION}_src.zip
cd $TMP/${SRCNAM}_${SRCVERSION}
chown -R root.root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 750 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 640 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220211 bkw: jam reads from the environment, this variable is
+# documented in the Jamfile.
+export CCOPTFLAG="$SLKCFLAGS -fcommon"
patch -p1 < $CWD/patches/argyllcms-1.8.0-gcc5.patch