pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gcc12: Restrict use of a distribution patch to Darwin/x86_64
Module Name: pkgsrc-wip
Committed By: Brook Milligan <brook%nmsu.edu@localhost>
Pushed By: brook
Date: Tue Jan 7 08:15:39 2025 -0700
Changeset: 627daa006bbf9e3a4425fc6f84145f107e066166
Modified Files:
gcc12/Makefile.common
Log Message:
gcc12: Restrict use of a distribution patch to Darwin/x86_64
The distribution patchset for Darwin/x86_64 v24 reportedly does not
work for Darwin/aarch64 v24. For now, restrict its use to just
Darwin/x86_64.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=627daa006bbf9e3a4425fc6f84145f107e066166
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gcc12/Makefile.common | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diffs:
diff --git a/gcc12/Makefile.common b/gcc12/Makefile.common
index cfbb0f33c3..14cfc048d7 100644
--- a/gcc12/Makefile.common
+++ b/gcc12/Makefile.common
@@ -16,9 +16,8 @@ LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DEFAULT_DISTFILES}
-# XXX - for testing, use defaults, i.e., from this directory
-# PATCHDIR= ${.CURDIR}/../../lang/gcc12/patches
-# DISTINFO_FILE= ${.CURDIR}/../../lang/gcc12/distinfo
+PATCHDIR= ${.CURDIR}/../../wip/gcc12/patches
+DISTINFO_FILE= ${.CURDIR}/../../wip/gcc12/distinfo
# Relocations result in a linker error on AArch64, but not x86.
MKPIE_SUPPORTED= no
@@ -68,7 +67,7 @@ CONFIGURE_ARGS+= --disable-darwin-at-rpath
PATCHFILES= gcc-12.4.0.diff
PATCH_SITES= https://raw.githubusercontent.com/Homebrew/formula-patches/ca7047d/gcc/
PATCH_DIST_STRIP= -p1
-.elif ${OPSYS} == "Darwin"
+.elif ${MACHINE_PLATFORM:MDarwin-*-x86_64}
PATCHFILES= gcc-12.4.0-Darwin-x86_64.diff
PATCH_SITES= ftp://ftp.netbsd.org/pub/pkgsrc/distfiles
.else # use a distribution patchset to avoid conflicts with above
Home |
Main Index |
Thread Index |
Old Index