From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0CC515800F for ; Fri, 6 Jan 2023 08:51:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A111E07D3; Fri, 6 Jan 2023 08:51:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A1E3E07D3 for ; Fri, 6 Jan 2023 08:51:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BEB01340D2D for ; Fri, 6 Jan 2023 08:51:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15C16827 for ; Fri, 6 Jan 2023 08:51:35 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1672929947.1c93ee9db87756a95609a4b6a99fcb4909f532d4.flow@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/files/, games-fps/assaultcube/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-fps/assaultcube/assaultcube-1.3.0.2.ebuild games-fps/assaultcube/files/0002-Don-t-configure-libenet-in-Makefile.patch X-VCS-Directories: games-fps/assaultcube/files/ games-fps/assaultcube/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 1c93ee9db87756a95609a4b6a99fcb4909f532d4 X-VCS-Branch: master Date: Fri, 6 Jan 2023 08:51:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 788991cc-e4b8-4a02-a94d-e853683cac39 X-Archives-Hash: 4601c4d32bfb5d9f634f3e556b26b020 commit: 1c93ee9db87756a95609a4b6a99fcb4909f532d4 Author: Duje Mihanović skole hr> AuthorDate: Thu Jan 5 14:45:47 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Thu Jan 5 14:45:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1c93ee9d games-fps/assaultcube: configure bundled libenet in src_configure Signed-off-by: Duje Mihanović skole.hr> games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 5 +++ .../0002-Don-t-configure-libenet-in-Makefile.patch | 45 ++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild index 8db59ebc9..1ea47bda7 100644 --- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild +++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild @@ -31,6 +31,7 @@ PATCHES=( # a script which checks for required libs and certain parts of the game "${FILESDIR}/${PN}-1.3.0.2-fix-checkinstall.patch" "${FILESDIR}/0001-Fix-unnecessary-rebuild-on-make-install.patch" + "${FILESDIR}/0002-Don-t-configure-libenet-in-Makefile.patch" ) src_prepare() { @@ -40,12 +41,16 @@ src_prepare() { src_configure() { filter-lto + cd source/enet && ./configure \ + --enable-shared=no \ + --enable-static=yes } src_compile() { if use debug; then local -x DEBUGBUILD=1 fi + emake -C source/enet emake -C source/src } diff --git a/games-fps/assaultcube/files/0002-Don-t-configure-libenet-in-Makefile.patch b/games-fps/assaultcube/files/0002-Don-t-configure-libenet-in-Makefile.patch new file mode 100644 index 000000000..7a2f32abf --- /dev/null +++ b/games-fps/assaultcube/files/0002-Don-t-configure-libenet-in-Makefile.patch @@ -0,0 +1,45 @@ +From ab7618606b8358245b13dc5a7291fa3b0211fd10 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= +Date: Thu, 5 Jan 2023 15:14:48 +0100 +Subject: [PATCH 2/2] Don't configure libenet in Makefile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This shall be done in the ebuild's src_configure instead. + +Signed-off-by: Duje Mihanović +--- + source/src/Makefile | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/source/src/Makefile b/source/src/Makefile +index 9ecf691..6607f91 100644 +--- a/source/src/Makefile ++++ b/source/src/Makefile +@@ -155,19 +155,16 @@ default: all + + all: client server + +-../enet/Makefile: +- cd ../enet; ./configure --enable-shared=no --enable-static=yes +- +-../enet/.libs/libenet.la: ../enet/Makefile ++../enet/.libs/libenet.la: + -$(MAKE) -C ../enet all + +-clean-enet: ../enet/Makefile ++clean-enet: + $(MAKE) -C ../enet/ clean + + clean: + -$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) ac_client ac_server ac_master + +-mrproper: clean ../enet/Makefile ++mrproper: clean + $(MAKE) -C ../enet/ distclean + -$(RM) ../enet/Makefile + +-- +2.38.2 +