From nobody Fri Dec 03 03:05:00 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D3F4C18A91AB; Fri, 3 Dec 2021 03:05:00 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J4yNr41pFz4h7y; Fri, 3 Dec 2021 03:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6054511AB; Fri, 3 Dec 2021 03:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B3350DY037090; Fri, 3 Dec 2021 03:05:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B3350OX037089; Fri, 3 Dec 2021 03:05:00 GMT (envelope-from git) Date: Fri, 3 Dec 2021 03:05:00 GMT Message-Id: <202112030305.1B3350OX037089@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 45ac01128f79 - main - graphics/sharpconstruct: fix build on powerpc64le List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45ac01128f797d52763ac56a6bfa867aad1bc656 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638500700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wTwG1pUZMNtzAgMQ+/rOGSAc5U9gxAtYcePnkr5yOTA=; b=w0UAN5ezplHT4I5kkzip2zYUaeZ2CB6hUtuEwRMA9eccwx+JpcbECRv3/62irHEOvYfabA B/8bej1HTtNPNn78eZMoCns43U2WJSJhhrzqYaw12vrUgAfG2Ozg9AwLIgTe2OSsBc/fSt vmCfEfl9c1pA7Jm9uVZORFDujEvOArNfRKQRR08CThGxl6B13CTXEsRob1NIPaxSpDYwbP iuFrzNT8wtHCWBN6mHACumJ5F15kJ5eqokMgYppUEl7CKYbHVHZUQw0npDzIQ9zw07ELVA yujM2panoZT81VC1kODvpQSIR7ArYKGQG/+GBbmd6BXOX02DIDAs8kEL9UtAzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638500700; a=rsa-sha256; cv=none; b=Jv8cl1rj+lvdpCdc+69MX2vJwX6mA+3mtxyF0kFxbrGkGHi5PglIvColWT8I/0G2GeWLRj yl0+4JVP9JKWI2KYbca0Tnl924CWbMixHPM7gdc7VaMWD3yPT4x5AaVKceu//ZS8jUZ1GW PVLQ/9vv8mCKNpMLFWw1VHhEmX+O59KLQ2hsLPB12NJKANKE+YFydPMzGljGBtb6da9ImF 97nj/B/7iUuvDpv5A96CHykY4wN2RrAOlpwGHEGx9iMvOCaUw5ovVaJwsF8UAfAksJ0rFG a4cboBmgawGtoifV3YgBU8Hwa5wx+S2Ui7eVxIsgHn2LGJOfkke4eWL/0JHi2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=45ac01128f797d52763ac56a6bfa867aad1bc656 commit 45ac01128f797d52763ac56a6bfa867aad1bc656 Author: Piotr Kubaj AuthorDate: 2021-12-03 02:57:02 +0000 Commit: Piotr Kubaj CommitDate: 2021-12-03 02:57:02 +0000 graphics/sharpconstruct: fix build on powerpc64le Use GCC's SSE translation. Remove -msse and add it to i386 flags. --- graphics/sharpconstruct/Makefile | 14 ++++++++++++-- graphics/sharpconstruct/files/patch-src_Makefile.in | 11 +++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile index 7235e4ad6044..7c95470d9c36 100644 --- a/graphics/sharpconstruct/Makefile +++ b/graphics/sharpconstruct/Makefile @@ -13,18 +13,28 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgtkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm \ libglademm-2.4.so:devel/libglademm24 -ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS= amd64 i386 powerpc64le ONLY_FOR_ARCHS_REASON= uses SSE instructions -USES= compiler:c++11-lang gl tar:bzip2 gmake pkgconfig +USES= gl tar:bzip2 gmake pkgconfig USE_CXXSTD= c++11 GNU_CONFIGURE= yes USE_GL= gl glu +CXXFLAGS_i386= -msse PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz PORTDATA= * +.include + +.if ${ARCH} == powerpc64le +CXXFLAGS+= -DNO_WARN_X86_INTRINSICS +USES+= compiler:gcc-c++11-lib +.else +USES+= compiler:c++11-lang +.endif + post-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/include/Align.hh @${REINPLACE_CMD} -e 's|"/sharpconstruct|"|' ${WRKSRC}/src/MainWindow.cc diff --git a/graphics/sharpconstruct/files/patch-src_Makefile.in b/graphics/sharpconstruct/files/patch-src_Makefile.in new file mode 100644 index 000000000000..f89940df2bc5 --- /dev/null +++ b/graphics/sharpconstruct/files/patch-src_Makefile.in @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2021-12-02 18:50:44 UTC ++++ src/Makefile.in +@@ -172,7 +172,7 @@ sharedstatedir = ${prefix}/com + sysconfdir = ${prefix}/etc + target_alias = + INCLUDES = -I../include +-AM_CXXFLAGS = -Wall -msse $(libglademm_CFLAGS) $(gtkglextmm_CFLAGS) $(X_CFLAGS) $(BINRELOC_CFLAGS) ++AM_CXXFLAGS = -Wall $(libglademm_CFLAGS) $(gtkglextmm_CFLAGS) $(X_CFLAGS) $(BINRELOC_CFLAGS) + LDADD = $(libglademm_LIBS) $(gtkglextmm_LIBS) -lGL -lGLU $(X_LIBS) + sharpconstruct_SOURCES = \ + ArcBall.cc \