From nobody Wed Sep 07 15:01:17 2022 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 4MN5711yqNz4cc9c; Wed, 7 Sep 2022 15:01:17 +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 4MN5711ZfGz3V3c; Wed, 7 Sep 2022 15:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662562877; 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=5nPGd/HUh7u0xmoEIDfqXK2Upv6tiH7ltbkz6RhC+RY=; b=SdESuNGm6MxTq9BzYixO041AKxW9UM5+yl3Tn+nzdueQpWqJbiKHy5s/AEf16fw2m9Bj7b FfmvU3E6I54eM/EPLvlrg65Xweg9291abJ3FaQxynR+D0hpgqjfHpxBkq+w5+Ree/Xrz9B I9iVW8TSz/eL14cHRb5J1LswxJKDMjn1FdDengY0R61fnU/mYS9/NX8vbrCWjx164HQqfj qn3qjzYQ3sOfTfiLhmRk4CvMH8xC5TJHtgKIIm39XkBYg2DcEyEknGxDbDMfzVOEDpLEnv hnW7w9mkTXoJ/aRKi0fQdaeN5NcEp+XDUHE71p/7sLS9UiT6h2cAH5xYcrxmQA== 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 4MN5710dLHzZ60; Wed, 7 Sep 2022 15:01:17 +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 287F1Hb6013398; Wed, 7 Sep 2022 15:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287F1HSD013397; Wed, 7 Sep 2022 15:01:17 GMT (envelope-from git) Date: Wed, 7 Sep 2022 15:01:17 GMT Message-Id: <202209071501.287F1HSD013397@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: e979cc6c84ea - main - emulators/joytran: fix build by removing -Werror 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e979cc6c84ea64e213e48808f7a00b21431c45f9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662562877; 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=5nPGd/HUh7u0xmoEIDfqXK2Upv6tiH7ltbkz6RhC+RY=; b=eStTzSLYGBrTkqRJWTF4ZPVSH8lebXinM8yGkQisFvYQELVYxMPwqlcca2CKTCRXJugztV l+gTh4uwew236fHSEwzNn1dRn2XyJ6y/e5wYW1qCL3nQmknTgPmrvSV54c+nHw3LycqFf2 MIKxkQHGpnO7SvIHcAxTVJijmQ9PXMfxUMSM98ddq9q4GSOS9Z5eOxeDTJy5F1spC80i+p U+GPtyMlbJ9pmFxq2/C8H8UXUrQj9p8YBZb/ngyABggn7rdaaisumQpj/K6liovxV++o4P 8JQFCVZ2dgZgUtBQ7pyQ9caWYZ00FLnbnXyCnLCgI6ICGxsiO9dLQIrbMVdoXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662562877; a=rsa-sha256; cv=none; b=xHNRacPRyHhOuXN+dDbuFSHeItcGNw4hTtNceFSlb6xujWJYgZ4kJUNEsc60ntbsN5R6I5 GJrXDZrZNdCoNgrlSstway6uV9dXWQu+ciA9w0kLb9i8S2mEeM2wBTPGxpono8SOwvgNMV VrK3vmVqPYw+QT9PtRs2Dx5DHYQDLuhpMZn3GoFjD6Rd3kIYjfrO4+dCZsCimjW5bDqAp4 oIvrg4RkQ/JjVUTO174rCvvung7rtWLEEVzSbHbtve2jX5VyFKiIBuybqL1LnHQQ5SC6aB gV1g8jSfkFGCLmRdfWFCTgXCBlyRWuBK9HE++pFGIaBqMDUGnto9AoZmak3Tjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=e979cc6c84ea64e213e48808f7a00b21431c45f9 commit e979cc6c84ea64e213e48808f7a00b21431c45f9 Author: Dmitry Marakasov AuthorDate: 2022-09-07 14:30:58 +0000 Commit: Dmitry Marakasov CommitDate: 2022-09-07 14:53:34 +0000 emulators/joytran: fix build by removing -Werror While here, add -fcommon to a more suitable var (cflags instead of warning flags) and in a less obscure way (through patch instead of reinplace_cmd). Approved by: portmgr blanket --- emulators/joytran/Makefile | 4 ---- emulators/joytran/files/patch-CMakeLists.txt | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/emulators/joytran/Makefile b/emulators/joytran/Makefile index 1c3ee58e7e45..d28f112c6599 100644 --- a/emulators/joytran/Makefile +++ b/emulators/joytran/Makefile @@ -17,10 +17,6 @@ CMAKE_ARGS= -DLOCALBASE:PATH="${LOCALBASE}" OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e '/WARNING_FLAGS/s,-pedantic,& -fcommon,' \ - ${WRKSRC}/CMakeLists.txt - post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} diff --git a/emulators/joytran/files/patch-CMakeLists.txt b/emulators/joytran/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..e3b8e55447ce --- /dev/null +++ b/emulators/joytran/files/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2013-05-02 04:53:08 UTC ++++ CMakeLists.txt +@@ -119,9 +119,9 @@ IF( SDL_LIB STREQUAL "SDL2" ) + SET(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DWITH_SDL2") + ENDIF() + ## These work in both clang and gcc +-SET(WARNING_FLAGS "-W -Wall -Werror -pedantic") ++SET(WARNING_FLAGS "-W -Wall -pedantic") + SET(CMAKE_C_FLAGS +- "${WARNING_FLAGS} -isystem${CMAKE_INCLUDE_PATH} ${CMAKE_CPP_FLAGS}") ++ "${WARNING_FLAGS} -isystem${CMAKE_INCLUDE_PATH} ${CMAKE_CPP_FLAGS} -fcommon") + SET(CMAKE_LD_FLAGS "-L${CMAKE_LIB_PATH} -lX11 -lXtst -l${SDL_LIB}") + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_LD_FLAGS}") + SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_LD_FLAGS}")