Remove the obsolete auxarches, biarcharches, debuginfocommonarches variable
The auxarches no longer exist, and the other variables are unused. Related: RHEL-63048
This commit is contained in:
parent
b0aa142580
commit
5111f98bd4
58
glibc.spec
58
glibc.spec
@ -55,12 +55,6 @@
|
|||||||
%undefine with_docs
|
%undefine with_docs
|
||||||
%undefine with_valgrind
|
%undefine with_valgrind
|
||||||
%endif
|
%endif
|
||||||
##############################################################################
|
|
||||||
# Auxiliary arches are those arches that can be built in addition
|
|
||||||
# to the core supported arches. You either install an auxarch or
|
|
||||||
# you install the base arch, not both. You would do this in order
|
|
||||||
# to provide a more optimized version of the package for your arch.
|
|
||||||
%define auxarches athlon alphaev6
|
|
||||||
|
|
||||||
# Only some architectures have static PIE support.
|
# Only some architectures have static PIE support.
|
||||||
%define pie_arches %{ix86} x86_64
|
%define pie_arches %{ix86} x86_64
|
||||||
@ -75,17 +69,6 @@
|
|||||||
# RHEL 8 does not have a working %%dnl macro.
|
# RHEL 8 does not have a working %%dnl macro.
|
||||||
%define comment() %{nil}
|
%define comment() %{nil}
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
# Any architecture/kernel combination that supports running 32-bit and 64-bit
|
|
||||||
# code in userspace is considered a biarch arch.
|
|
||||||
%define biarcharches %{ix86} x86_64 %{power64} s390 s390x
|
|
||||||
##############################################################################
|
|
||||||
# If the debug information is split into two packages, the core debuginfo
|
|
||||||
# pacakge and the common debuginfo package then the arch should be listed
|
|
||||||
# here. If the arch is not listed here then a single core debuginfo package
|
|
||||||
# will be created for the architecture.
|
|
||||||
%define debuginfocommonarches %{biarcharches} alpha alphaev6
|
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Utility functions for pre/post scripts. Stick them at the beginning of
|
# Utility functions for pre/post scripts. Stick them at the beginning of
|
||||||
# any lua %pre, %post, %postun, etc. sections to have them expand into
|
# any lua %pre, %post, %postun, etc. sections to have them expand into
|
||||||
@ -1554,10 +1537,7 @@ Supplements: (glibc and (]]..suppl..[[))
|
|||||||
|
|
||||||
The glibc-langpack-]]..lang..[[ package includes the basic information required
|
The glibc-langpack-]]..lang..[[ package includes the basic information required
|
||||||
to support the ]]..lang..[[ language in your applications.
|
to support the ]]..lang..[[ language in your applications.
|
||||||
%ifnarch %{auxarches}
|
|
||||||
%files -f langpack-]]..lang..[[.filelist langpack-]]..lang..[[
|
%files -f langpack-]]..lang..[[.filelist langpack-]]..lang..[[
|
||||||
|
|
||||||
%endif
|
|
||||||
]]))
|
]]))
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -1592,9 +1572,7 @@ Requires: %{name}-common = %{version}-%{release}
|
|||||||
This is a Meta package that is used to install minimal language packs.
|
This is a Meta package that is used to install minimal language packs.
|
||||||
This package ensures you can use C, POSIX, or C.UTF-8 locales, but
|
This package ensures you can use C, POSIX, or C.UTF-8 locales, but
|
||||||
nothing else. It is designed for assembling a minimal system.
|
nothing else. It is designed for assembling a minimal system.
|
||||||
%ifnarch %{auxarches}
|
|
||||||
%files minimal-langpack
|
%files minimal-langpack
|
||||||
%endif
|
|
||||||
|
|
||||||
# Infrequently used iconv converter modules.
|
# Infrequently used iconv converter modules.
|
||||||
%package gconv-extra
|
%package gconv-extra
|
||||||
@ -1942,16 +1920,13 @@ done
|
|||||||
# Build and install:
|
# Build and install:
|
||||||
make -j1 install_root=%{glibc_sysroot} install -C build-%{target}
|
make -j1 install_root=%{glibc_sysroot} install -C build-%{target}
|
||||||
|
|
||||||
# If we are not building an auxiliary arch then install all of the supported
|
# Install all of the supported locales.
|
||||||
# locales.
|
|
||||||
%ifnarch %{auxarches}
|
|
||||||
pushd build-%{target}
|
pushd build-%{target}
|
||||||
# Do not use a parallel make here because the hardlink optimization in
|
# Do not use a parallel make here because the hardlink optimization in
|
||||||
# localedef is not fully reproducible when running concurrently.
|
# localedef is not fully reproducible when running concurrently.
|
||||||
make install_root=%{glibc_sysroot} \
|
make install_root=%{glibc_sysroot} \
|
||||||
install-locales -C ../localedata objdir=`pwd`
|
install-locales -C ../localedata objdir=`pwd`
|
||||||
popd
|
popd
|
||||||
%endif
|
|
||||||
|
|
||||||
# install_different:
|
# install_different:
|
||||||
# Install all core libraries into DESTDIR/SUBDIR. Either the file is
|
# Install all core libraries into DESTDIR/SUBDIR. Either the file is
|
||||||
@ -2066,7 +2041,6 @@ rm -f %{glibc_sysroot}%{_infodir}/libc.info*
|
|||||||
# Create locale sub-package file lists
|
# Create locale sub-package file lists
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
%ifnarch %{auxarches}
|
|
||||||
olddir=`pwd`
|
olddir=`pwd`
|
||||||
pushd %{glibc_sysroot}%{_prefix}/lib/locale
|
pushd %{glibc_sysroot}%{_prefix}/lib/locale
|
||||||
rm -f locale-archive
|
rm -f locale-archive
|
||||||
@ -2124,7 +2098,6 @@ do
|
|||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
mv %{glibc_sysroot}%{_prefix}/lib/locale/*.filelist .
|
mv %{glibc_sysroot}%{_prefix}/lib/locale/*.filelist .
|
||||||
%endif
|
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Install configuration files for services
|
# Install configuration files for services
|
||||||
@ -2132,25 +2105,21 @@ mv %{glibc_sysroot}%{_prefix}/lib/locale/*.filelist .
|
|||||||
|
|
||||||
install -p -m 644 nss/nsswitch.conf %{glibc_sysroot}/etc/nsswitch.conf
|
install -p -m 644 nss/nsswitch.conf %{glibc_sysroot}/etc/nsswitch.conf
|
||||||
|
|
||||||
%ifnarch %{auxarches}
|
|
||||||
# This is for ncsd - in glibc 2.2
|
# This is for ncsd - in glibc 2.2
|
||||||
install -m 644 nscd/nscd.conf %{glibc_sysroot}/etc
|
install -m 644 nscd/nscd.conf %{glibc_sysroot}/etc
|
||||||
mkdir -p %{glibc_sysroot}%{_tmpfilesdir}
|
mkdir -p %{glibc_sysroot}%{_tmpfilesdir}
|
||||||
install -m 644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}
|
install -m 644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}
|
||||||
mkdir -p %{glibc_sysroot}/lib/systemd/system
|
mkdir -p %{glibc_sysroot}/lib/systemd/system
|
||||||
install -m 644 nscd/nscd.service nscd/nscd.socket %{glibc_sysroot}/lib/systemd/system
|
install -m 644 nscd/nscd.service nscd/nscd.socket %{glibc_sysroot}/lib/systemd/system
|
||||||
%endif
|
|
||||||
|
|
||||||
# Include ld.so.conf
|
# Include ld.so.conf
|
||||||
echo 'include ld.so.conf.d/*.conf' > %{glibc_sysroot}/etc/ld.so.conf
|
echo 'include ld.so.conf.d/*.conf' > %{glibc_sysroot}/etc/ld.so.conf
|
||||||
truncate -s 0 %{glibc_sysroot}/etc/ld.so.cache
|
truncate -s 0 %{glibc_sysroot}/etc/ld.so.cache
|
||||||
chmod 644 %{glibc_sysroot}/etc/ld.so.conf
|
chmod 644 %{glibc_sysroot}/etc/ld.so.conf
|
||||||
mkdir -p %{glibc_sysroot}/etc/ld.so.conf.d
|
mkdir -p %{glibc_sysroot}/etc/ld.so.conf.d
|
||||||
%ifnarch %{auxarches}
|
|
||||||
mkdir -p %{glibc_sysroot}/etc/sysconfig
|
mkdir -p %{glibc_sysroot}/etc/sysconfig
|
||||||
truncate -s 0 %{glibc_sysroot}/etc/sysconfig/nscd
|
truncate -s 0 %{glibc_sysroot}/etc/sysconfig/nscd
|
||||||
truncate -s 0 %{glibc_sysroot}/etc/gai.conf
|
truncate -s 0 %{glibc_sysroot}/etc/gai.conf
|
||||||
%endif
|
|
||||||
|
|
||||||
# Include %{_libdir}/gconv/gconv-modules.cache
|
# Include %{_libdir}/gconv/gconv-modules.cache
|
||||||
truncate -s 0 %{glibc_sysroot}%{_libdir}/gconv/gconv-modules.cache
|
truncate -s 0 %{glibc_sysroot}%{_libdir}/gconv/gconv-modules.cache
|
||||||
@ -2235,11 +2204,9 @@ popd
|
|||||||
rm -f %{glibc_sysroot}%{_infodir}/dir
|
rm -f %{glibc_sysroot}%{_infodir}/dir
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifnarch %{auxarches}
|
|
||||||
mkdir -p %{glibc_sysroot}/var/{db,run}/nscd
|
mkdir -p %{glibc_sysroot}/var/{db,run}/nscd
|
||||||
touch %{glibc_sysroot}/var/{db,run}/nscd/{passwd,group,hosts,services}
|
touch %{glibc_sysroot}/var/{db,run}/nscd/{passwd,group,hosts,services}
|
||||||
touch %{glibc_sysroot}/var/run/nscd/{socket,nscd.pid}
|
touch %{glibc_sysroot}/var/run/nscd/{socket,nscd.pid}
|
||||||
%endif
|
|
||||||
|
|
||||||
# Move libpcprofile.so and libmemusage.so into the proper library directory.
|
# Move libpcprofile.so and libmemusage.so into the proper library directory.
|
||||||
# They can be moved without any real consequences because users would not use
|
# They can be moved without any real consequences because users would not use
|
||||||
@ -2290,9 +2257,7 @@ ar cr %{glibc_sysroot}%{_prefix}/%{_lib}/libpthread_nonshared.a
|
|||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Beyond this point in the install process we no longer modify the set of
|
# Beyond this point in the install process we no longer modify the set of
|
||||||
# installed files, with one exception, for auxarches we cleanup the file list
|
# installed files.
|
||||||
# at the end and remove files which we don't intend to ship. We need the file
|
|
||||||
# list to effect a proper cleanup, and so it happens last.
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
@ -2634,23 +2599,6 @@ echo "%{_prefix}/libexec/glibc-benchtests/validate_benchout.py*" >> benchtests.f
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
echo "%{_libdir}/libpthread_nonshared.a" >> compat-libpthread-nonshared.filelist
|
echo "%{_libdir}/libpthread_nonshared.a" >> compat-libpthread-nonshared.filelist
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
# Delete files that we do not intended to ship with the auxarch.
|
|
||||||
# This is the only place where we touch the installed files after generating
|
|
||||||
# the file lists.
|
|
||||||
##############################################################################
|
|
||||||
%ifarch %{auxarches}
|
|
||||||
echo Cutting down the list of unpackaged files
|
|
||||||
sed -e '/%%dir/d;/%%config/d;/%%verify/d;s/%%lang([^)]*) //;s#^/*##' \
|
|
||||||
common.filelist devel.filelist static.filelist headers.filelist \
|
|
||||||
utils.filelist nscd.filelist \
|
|
||||||
%ifarch %{debuginfocommonarches}
|
|
||||||
debuginfocommon.filelist \
|
|
||||||
%endif
|
|
||||||
| (cd %{glibc_sysroot}; xargs --no-run-if-empty rm -f 2> /dev/null || :)
|
|
||||||
%comment Matches: %ifarch %{auxarches}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Run the glibc testsuite
|
# Run the glibc testsuite
|
||||||
##############################################################################
|
##############################################################################
|
||||||
@ -2960,7 +2908,6 @@ fi
|
|||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
%license COPYING COPYING.LIB LICENSES
|
%license COPYING COPYING.LIB LICENSES
|
||||||
|
|
||||||
%ifnarch %{auxarches}
|
|
||||||
%files -f common.filelist common
|
%files -f common.filelist common
|
||||||
%dir %{_prefix}/lib/locale
|
%dir %{_prefix}/lib/locale
|
||||||
%dir %{_prefix}/lib/locale/C.utf8
|
%dir %{_prefix}/lib/locale/C.utf8
|
||||||
@ -3010,7 +2957,6 @@ fi
|
|||||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/nscd/hosts
|
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/nscd/hosts
|
||||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/nscd/services
|
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/nscd/services
|
||||||
%ghost %config(missingok,noreplace) /etc/sysconfig/nscd
|
%ghost %config(missingok,noreplace) /etc/sysconfig/nscd
|
||||||
%endif
|
|
||||||
|
|
||||||
%files -f nss_db.filelist -n nss_db
|
%files -f nss_db.filelist -n nss_db
|
||||||
/var/db/Makefile
|
/var/db/Makefile
|
||||||
|
Loading…
Reference in New Issue
Block a user