From nobody Sun Oct 20 10:01:37 2024 X-Original-To: dev-commits-ports-all@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 4XWYr16Qbhz5YqHX; Sun, 20 Oct 2024 10:01:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XWYr15mf2z4Qqs; Sun, 20 Oct 2024 10:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729418497; 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=78GU+jqaW4/BYr4rzmeTXuCHHBSs1Q/Bv4facwv95cg=; b=WjgRIPI9Oj5N8EfIeUX+Up17b7s8+yhVBJnrPdVWoGRrwKyC2tBmDFkCPWYxHaBXTLps2R cDGooIJAqvL0LMHmlQAKPR8RL/+ED57pAg3fDG/OYfO0rOVQJlZue2JpIv8Yxh1A3XDT5H 8021ShCd4MVTRfkKZPDuZdimnKE+Dyse7sgMPUJYkxQEtdemzrQdmG/cwHypGj5iNQJ1Qj Jef7WkjRWZctXxU3eArM/zJStQWbAIT+1gydwo7qAgYkMIV0+Q4rY87dm+WiR6vGIO9Zu4 0UrjltL+dG5JDTV+df4IwY5rKZYzBekelURHf4NfLTG0sK5f0TN1ndqGI9YiqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729418497; 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=78GU+jqaW4/BYr4rzmeTXuCHHBSs1Q/Bv4facwv95cg=; b=Gm10Ze1YiDzIiHZz9R+TQhYyTpJ9to1boWteUJqg2q5ZXxBMvZrPowM/l2Bl6M7A7TZdJP 0cGCJpqUlJu6RbJJMC3voVwzcmQ01wh26LMkPXqg3wD+KfMLtmE/WNLTKfNGU9Nub0c0Xm gDcyTfBn0fNxQ2QP4gQD6jYB0f/aJM9H/emVkutFxis4YmG9W6weZKflxba1sEW7cxYMml jQSxh0MoQJOrG3L3ANhMgjMBsXwKhjsiQcydgoD+JKM2/FgjqLj7+s5FFVx3/RJCFL6kev Kn3WQrMzSi4ush7s9AVpb9wB7EYqjcZ0pAqmKGaHFTmmxJt885uB1sXT4adhog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729418497; a=rsa-sha256; cv=none; b=Dbv/oNkGPUSE1z4qveGc3zRScd7c9ZcTPlPZuerfaCb4v38YTikr8h7HOYSPXqCPoLo4YQ +H8Byb/MPyzuEnsEufFm9LPdHzd+qWYanJAMtRjqFjCztQOj1IkmvusMWGPe1yJNwTz4/N AVdSCAOqN0vhogeynBg3epsOLgklF8WjgDmdLFUgFnErYW+k6C/q9wGEAe/SEDZgw3Giq8 LyIYHjW7CFZapQBLhJfbg/1vWLOvs8cx2Lg6+RAwfvfMgykZX8VuoNQ5KhyEFsIVXBc3JI KfrmLt1WM8UOcdKXHSvh2Yl3YX6eVukEKRg+j4x7itkFE/KlvoCrw5wAuBgSIQ== 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 4XWYr15NwMzx77; Sun, 20 Oct 2024 10:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49KA1bMd011834; Sun, 20 Oct 2024 10:01:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49KA1bnr011819; Sun, 20 Oct 2024 10:01:37 GMT (envelope-from git) Date: Sun, 20 Oct 2024 10:01:37 GMT Message-Id: <202410201001.49KA1bnr011819@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: fd6294088c03 - 2024Q4 - emulators/mupen64plus-core: fix build with clang and lld 19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: fd6294088c037ae77d6bcd0efa50c585d97c8d08 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd6294088c037ae77d6bcd0efa50c585d97c8d08 commit fd6294088c037ae77d6bcd0efa50c585d97c8d08 Author: Dimitry Andric AuthorDate: 2024-10-06 21:40:43 +0000 Commit: Dimitry Andric CommitDate: 2024-10-20 10:01:20 +0000 emulators/mupen64plus-core: fix build with clang and lld 19 lld 19 has become more strict about 32-bit relocations that require PIC, resulting in link errors when building emulators/mupen64plus-core: LD libmupen64plus.so.2.0.0 ld: error: relocation R_386_32 cannot be used against symbol '__gxx_personality_v0'; recompile with -fPIC >>> defined in /usr/lib/libcxxrt.so >>> referenced by oglft_c.cpp >>> _obj/osd/oglft_c.o:(.eh_frame+0xFA63) ld: error: relocation R_386_32 cannot be used against local symbol; recompile with -fPIC >>> defined in _obj/osd/oglft_c.o >>> referenced by oglft_c.cpp >>> _obj/osd/oglft_c.o:(.eh_frame+0xFA81) ld: error: relocation R_386_32 cannot be used against local symbol; recompile with -fPIC >>> defined in _obj/osd/oglft_c.o >>> referenced by oglft_c.cpp >>> _obj/osd/oglft_c.o:(.eh_frame+0xFAB1) ld: error: relocation R_386_32 cannot be used against local symbol; recompile with -fPIC >>> defined in _obj/osd/oglft_c.o >>> referenced by oglft_c.cpp >>> _obj/osd/oglft_c.o:(.eh_frame+0xFAE1) [...more of these...] Make it compile with -fPIC even on i386, by adjusting the PIC make variable. This also removes the need to use -Wl,-znotext as a workaround. PR: 281906 Approved by: maintainer timeout (2 weeks) MFH: 2024Q4 (cherry picked from commit 5416735dea6160ac4efb3cd847936a3213ab1502) --- emulators/mupen64plus-core/Makefile | 1 - .../files/patch-projects_unix_Makefile | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile index 0193eebc1d44..eef7478a88da 100644 --- a/emulators/mupen64plus-core/Makefile +++ b/emulators/mupen64plus-core/Makefile @@ -19,7 +19,6 @@ USE_GL?= glu USE_SDL?= sdl2 USE_LDCONFIG?= yes ONLY_FOR_ARCHS= i386 amd64 -LDFLAGS_i386= -Wl,-znotext RELEASE_DATE?= 20240714 OPTFLAGS= # diff --git a/emulators/mupen64plus-core/files/patch-projects_unix_Makefile b/emulators/mupen64plus-core/files/patch-projects_unix_Makefile new file mode 100644 index 000000000000..6445ad2a0454 --- /dev/null +++ b/emulators/mupen64plus-core/files/patch-projects_unix_Makefile @@ -0,0 +1,20 @@ +--- projects/unix/Makefile.orig 2024-10-06 21:34:50 UTC ++++ projects/unix/Makefile +@@ -61,7 +61,7 @@ ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","") + CPU := X86 + ifeq ("$(BITS)", "32") + ARCH_DETECTED := 64BITS_32 +- PIC ?= 0 ++ PIC ?= 1 + else + ARCH_DETECTED := 64BITS + PIC ?= 1 +@@ -70,7 +70,7 @@ ifneq ("$(filter pentium i%86,$(HOST_CPU))","") + ifneq ("$(filter pentium i%86,$(HOST_CPU))","") + CPU := X86 + ARCH_DETECTED := 32BITS +- PIC ?= 0 ++ PIC ?= 1 + endif + ifneq ("$(filter ppc macppc socppc powerpc,$(HOST_CPU))","") + CPU := PPC