diff options
author | Eric Hameleers <alien@slackware.com> | 2019-09-20 19:50:12 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-09-20 19:50:12 +0000 |
commit | 39c452111a871159eb9f8b180d10bf8468c23c25 (patch) | |
tree | fff9141ffab533236463204d2c15872a0057074c /netsurf/build | |
parent | 9f0ff9c8f89c2e0f66911520476283cc14d5c8d7 (diff) | |
download | asb-39c452111a871159eb9f8b180d10bf8468c23c25.tar.gz asb-39c452111a871159eb9f8b180d10bf8468c23c25.tar.xz |
netsurf: update to 3.9
Diffstat (limited to 'netsurf/build')
-rwxr-xr-x | netsurf/build/netsurf.SlackBuild | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/netsurf/build/netsurf.SlackBuild b/netsurf/build/netsurf.SlackBuild index d8e2fd58..a00e56a4 100755 --- a/netsurf/build/netsurf.SlackBuild +++ b/netsurf/build/netsurf.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2017, 2019 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,6 +33,8 @@ # Changelog: # 3.7-1: 25/oct/2017 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 3.9-1: 20/sep/2019 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh netsurf.SlackBuild' to build a Slackware package. # The package (.t?z) and .txt file as well as build logs are created in /tmp . @@ -42,9 +44,9 @@ PRGNAM=netsurf SRCNAM=netsurf-all -VERSION=${VERSION:-3.7} +VERSION=${VERSION:-3.9} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j4 "} +NUMJOBS=${NUMJOBS:-" -j$(nproc) "} TAG=${TAG:-alien} DOCS="netsurf/COPYING netsurf/README" @@ -52,6 +54,13 @@ DOCS="netsurf/COPYING netsurf/README" # Pick either GTK+-2 or GTK+-3, default is '2': GTK_INTF=${GTK_INTF:-2} +if [ $GTK_INTF -eq 2 ]; then + GTK_TARGET=gtk +else + GTK_TARGET=gtk3 + +fi + # Use gstreamer-0.10 for video display in the browser ('YES' or 'NO'): # Keep at 'NO' for now... it won't compile otherwise. USE_GST0=${USE_GST0:-"NO"} @@ -71,22 +80,19 @@ SRCURL="http://download.netsurf-browser.org/${PRGNAM}/releases/source-full/${SRC ## --- with a little luck, you won't have to edit below this point --- ## ## -# You can use your own private machine.conf file to overrule machine defaults: # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - armv6hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=$ARCH -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" @@ -95,9 +101,6 @@ case "$ARCH" in armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; - armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; *) SLKCFLAGS=${SLKCFLAGS:-"-O2"} SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} ;; @@ -190,7 +193,7 @@ make clean # Next the GTK variant: make install DESTDIR=$PKG PREFIX=/usr \ $NUMJOBS V=1 \ - TARGET=gtk NETSURF_GTK_MAJOR=${GTK_INTF} \ + TARGET=$GTK_TARGET NETSURF_GTK_MAJOR=${GTK_INTF} \ NETSURF_USE_VIDEO=${USE_GST0} \ 2>&1 | tee $OUTPUT/make_install-${PRGNAM}-gtk.log |