Date: Tue, 17 Jan 2017 18:35:31 +0100 From: Tijl Coosemans <tijl@FreeBSD.org> To: freebsd-emulation@freebsd.org Cc: Piotr Kubaj <pkubaj@anongoth.pl> Subject: Re: Dropping CentOS 7 / i386 Message-ID: <20170117183531.7eecfd37@kalimero.tijl.coosemans.org> In-Reply-To: <20170117130022.GA94165@chujemuje> References: <20170117130022.GA94165@chujemuje>
next in thread | previous in thread | raw e-mail | index | archive | help
--MP_/hLR2LzMI_3GCdrv.bc__J9L
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
On Tue, 17 Jan 2017 14:00:22 +0100 Piotr Kubaj via freebsd-emulation <freebsd-emulation@freebsd.org> wrote:
> Is it possible that we drop linux c7 variation? CentOS 7 doesn't
> officially support i386 and there are still no binaries for i386 after
> over a month since 7.3.1611 release.
>
> For the last 3 weeks I've had a patch to update the ports to 7.3.1611,
> but obviously it's only for amd64.
> There would still be c6 ports for anyone that needs them.
Yes, now that all supported versions of FreeBSD support 64 bit Linux we
can make the CentOS 7 ports 64 bit only (until upstream does provide i386
packages).
Please include the attached patch in your patch. You just have to change
LINUX_DIST_VER. It sets IGNORE for CentOS 7 on i386, makes c7_64 an
alias for c7 and removes fmake support.
--MP_/hLR2LzMI_3GCdrv.bc__J9L
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=linux.patch
Index: Mk/Uses/linux.mk
===================================================================
--- Mk/Uses/linux.mk (revision 431754)
+++ Mk/Uses/linux.mk (working copy)
@@ -31,21 +31,26 @@ linux_ARGS= ${LINUX_DEFAULT:S/_64//}
.if ${linux_ARGS} == c6
LINUX_DIST_VER?= 6.8
-.elif ${linux_ARGS} == c7
-LINUX_DIST_VER?= 7.2.1511
+.if ${ARCH} == amd64 && ${LINUX_DEFAULT} != c6
+LINUX_ARCH= x86_64
+LINUX_ARCH32= i386
+.elif ${ARCH} == amd64 || ${ARCH} == i386
+LINUX_ARCH= i386
.else
-IGNORE= Invalid Linux distribution: ${linux_ARGS}
+LINUX_ARCH= ${ARCH}
+IGNORE= Linux CentOS ${LINUX_DIST_VER} is unsupported on ${ARCH}
.endif
-
-.if ${LINUX_DEFAULT:M*_64}
+.elif ${linux_ARGS} == c7
+LINUX_DIST_VER?= 7.2.1511
+.if ${ARCH} == amd64
LINUX_ARCH= x86_64
LINUX_ARCH32= i386
-.if ${ARCH} != amd64 || ${OPSYS} != FreeBSD \
- || ( ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100105 )
-IGNORE= Linux ${LINUX_DEFAULT} is unsupported on pre-release versions of FreeBSD 11. Update to 11.0-RELEASE or higher.
+.else
+LINUX_ARCH= ${ARCH}
+IGNORE= Linux CentOS ${LINUX_DIST_VER} is unsupported on ${ARCH}
.endif
.else
-LINUX_ARCH= i386
+IGNORE= Invalid Linux distribution: ${linux_ARGS}
.endif
linux_allegro_DEP= linux-${linux_ARGS}-allegro>0:devel/linux-${linux_ARGS}-allegro
@@ -230,10 +235,9 @@ LIB_DISTFILES?= ${DISTNAME}${EXTRACT_SU
.else
BIN_DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}
.endif
-.ifdef LINUX_ARCH32 && EXTRACT_SUFX32
-.for fmakehack in ${LINUX_ARCH32}
-.if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${fmakehack})) \
- && empty(NOT_FOR_ARCHS:M${fmakehack})
+.if defined(LINUX_ARCH32) && defined(EXTRACT_SUFX32) \
+ && !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${LINUX_ARCH32})) \
+ && empty(NOT_FOR_ARCHS:M${LINUX_ARCH32})
DISTFILES?= ${LIB_DISTFILES:S/${EXTRACT_SUFX}/${EXTRACT_SUFX32}/} \
${LIB_DISTFILES} ${BIN_DISTFILES}
EXTRACT_ONLY?= ${LIB_DISTFILES:S/${EXTRACT_SUFX}/${EXTRACT_SUFX32}/} \
@@ -242,11 +246,6 @@ EXTRACT_ONLY?= ${LIB_DISTFILES:S/${EXTR
DISTFILES?= ${LIB_DISTFILES} ${BIN_DISTFILES}
EXTRACT_ONLY?= ${LIB_DISTFILES} ${BIN_DISTFILES}
.endif
-.endfor
-.else
-DISTFILES?= ${LIB_DISTFILES} ${BIN_DISTFILES}
-EXTRACT_ONLY?= ${LIB_DISTFILES} ${BIN_DISTFILES}
-.endif
.ifdef PACKAGE_BUILDING
SRC_DISTFILES?= ${LIB_DISTFILES:S/${EXTRACT_SUFX}/${SRC_SUFX}:SOURCE/} \
${BIN_DISTFILES:S/${EXTRACT_SUFX}/${SRC_SUFX}:SOURCE/}
@@ -291,12 +290,9 @@ DISTFILES?= ${DISTFILES_${LINUX_ARCH}}
.endif
.endif
-# With fmake :M${var} only works when ${var} is a for loop variable.
-.for fmakehack in ${LINUX_ARCH:S/x86_64/amd64/}
-.if (defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${fmakehack})) \
- || !empty(NOT_FOR_ARCHS:M${fmakehack})
+.if (defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${LINUX_ARCH:S/x86_64/amd64/})) \
+ || !empty(NOT_FOR_ARCHS:M${LINUX_ARCH:S/x86_64/amd64/})
IGNORE= does not run on Linux/${LINUX_ARCH}
.endif
-.endfor
.endif # _POSTMKINCLUDED && ! _INCLUDE_USES_LINUX_POST_MK
--MP_/hLR2LzMI_3GCdrv.bc__J9L--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170117183531.7eecfd37>