Skip to content

Update glibc #2049

Merged
merged 18 commits into from
Apr 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions autofs.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION autofs-5.1.7-0
# BEE_VERSION autofs-5.1.7-1

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)
Expand Down Expand Up @@ -54,7 +54,7 @@ build_in_sourcedir
#}

mee_configure() {
bee_configure --enable-ignore-busy
bee_configure --enable-ignore-busy --with-libtirpc
}

#mee_build() {
Expand Down
2 changes: 1 addition & 1 deletion glibc-locales.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/env beesh

# BEE_VERSION glibc-locales-2.27-0
# BEE_VERSION glibc-locales-2.33-0

mee_install() {
mkdir -pv ${D}${LIBDIR}/locale
Expand Down
42 changes: 8 additions & 34 deletions glibc.be0
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/env beesh

# BEE_VERSION glibc-2.27-0
# BEE_VERSION glibc-2.33-0

SRCURL[0]="https://ftp.gnu.org/gnu/glibc/glibc-${PKGVERSION}.tar.bz2"

PATCHURL=(
/src/mariux/patches/glibc-2.25-0001-ldconfig-don-t-generate-links-by-default-v2.patch
/src/mariux/patches/glibc-2.25-0002-ldconfig-don-t-remove-stale-symlinks-by-default-v2.patch
/src/mariux/patches/glibc-2.33-0001-ldconfig-don-t-generate-links-by-default-v2.patch
/src/mariux/patches/glibc-2.33-0002-ldconfig-don-t-remove-stale-symlinks-by-default-v2.patch
)

SYSCONFDIR=/etc
Expand All @@ -31,27 +31,16 @@ mee_patch_post() {
# use /bin/bash instead of /bin/sh ..
echo "sed-ing elf/ldd.bash.in"
sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in

# fix some binary issues when gzipping manpages..
echo "sed-ing manual/Makefile"
sed -i 's|gzip -9|gzip -n -9|' manual/Makefile

# those seds prevent installing glibc in /lib64 instead of /lib..
# echo "sed-ing sysdeps/unix/sysv/linux/configure"
# sed -i 's,x86_64 |,,' sysdeps/unix/sysv/linux/configure

# echo "sed-ing sysdeps/unix/sysv/linux/configure.in"
# sed -i 's,x86_64 |,,' sysdeps/unix/sysv/linux/configure.in

}

mee_configure() {
bee_configure \
--disable-profile \
--enable-add-ons \
--enable-obsolete-rpc \
--enable-obsolete-nsl \
--enable-kernel=4.4.34
--enable-kernel=4.14.87 \
--enable-stack-protector=strong
}

mee_build_pre() {
Expand All @@ -65,10 +54,7 @@ mee_build_post() {
}

mee_check() {
make -k check 2>&1 | tee glibc-check-log
grep Error glibc-check-log
echo grep Error glibc-check-log
bash
make -k check
}

mee_install_pre() {
Expand All @@ -86,26 +72,14 @@ mee_install_post() {
# remove temporary ld.so.* because this is not part of the package
rm -v ${D}${SYSCONFDIR}/ld.so.{conf,cache}

#mkdir -vp ${D}/usr/include/rpc{,svc}
#cp -v ${S}/sunrpc/rpc/*.h ${D}/usr/include/rpc
#cp -v ${S}/sunrpc/rpcsvc/*.h ${D}/usr/include/rpcsvc
#cp -v ${S}/nis/rpcsvc/*.h ${D}/usr/include/rpcsvc

# this has been moved to tzdata package since glibc dow not provide
# timezones anymore with glibc >= 2.16
# install Europe/Berlin as default Timezone
#rm -v ${D}${SYSCONFDIR}/localtime
#ln -v ${D}/${PREFIX}/share/zoneinfo/Europe/Berlin ${D}${SYSCONFDIR}/localtime


if [ "${SLIBDIR}" != "${LIBDIR}" ] ; then
cd ${D}${SLIBDIR}
for i in * ; do
start_cmd ln -v $i ${D}${LIBDIR}/$i
done
cd -
fi

if [ "${ROOTSBINDIR}" != "${SBINDIR}" ] ; then
cd ${D}${ROOTSBINDIR}
for i in * ; do
Expand Down
37 changes: 37 additions & 0 deletions libnsl-1.3.0-0.bee
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/usr/bin/env beesh

# BEE_VERSION libnsl-1.3.0-0

# more info: https://github.com/thkukuk/libnsl

SRCURL[0]="https://github.com/thkukuk/libnsl/releases/download/v${PKGVERSION}/libnsl-${PKGVERSION}.tar.xz"

# PATCHURL+=()

# build_in_sourcedir

# sourcesubdir_append src

#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

#mee_configure() {
# bee_configure
#}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}

#mee_install_post() {
# exit
#}
37 changes: 37 additions & 0 deletions libnss_nis.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/usr/bin/env beesh

# BEE_VERSION libnss_nis-3.1-0

# more info: https://github.com/thkukuk/libnss_nis

SRCURL[0]="https://github.com/thkukuk/libnss_nis/releases/download/v${PKGVERSION}/libnss_nis-${PKGVERSION}.tar.xz"

# PATCHURL+=()

# build_in_sourcedir

# sourcesubdir_append src

#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

#mee_configure() {
# bee_configure
#}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}

#mee_install_post() {
# exit
#}
2 changes: 1 addition & 1 deletion libtirpc.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION libtirpc-1.1.4-0
# BEE_VERSION libtirpc-1.3.1-0

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)
Expand Down
2 changes: 1 addition & 1 deletion linux-headers.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION linux-headers-4.14.76-0
# BEE_VERSION linux-headers-4.14.87-0

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)
Expand Down
37 changes: 37 additions & 0 deletions rpcsvc-proto.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/usr/bin/env beesh

# BEE_VERSION rpcsvc-proto-1.4.2-0

# more info: https://foo.bar.com

SRCURL[0]="https://github.com/thkukuk/rpcsvc-proto/releases/download/v${PKGVERSION}/rpcsvc-proto-${PKGVERSION}.tar.xz"

# PATCHURL+=()

# build_in_sourcedir

# sourcesubdir_append src

#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

#mee_configure() {
# bee_configure
#}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}

#mee_install_post() {
# exit
#}