diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2022-08-09 21:14:22 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-09-01 13:52:16 +0000 |
| commit | 2a09e5b4da7cfa9288c56e94791cc371a31b914d (patch) | |
| tree | 85371193824b40f77e1daa340ca67a3da4271bf4 /emulators | |
| parent | 38b884ce3bab911817375c60a8c781af1911acd8 (diff) | |
| download | ports-2a09e5b4da7cfa9288c56e94791cc371a31b914d.tar.gz ports-2a09e5b4da7cfa9288c56e94791cc371a31b914d.zip | |
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/linux_base-c7/Makefile | 19 | ||||
| -rw-r--r-- | emulators/linux_base-c7/pkg-plist.aarch64 | 4 | ||||
| -rw-r--r-- | emulators/linux_base-c7/pkg-plist.amd64 | 6 | ||||
| -rw-r--r-- | emulators/linux_base-c7/pkg-plist.i386 | 4 |
4 files changed, 10 insertions, 23 deletions
diff --git a/emulators/linux_base-c7/Makefile b/emulators/linux_base-c7/Makefile index 84162813f2a5..142e4e9267d3 100644 --- a/emulators/linux_base-c7/Makefile +++ b/emulators/linux_base-c7/Makefile @@ -136,23 +136,10 @@ REMOVE_FILES= bin/chfn bin/chsh bin/findmnt bin/login bin/lsblk bin/lscpu \ etc/passwd etc/printcap etc/protocols etc/services etc/shadow \ sbin/clock sbin/debugfs sbin/hwclock sbin/runuser sbin/zramctl -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300077) -GLIBC_VER= 2.17-292.el7 -MASTER_SITE_SUBDIR+= altarch/7.7.1908/os/aarch64/Packages/:DEFAULT,aarch64 \ - altarch/7.7.1908/updates/aarch64/Packages/:DEFAULT,aarch64 \ - centos/7.7.1908/os/x86_64/Packages/:DEFAULT,amd64 \ - centos/7.7.1908/updates/x86_64/Packages/:DEFAULT,amd64 \ - altarch/7.7.1908/os/i386/Packages/:DEFAULT,i386 \ - altarch/7.7.1908/updates/i386/Packages/:DEFAULT,i386 \ - centos/7.7.1908/os/Source/SPackages/:SOURCE \ - centos/7.7.1908/updates/Source/SPackages/:SOURCE -PLIST_SUB+= NEWGLIBC="@comment " -.else +.include <bsd.port.options.mk> + GLIBC_VER= 2.17-323.el7_9 PLIST_SUB+= NEWGLIBC="" -.endif .if ${ARCH} == aarch64 || ${ARCH} == amd64 SYSCTLMIB= kern.features.linux64 @@ -200,4 +187,4 @@ post-install: ${LN} -sf /var/run ${STAGEDIR}${PREFIX}/run ${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/linux_base-c7/pkg-plist.aarch64 b/emulators/linux_base-c7/pkg-plist.aarch64 index d71dfbdcbe7a..ef37229011a8 100644 --- a/emulators/linux_base-c7/pkg-plist.aarch64 +++ b/emulators/linux_base-c7/pkg-plist.aarch64 @@ -496,7 +496,7 @@ usr/lib64/gconv/IBM852.so usr/lib64/gconv/IBM855.so usr/lib64/gconv/IBM856.so usr/lib64/gconv/IBM857.so -%%NEWGLIBC%%usr/lib64/gconv/IBM858.so +usr/lib64/gconv/IBM858.so usr/lib64/gconv/IBM860.so usr/lib64/gconv/IBM861.so usr/lib64/gconv/IBM862.so @@ -1316,7 +1316,7 @@ usr/share/i18n/charmaps/IBM852.gz usr/share/i18n/charmaps/IBM855.gz usr/share/i18n/charmaps/IBM856.gz usr/share/i18n/charmaps/IBM857.gz -%%NEWGLIBC%%usr/share/i18n/charmaps/IBM858.gz +usr/share/i18n/charmaps/IBM858.gz usr/share/i18n/charmaps/IBM860.gz usr/share/i18n/charmaps/IBM861.gz usr/share/i18n/charmaps/IBM862.gz diff --git a/emulators/linux_base-c7/pkg-plist.amd64 b/emulators/linux_base-c7/pkg-plist.amd64 index c60438999751..75a02780477a 100644 --- a/emulators/linux_base-c7/pkg-plist.amd64 +++ b/emulators/linux_base-c7/pkg-plist.amd64 @@ -486,7 +486,7 @@ usr/lib/gconv/IBM852.so usr/lib/gconv/IBM855.so usr/lib/gconv/IBM856.so usr/lib/gconv/IBM857.so -%%NEWGLIBC%%usr/lib/gconv/IBM858.so +usr/lib/gconv/IBM858.so usr/lib/gconv/IBM860.so usr/lib/gconv/IBM861.so usr/lib/gconv/IBM862.so @@ -969,7 +969,7 @@ usr/lib64/gconv/IBM852.so usr/lib64/gconv/IBM855.so usr/lib64/gconv/IBM856.so usr/lib64/gconv/IBM857.so -%%NEWGLIBC%%usr/lib64/gconv/IBM858.so +usr/lib64/gconv/IBM858.so usr/lib64/gconv/IBM860.so usr/lib64/gconv/IBM861.so usr/lib64/gconv/IBM862.so @@ -1806,7 +1806,7 @@ usr/share/i18n/charmaps/IBM852.gz usr/share/i18n/charmaps/IBM855.gz usr/share/i18n/charmaps/IBM856.gz usr/share/i18n/charmaps/IBM857.gz -%%NEWGLIBC%%usr/share/i18n/charmaps/IBM858.gz +usr/share/i18n/charmaps/IBM858.gz usr/share/i18n/charmaps/IBM860.gz usr/share/i18n/charmaps/IBM861.gz usr/share/i18n/charmaps/IBM862.gz diff --git a/emulators/linux_base-c7/pkg-plist.i386 b/emulators/linux_base-c7/pkg-plist.i386 index 3e2485e05cb9..0e193adafb56 100644 --- a/emulators/linux_base-c7/pkg-plist.i386 +++ b/emulators/linux_base-c7/pkg-plist.i386 @@ -482,7 +482,7 @@ usr/lib/gconv/IBM852.so usr/lib/gconv/IBM855.so usr/lib/gconv/IBM856.so usr/lib/gconv/IBM857.so -%%NEWGLIBC%%usr/lib/gconv/IBM858.so +usr/lib/gconv/IBM858.so usr/lib/gconv/IBM860.so usr/lib/gconv/IBM861.so usr/lib/gconv/IBM862.so @@ -1339,7 +1339,7 @@ usr/share/i18n/charmaps/IBM852.gz usr/share/i18n/charmaps/IBM855.gz usr/share/i18n/charmaps/IBM856.gz usr/share/i18n/charmaps/IBM857.gz -%%NEWGLIBC%%usr/share/i18n/charmaps/IBM858.gz +usr/share/i18n/charmaps/IBM858.gz usr/share/i18n/charmaps/IBM860.gz usr/share/i18n/charmaps/IBM861.gz usr/share/i18n/charmaps/IBM862.gz |