diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-03-18 12:29:22 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-03-20 20:45:13 +0700 |
| commit | ba7ef55c920c56314e89d578c4c1a920eaea3ac0 (patch) | |
| tree | 49578699273d6e2788d808862aa5afdd21c60208 | |
| parent | cb38f8ade927d8a1ef9214479a2a94ba72f9c412 (diff) | |
development/phantomjs: Fix 32-bit build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | development/phantomjs/phantomjs.SlackBuild | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/development/phantomjs/phantomjs.SlackBuild b/development/phantomjs/phantomjs.SlackBuild index 67f7a24033cc2..a59c0abad3226 100644 --- a/development/phantomjs/phantomjs.SlackBuild +++ b/development/phantomjs/phantomjs.SlackBuild @@ -22,6 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220318 bkw: Modified by SlackBuilds.org: fix 32-bit build. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=phantomjs @@ -32,15 +34,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; 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 @@ -50,8 +49,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -75,9 +74,9 @@ cd $PRGNAM-$VERSION 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 \ + -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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ # Patches from arch patch -p1 -i $CWD/patches/fix-missing-webkit-include-files.patch @@ -93,6 +92,9 @@ patch -p1 -i $CWD/patches/unlock-qt.patch # Point to our qmake (adapted from debian patch) patch -p1 -i $CWD/patches/build-qtpath.patch +# 20220318 bkw: the patch contains a hardcoded lib64, fix. +sed -i "s,lib64,lib$LIBDIRSUFFIX," build.py + python2 build.py \ --skip-git \ --skip-qtbase \ |