From owner-svn-ports-head@freebsd.org Thu Jun 11 19:26:15 2020 Return-Path: Delivered-To: svn-ports-head@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 4291133EE04; Thu, 11 Jun 2020 19:26:15 +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 49jYkG4zfkz4H8T; Thu, 11 Jun 2020 19:26:14 +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 732301D4AA; Thu, 11 Jun 2020 19:26:14 +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 05BJQEnH004085; Thu, 11 Jun 2020 19:26:14 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BJQE82004084; Thu, 11 Jun 2020 19:26:14 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202006111926.05BJQE82004084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Thu, 11 Jun 2020 19:26:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538531 - 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: 538531 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 19:26:15 -0000 Author: pkubaj Date: Thu Jun 11 19:26:14 2020 New Revision: 538531 URL: https://svnweb.freebsd.org/changeset/ports/538531 Log: x11-toolkits/swt: fix build on powerpc64 build.sh misses some powerpc64 conditionals. PR: 247170 Approved by: makc (maintainer) 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 Jun 11 19:26:02 2020 (r538530) +++ head/x11-toolkits/swt/files/patch-build.sh Thu Jun 11 19:26:14 2020 (r538531) @@ -1,6 +1,6 @@ ---- build.sh.orig 2018-03-01 07:35:22.000000000 +0100 -+++ build.sh 2018-06-27 11:24:43.371971000 +0200 -@@ -115,9 +115,19 @@ +--- build.sh.orig 2018-03-30 05:04:36 UTC ++++ build.sh +@@ -115,9 +115,19 @@ case $OS in fi fi ;; @@ -20,12 +20,23 @@ ;; "Windows_NT") SWT_OS=win32 -@@ -469,10 +479,10 @@ +@@ -149,6 +159,10 @@ case $MODEL in + SWT_ARCH=x86 + AWT_ARCH=i386 + ;; ++ powerpc64) ++ SWT_ARCH=ppc64 ++ AWT_ARCH=ppc64 ++ ;; + *) + SWT_ARCH=$MODEL + AWT_ARCH=$MODEL +@@ -469,10 +483,10 @@ esac # For 64-bit CPUs, we have a switch -if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then -+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'amd64' ]; then ++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9' -o ${MODEL} = 's390x' -o ${MODEL} == 'powerpc64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'amd64' ]; then SWT_PTR_CFLAGS=-DJNI64 if [ -d /lib64 ]; then - XLIB64=-L/usr/X11R6/lib64 @@ -33,7 +44,7 @@ export XLIB64 fi if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then -@@ -517,37 +527,24 @@ +@@ -517,37 +531,24 @@ if [ ${MODEL} = 'ppc' -a ${SWT_OS} = 'linux' ]; then export SWT_LFLAGS SWT_PTR_CFLAGS fi