Date: Mon, 5 Sep 2022 12:42:30 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 97eb3f01af91 - main - devel/pcc-libs: accept both x86_64 and amd64 Message-ID: <202209051242.285CgUar037471@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=97eb3f01af9176ff13ec178917ccf82a1d8da775 commit 97eb3f01af9176ff13ec178917ccf82a1d8da775 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2022-09-02 13:12:20 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2022-09-05 12:42:23 +0000 devel/pcc-libs: accept both x86_64 and amd64 In preparation for config.guess/config.sub --- devel/pcc-libs/Makefile | 10 +--------- devel/pcc-libs/files/patch-configure | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/devel/pcc-libs/Makefile b/devel/pcc-libs/Makefile index 2226016d5f6d..10f6c912659e 100644 --- a/devel/pcc-libs/Makefile +++ b/devel/pcc-libs/Makefile @@ -22,12 +22,4 @@ GNU_CONFIGURE= yes DATADIR= ${PREFIX}/lib/pcc PORTDATA= * -.include <bsd.port.pre.mk> - -post-patch: -.if ${OPSYS} == FreeBSD - @${REINPLACE_CMD} -e '/targmach=amd64/s/x86_64/amd64/' \ - ${WRKSRC}/configure -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/pcc-libs/files/patch-configure b/devel/pcc-libs/files/patch-configure new file mode 100644 index 000000000000..d58a99afb432 --- /dev/null +++ b/devel/pcc-libs/files/patch-configure @@ -0,0 +1,30 @@ +--- configure.orig 2014-12-06 10:06:59 UTC ++++ configure +@@ -1976,7 +1976,7 @@ case "$target_os" in + case "$target_cpu" in + i?86) targmach=i386 ;; + powerpc) targmach=powerpc endian=big ;; +- x86_64) targmach=amd64 ;; ++ amd64) targmach=amd64 ;; + esac + ;; + +@@ -1991,7 +1991,8 @@ case "$target_os" in + targos=freebsd + case "$target_cpu" in + i386) targmach=i386 ;; +- x86_64) targmach=amd64 ;; ++ amd64) targmach=amd64 ;; ++ x86_64|amd64) targmach=amd64 ;; + esac + ;; + +@@ -2000,7 +2001,7 @@ case "$target_os" in + case "$target_cpu" in + i?86) targmach=i386 ;; + powerpc*) targmach=powerpc endian=big ;; +- x86_64) targmach=amd64 ;; ++ amd64) targmach=amd64 ;; + esac + ;; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209051242.285CgUar037471>