Skip to content

glibc enhancements #3440

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

Merged
kaniini merged 2 commits into from
Jul 7, 2023
Merged

glibc enhancements #3440

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
172e163
glibc enhancements
kaniini Jul 6, 2023
f855047
further glibc enhancements
kaniini Jul 7, 2023
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
23 changes: 19 additions & 4 deletions glibc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: glibc
version: 2.37
epoch: 7
epoch: 8
description: "the GNU C library"
copyright:
- license: GPL-3.0-or-later
Expand Down Expand Up @@ -69,15 +69,22 @@ pipeline:
- name: 'Configure glibc'
runs: |
cd build
echo "user-defined-trusted-dirs=/usr/local/lib:/usr/local/lib64:/usr/lib:/usr/lib64:/lib:/lib64" >> configparms.base

echo "build-programs=no" > configparms
cat configparms.base >> configparms

# We remove fortify when building the libraries
export CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
export CPPFLAGS=${CPPFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}

../configure \
--prefix=/usr \
--libdir=/usr/lib \
--datadir=/usr/share \
--includedir=/usr/include \
--host=${{host.triplet.gnu}} \
--build=$(../config.guess) \
--build=${{host.triplet.gnu}} \
--disable-werror \
--enable-kernel=4.9

Expand All @@ -87,8 +94,13 @@ pipeline:
make -C build -j$(nproc)

- runs: |
export CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
export CPPFLAGS=${CPPFLAGS/-Wp,-D_FORTIFY_SOURCE=3/}
# Build the programs with fortify
echo "build-programs=yes" > build/configparms
echo "CFLAGS += -Wp,-D_FORTIFY_SOURCE=3" >> build/configparms
cat build/configparms.base >> build/configparms
make -C build -j$(nproc)

- runs: |
make -C build -j$(nproc) install DESTDIR="${{targets.destdir}}"

- name: "Set up ldconfig"
Expand Down Expand Up @@ -324,6 +336,9 @@ subpackages:
runs: |
mkdir -p "${{targets.subpkgdir}}"/lib64
mv "${{targets.destdir}}"/lib64/ld-linux-x86-64.so.2 "${{targets.subpkgdir}}"/lib64/
- runs: |
mkdir -p "${{targets.subpkgdir}}"/etc
mv "${{targets.destdir}}"/etc/ld.so.* "${{targets.subpkgdir}}"/etc/
dependencies:
runtime:
- wolfi-baselayout
Expand Down