diff options
Diffstat (limited to 'Mk/Uses/linux.mk')
| -rw-r--r-- | Mk/Uses/linux.mk | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk index 1a8a28f5008f..e098234fcbc5 100644 --- a/Mk/Uses/linux.mk +++ b/Mk/Uses/linux.mk @@ -34,7 +34,7 @@ linux_ARGS= ${LINUX_DEFAULT} . if ${linux_ARGS} == c7 LINUX_DIST_VER?= 7.9.2009 . else -IGNORE= Invalid Linux distribution: ${linux_ARGS} +ERROR+= "Invalid Linux distribution: ${linux_ARGS}" . endif . ifndef ONLY_FOR_ARCHS @@ -51,18 +51,19 @@ _linux_c7_at-spi2-core= linux-c7-at-spi2-core>0:accessibility/linux-c7-at-spi2 _linux_${linux_ARGS}_atk= linux-${linux_ARGS}-atk>0:accessibility/linux-${linux_ARGS}-atk _linux_${linux_ARGS}_avahi-libs= linux-${linux_ARGS}-avahi-libs>0:net/linux-${linux_ARGS}-avahi-libs _linux_c7_base= linux_base-c7>=7.6.1810_7:emulators/linux_base-c7 +_linux_c7_ca-certificates= linux-c7-ca-certificates>0:security/linux-c7-ca-certificates _linux_${linux_ARGS}_cairo= linux-${linux_ARGS}-cairo>0:graphics/linux-${linux_ARGS}-cairo _linux_c7_cairo-gobject= linux-c7-cairo-gobject>0:graphics/linux-c7-cairo-gobject _linux_${linux_ARGS}_cups-libs= linux-${linux_ARGS}-cups-libs>0:print/linux-${linux_ARGS}-cups-libs _linux_${linux_ARGS}_curl= linux-${linux_ARGS}-curl>0:ftp/linux-${linux_ARGS}-curl _linux_${linux_ARGS}_cyrus-sasl2= linux-${linux_ARGS}-cyrus-sasl-lib>0:security/linux-${linux_ARGS}-cyrus-sasl2 -_linux_${linux_ARGS}_dbusglib= linux-${linux_ARGS}-dbus-glib>0:devel/linux-${linux_ARGS}-dbus-glib _linux_${linux_ARGS}_dbuslibs= linux-${linux_ARGS}-dbus-libs>0:devel/linux-${linux_ARGS}-dbus-libs _linux_${linux_ARGS}_devtools= linux-${linux_ARGS}-devtools>0:devel/linux-${linux_ARGS}-devtools _linux_c7_dosfstools= linux-c7-dosfstools>0:sysutils/linux-c7-dosfstools _linux_${linux_ARGS}_dri= linux-${linux_ARGS}-dri>0:graphics/linux-${linux_ARGS}-dri _linux_${linux_ARGS}_elfutils-libelf= linux-${linux_ARGS}-elfutils-libelf>0:devel/linux-${linux_ARGS}-elfutils-libelf _linux_c7_elfutils-libs= linux-c7-elfutils-libs>0:devel/linux-c7-elfutils-libs +_linux_c7_expat-devel= linux-c7-expat-devel>0:textproc/linux-c7-expat-devel _linux_${linux_ARGS}_expat= linux-${linux_ARGS}-expat>0:textproc/linux-${linux_ARGS}-expat _linux_c7_flac= linux-c7-flac-libs>0:audio/linux-c7-flac _linux_${linux_ARGS}_fontconfig= linux-${linux_ARGS}-fontconfig>0:x11-fonts/linux-${linux_ARGS}-fontconfig @@ -112,6 +113,7 @@ _linux_c7_numactl-libs= linux-c7-numactl-libs>0:sysutils/linux-c7-numactl-libs _linux_${linux_ARGS}_openal-soft= linux-${linux_ARGS}-openal-soft>0:audio/linux-${linux_ARGS}-openal-soft _linux_${linux_ARGS}_openldap= linux-${linux_ARGS}-openldap>0:net/linux-${linux_ARGS}-openldap _linux_c7_openmotif= linux-c7-motif>0:x11-toolkits/linux-c7-openmotif +_linux_c7_openssl-devel= linux-c7-openssl-devel>0:security/linux-c7-openssl-devel _linux_c7_openssl= ${_linux_c7_base} _linux_c7_p11-kit= linux-c7-p11-kit>0:security/linux-c7-p11-kit _linux_${linux_ARGS}_pango= linux-${linux_ARGS}-pango>0:x11-toolkits/linux-${linux_ARGS}-pango @@ -136,6 +138,7 @@ _linux_${linux_ARGS}_userspace-rcu= linux-${linux_ARGS}-userspace-rcu>0:sysutils _linux_c7_wayland= linux-c7-wayland>0:graphics/linux-c7-wayland _linux_c7_xcb-util= linux-c7-xcb-util>0:x11/linux-c7-xcb-util _linux_c7_xorglibs= linux-c7-xorg-libs>=7.7_7:x11/linux-c7-xorg-libs +_linux_c7_zlib-devel= linux-c7-zlib-devel>0:devel/linux-c7-zlib-devel USE_LINUX?= base . for i in ${USE_LINUX} @@ -209,20 +212,12 @@ DISTFILES_aarch64?= ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_aarch64}:aarch64/} \ . endif . if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mamd64)) \ && empty(NOT_FOR_ARCHS:Mamd64) -. if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \ - && empty(NOT_FOR_ARCHS:Mi386) DISTFILES_amd64?= ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \ - ${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \ + ${LIB_DISTNAMES_i386:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \ ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \ ${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \ ${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \ ${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/} -. else -DISTFILES_amd64?= ${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}/} \ - ${LIB_DISTNAMES_amd64:S/$/${EXTRACT_SUFX_amd64}:amd64/} \ - ${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}/} \ - ${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/} -. endif . endif . if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \ && empty(NOT_FOR_ARCHS:Mi386) |