Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

glibc: Update to latest and bump kernel baseline #4529

Merged
merged 1 commit into from
Dec 7, 2024
Merged

glibc: Update to latest and bump kernel baseline #4529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions packages/g/glibc/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name : glibc

Check notice on line 1 in packages/g/glibc/package.yml

View workflow job for this annotation

GitHub Actions / Checks 

This package is included in the ISO. Consider validating the functionality in a newly built ISO.
version : '2.40'
release : 127
release : 128
source :
# release/2.40/master
- git|git://sourceware.org/git/glibc.git : 5c06c6e0b5078ffb0aa0c09bac79f086145e0897
- git|git://sourceware.org/git/glibc.git : 091dd12831792cef16eee24fe240c73a25b47a1d
homepage : https://www.gnu.org/software/libc/
license : GPL-3.0-or-later
summary :
Expand Down Expand Up @@ -68,19 +68,17 @@
%patch -p1 -i $pkgfiles/0001-Compress-charmaps-with-zstd.patch

mkdir glibc-build
pushd glibc-build
cd glibc-build

extra_conf_args=""
if [[ ! -z "${EMUL32BUILD}" ]]; then
mkdir b32
pushd b32
mkdir b32 && cd b32
export CC="gcc -m32"
export CXX="g++ -m32"
export BUILDHOST="i686-pc-linux-gnu"
export CFLAGS="-O3 -g2 -mtune=generic -march=i686 -mstackrealign"
else
mkdir b64
pushd b64
mkdir b64 && cd b64
export CC="gcc"
export CXX="g++"
export BUILDHOST="x86_64-solus-linux"
Expand Down Expand Up @@ -112,7 +110,7 @@
--disable-build-nscd \
--disable-nscd \
--enable-bind-now \
--enable-kernel=5.10 \
--enable-kernel=5.15 \
--enable-stack-protector=strong \
--enable-systemtap \
--prefix=/usr \
Expand All @@ -122,21 +120,19 @@
--libdir=%libdir% \
--with-pkgversion='Solus' \
$extra_conf_args
popd
popd
build : |
pushd glibc-build
cd glibc-build
export LANGUAGE="C"
export LC_ALL="C"
export LANG="C"

if [[ "${EMUL32BUILD}" ]]; then
pushd b32
cd b32
export CC="gcc -m32"
export CXX="g++ -m32"
export CFLAGS="-O3 -g2 mtune=generic -march=i686 -Wl,-z,max-page-size=0x1000"
else
pushd b64
cd b64
export CC="gcc"
export CXX="g++"
if [[ ! -z "${AVX2BUILD}" ]]; then
Expand All @@ -152,17 +148,14 @@
if [[ -z "${AVX2BUILD}" ]]; then
%make bench-build
fi

popd
popd
install : |
pushd glibc-build
cd glibc-build

if [[ ! -z "${EMUL32BUILD}" ]]; then
pushd b32
cd b32
%make_install install_root=$installdir
else
pushd b64
cd b64
%make_install install_root=$installdir

if [[ -z "${AVX2BUILD}" ]]; then
Expand Down
12 changes: 6 additions & 6 deletions packages/g/glibc/pspec_x86_64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7015,7 +7015,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
<Dependency release="127">glibc</Dependency>
<Dependency release="128">glibc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/lib32/ld-linux.so.2</Path>
Expand Down Expand Up @@ -7326,8 +7326,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
<Dependency release="127">glibc-devel</Dependency>
<Dependency release="127">glibc-32bit</Dependency>
<Dependency release="128">glibc-32bit</Dependency>
<Dependency release="128">glibc-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/libBrokenLocale.a</Path>
Expand Down Expand Up @@ -7783,7 +7783,7 @@
</Description>
<PartOf>system.devel</PartOf>
<RuntimeDependencies>
<Dependency release="127">glibc</Dependency>
<Dependency release="128">glibc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/a.out.h</Path>
Expand Down Expand Up @@ -8284,8 +8284,8 @@
</Files>
</Package>
<History>
<Update release="127">
<Date>2024-10-18</Date>
<Update release="128">
<Date>2024-12-06</Date>
<Version>2.40</Version>
<Comment>Packaging update</Comment>
<Name>Reilly Brogan</Name>
Expand Down
Loading