From nobody Sun Oct 20 10:01:04 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 4XWYqN50nKz5YqDK; Sun, 20 Oct 2024 10:01:04 +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 4XWYqN3hh8z4QHm; Sun, 20 Oct 2024 10:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729418464; 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=PPUAj6vg6XBicmV+zz58M2ZR4skmX94sMXL3QKCXVds=; b=KABSrZKxn83eGe4ezZdLwoDMgaZ9J3iM3B6Mtqg4IpzEPu9JzcyxPu9wpuXa5JO+/ZCF3T evLT1se96+4cqWVQaSwhdJ6WNHAIeyQvg51zPnnz6zPNXi09zTv9Szpekj9lNggqFTLgY4 YGflQt7Ga8661QeGh6Ni992EAQE/O45ZXBx6n5WVTUiq4EchF/4jDuipeipAJPEl0FD7h0 7yPOx0x611mUYAtGkRI9OClac3ZAF7+7GYR9u8EPLHkdsbNr9oGmItw1ge1Z7kpeCO4b8s QHTB1tSQKoGUl4fdIlpgvwKv5mD8RqmQZmjmZBElxtuVQ3xioURXvr2f/pdUkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729418464; 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=PPUAj6vg6XBicmV+zz58M2ZR4skmX94sMXL3QKCXVds=; b=rp3p+9BxZJHOax1EfKt0B0vtM1CImzyPm7HnqBzMsslwyl16GV7QDYk5/Pmi1z4N+6JmOb iYlwIIZ6Din+NH9y2H9FKfNXCkNwV19Oui4rQUcR+2rMUo14kKZvgBrBUb4VnEoriz/3+x ZkQ3fxjrGgFc+CblkW/78pntIldEHGKyzHiLMPv/l0+BV8r86cJmLN6xKR9lAXhenozaoh 8MNnOCUGp0XagFAFqgWUY1949WVuXNX5B9K1SBz8D0kM0c3FE9PMbbPTq/zLqRcgzf6slE 9262luRaoLywh9ZCxZIq5ntRk7qkgqB+wVQ1hffI0zcYqqrZ0O6xQgnzewOO1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729418464; a=rsa-sha256; cv=none; b=CF/tOnZBl2gRm5uxjR+TQ0Wmiz9DqfBCKXn1i/Vja0HIyglWzeJz7s8kDxmwdS3pgoGXqA Qfo5JgaEigiUHmw5vvlbFQVVbXAsiXVDEmJ3oxAZKEi9FngpEMnoNox+4LIi/NjIqqywdd FrnlLEjqWsZ0tHDAANmh061Rhy/l7eNafNsL6HjxQO54s5z3yusax0/W4YWi2NVzdVagpu 6eQH3d/tCdYcDDcGS8+NQUg5XPuhaoUH/gynUv33ZBi+zo9in5qSvKG7mjEPFfnYwXHoZU KfcaDD+MeC3PC0UsMrxZcQ7Jtzt2+gj5WQiS+o8HKT74Brq+PcTbM62LRv2j0A== 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 4XWYqN3Hk0zx93; Sun, 20 Oct 2024 10:01:04 +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 49KA14xG011070; Sun, 20 Oct 2024 10:01:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49KA14O3011067; Sun, 20 Oct 2024 10:01:04 GMT (envelope-from git) Date: Sun, 20 Oct 2024 10:01:04 GMT Message-Id: <202410201001.49KA14O3011067@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 5416735dea61 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5416735dea6160ac4efb3cd847936a3213ab1502 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=5416735dea6160ac4efb3cd847936a3213ab1502 commit 5416735dea6160ac4efb3cd847936a3213ab1502 Author: Dimitry Andric AuthorDate: 2024-10-06 21:40:43 +0000 Commit: Dimitry Andric CommitDate: 2024-10-20 10:00:34 +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 --- 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