From owner-svn-ports-all@freebsd.org Thu Dec 17 23:32:44 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3BF3A4C7871; Thu, 17 Dec 2020 23:32:44 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CxpFS1BHWz3CyZ; Thu, 17 Dec 2020 23:32:44 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 112902131F; Thu, 17 Dec 2020 23:32:44 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BHNWhXM018749; Thu, 17 Dec 2020 23:32:43 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BHNWhPu018748; Thu, 17 Dec 2020 23:32:43 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202012172332.0BHNWhPu018748@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Thu, 17 Dec 2020 23:32:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558338 - head/x11-toolkits/swt/files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/x11-toolkits/swt/files X-SVN-Commit-Revision: 558338 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2020 23:32:44 -0000 Author: pkubaj Date: Thu Dec 17 23:32:43 2020 New Revision: 558338 URL: https://svnweb.freebsd.org/changeset/ports/558338 Log: x11-toolkits/swt: fix build on powerpc64le using similar conditionals that already work for powerpc64 Modified: head/x11-toolkits/swt/files/patch-build.sh Modified: head/x11-toolkits/swt/files/patch-build.sh ============================================================================== --- head/x11-toolkits/swt/files/patch-build.sh Thu Dec 17 22:12:06 2020 (r558337) +++ head/x11-toolkits/swt/files/patch-build.sh Thu Dec 17 23:32:43 2020 (r558338) @@ -1,4 +1,4 @@ ---- build.sh.orig 2019-03-07 02:31:04 UTC +--- build.sh.orig 2019-03-07 04:31:04 UTC +++ build.sh @@ -72,7 +72,7 @@ echo -e "${RED}*** ${@}${NC}" @@ -38,7 +38,7 @@ SWT_ARCH=x86_64 AWT_ARCH=amd64 ;; -@@ -111,6 +111,10 @@ case $MODEL in +@@ -111,6 +111,14 @@ case $MODEL in SWT_ARCH=x86 AWT_ARCH=i386 ;; @@ -46,10 +46,14 @@ + SWT_ARCH=ppc64 + AWT_ARCH=ppc64 + ;; ++ powerpc64le) ++ SWT_ARCH=ppc64le ++ AWT_ARCH=ppc64le ++ ;; *) SWT_ARCH=$MODEL AWT_ARCH=$MODEL -@@ -156,7 +160,7 @@ case $SWT_OS.$SWT_ARCH in +@@ -156,7 +164,7 @@ case $SWT_OS.$SWT_ARCH in # Cross-platform method of finding JAVA_HOME. # Tested on Fedora 24 and Ubuntu 16 DYNAMIC_JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"` @@ -58,12 +62,12 @@ func_echo_plus "JAVA_HOME not set, but jni.h found, dynamically configured to $DYNAMIC_JAVA_HOME" export JAVA_HOME="$DYNAMIC_JAVA_HOME" else -@@ -194,10 +198,10 @@ esac +@@ -194,10 +202,10 @@ esac # For 64-bit CPUs, we have a switch -if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then -+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then ++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'powerpc64le' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then SWT_PTR_CFLAGS=-DJNI64 if [ -d /lib64 ]; then - XLIB64=-L/usr/X11R6/lib64 @@ -71,7 +75,7 @@ export XLIB64 fi if [ ${MODEL} = 'ppc64le' ]; then -@@ -214,11 +218,13 @@ if [ ${MODEL} = 'x86' -a ${SWT_OS} = 'linux' ]; then +@@ -214,11 +222,13 @@ if [ ${MODEL} = 'x86' -a ${SWT_OS} = 'linux' ]; then export SWT_LFLAGS SWT_PTR_CFLAGS fi @@ -85,7 +89,7 @@ fi # Find AWT if available -@@ -364,4 +370,4 @@ elif [ "${GTK_VERSION}" = "4.0" ]; then +@@ -364,4 +374,4 @@ elif [ "${GTK_VERSION}" = "4.0" ]; then elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then export GTK_VERSION="3.0" func_build_gtk3 "$@"