diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2019-07-10 22:40:02 +0800 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2019-07-10 22:40:02 +0800 |
| commit | 7003875294fc8b811ffe452c376f66a855494f60 (patch) | |
| tree | 9754e52797ffd2ab1caf7b83b3fa360ba5db8a85 /x11 | |
| parent | b3ec6fb0fe1868f49bc3ae82909a818a4d043678 (diff) | |
| download | freebsd-ports-gnome-7003875294fc8b811ffe452c376f66a855494f60.tar.gz freebsd-ports-gnome-7003875294fc8b811ffe452c376f66a855494f60.tar.zst freebsd-ports-gnome-7003875294fc8b811ffe452c376f66a855494f60.zip | |
On amd64 adding DEFAULT_VERSIONS+=linux=c6 to /etc/make.conf made Linux
infrastructure ports (linux_base-c6 and linux-c6*) install i386 CentOS 6
packages. Using c6_64 instead of c6 made them install mixed amd64/i386
CentOS 6 packages and allowed Linux application ports to install amd64
binaries when available. The i386-only configuration was only useful for
users of x11/nvidia-driver* which didn't provide Linux amd64 emulation
until recently.
With x11/nvidia-driver* now supporting Linux amd64 there's no longer a
need for i386-only Linux on amd64. Let DEFAULT_VERSIONS+=linux=c6 make
Linux infrastructure ports install mixed amd64/i386 CentOS 6 packages,
like c6_64 before, and remove support for c6_64 as a value.
Replace LINUX_ARCH with ARCH everywhere because they are always the same
now.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/nvidia-driver/Makefile | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index eabec88d15f2..11828a6c3ebf 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -101,14 +101,13 @@ OPTIONS_DEFINE+= FREEBSD_AGP FREEBSD_AGP_DESC= Use FreeBSD AGP GART driver .endif -LINUX_MASTER_SITES=NVIDIA/XFree86/Linux-${LINUX_ARCH_SUFX}/${DISTVERSION}/:linux -LINUX_DISTFILES=NVIDIA-Linux-${LINUX_ARCH_SUFX}-${DISTVERSION}.run:linux +LINUX_MASTER_SITES=NVIDIA/XFree86/Linux-${ARCH_SUFX}/${DISTVERSION}/:linux +LINUX_DISTFILES=NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}.run:linux LINUX_USES= linux LINUX_USE= LINUX=xorglibs -LINUX_ARCH_SUFX=${LINUX_ARCH:S/i386/x86/} -LINUX_LIBDIR= /usr/lib${LINUX_ARCH:S/i386//:S/x86_64/64/} -LINUX_WRKSRC= ${WRKDIR}/NVIDIA-Linux-${LINUX_ARCH_SUFX}-${DISTVERSION} +LINUX_LIBDIR= /usr/lib${ARCH:S/i386//:S/amd//} +LINUX_WRKSRC= ${WRKDIR}/NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION} LINUX_LIBS= libcuda.so.${PORTVERSION} \ libnvcuvid.so.${PORTVERSION} \ @@ -394,27 +393,30 @@ PLIST_RE+= '\,${LINUXBASE}.*libGLdispatch\.so,d' \ '\,${LINUXBASE}.*libOpenGL\.so,d' .endif .endif # ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT:S/_64//} == c7 -.endif # ${PORT_OPTIONS:MLINUX} - -.include <bsd.port.pre.mk> +.if ${ARCH} == amd64 .if ${NVVERSION} >= 310.014 LINUX32_LIBS+= libnvcuvid.so.${PORTVERSION} LINUX32_LINKS+= libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \ libnvcuvid.so.${PORTVERSION} libnvcuvid.so -.elif "${LINUX_ARCH}" == "x86_64" +.else PLIST_RE+= '\,${LINUXBASE}/usr/lib/libnvcuvid\.so,d' .endif +.endif +.endif # ${PORT_OPTIONS:MLINUX} -.if "${LINUX_ARCH}" == "x86_64" +.if ${PORT_OPTIONS:MLINUX} && ${ARCH} == amd64 PLIST_SUB+= LINUX32="" .else PLIST_SUB+= LINUX32="@comment " .endif +# XXX Only needed to obtain PORTVERSION. +.include <bsd.port.pre.mk> + post-extract-LINUX-on: @(cd ${WRKDIR} && ${SH} \ - ${DISTDIR}/NVIDIA-Linux-${LINUX_ARCH_SUFX}-${DISTVERSION}.run \ + ${DISTDIR}/NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}.run \ --extract-only > /dev/null) pre-patch: @@ -615,7 +617,7 @@ post-install-LINUX-on: ${RLN} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${s} \ ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${t} .endfor -.if "${LINUX_ARCH}" == "x86_64" +.if ${ARCH} == amd64 ${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/tls ${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/vdpau .for l in ${LINUX32_LIBS} |