@@ -40,10 +40,14 @@ glibc_build() {
4040 mkdir -pv "$BLDDIR/build/glibc"
4141
4242 pushd "$BLDDIR/build/glibc"
43- local GLIBC_VER="2.38"
4443 local cflags_common="-O2 -g -ffile-prefix-map=$BLDDIR=."
4544 local ldflags_common="-Wl,-O1,--sort-common,--as-needed -Wl,-build-id=sha1"
4645
46+ local debver=$PKGVER
47+ if [ "$PKGREL" != 0 ]; then
48+ debver+="-$PKGREL"
49+ fi
50+
4751 cat > configparms <<EOF
4852install_root = \$(DESTDIR)
4953exec_prefix = \${prefix}
7478 --prefix="/usr" \
7579 --enable-obsolete-rpc \
7680 --enable-crypt \
81+ --with-pkgversion="LibLoL $debver" \
82+ --with-bugurl="https://github.com/AOSC-Dev/liblol/issues"
83+
7784
7885 env -i "MAKEFLAGS=$MAKEFLAGS" "TERM=$TERM" "PATH=$PATH" \
7986 make "$PWD/libc.so.6"
143150 -t "$PKGDIR$LOLPREFIX/support/lib/$OWTARGET/"
144151 done
145152
146- chmod -v +x "$PKGDIR$LOLPREFIX/support/lib/$OWTARGET/ld.so.1"
153+ chmod -v +x \
154+ "$PKGDIR$LOLPREFIX/support/lib/$OWTARGET/ld.so.1" \
155+ "$PKGDIR$LOLPREFIX/support/lib/$OWTARGET/libc.so.6"
147156
148157 mkdir -pv "$PKGDIR/usr/lib" #/lib64 is /usr/lib on AOSC
149158 ln -sfvr "$PKGDIR$LOLPREFIX/support/lib/$OWTARGET/ld.so.1" \
@@ -197,3 +206,17 @@ done
197206
198207abinfo "Installing package hooks ..."
199208install_hooks
209+
210+ abinfo "Adding glibc dependency ..."
211+ cur_glibc_version=$(dpkg-query -W --showformat='${Version}' glibc)
212+ if [ -z "$cur_glibc_version" ]; then
213+ abdie "Cannot find glibc version"
214+ fi
215+ abinfo "Current glibc version: $cur_glibc_version"
216+ cur_glibc_epoch=""
217+ if [[ "$cur_glibc_version" == *":"* ]]; then
218+ cur_glibc_epoch="$(echo "$cur_glibc_version" | cut -d: -f1)"
219+ abinfo "Current glibc epoch: $cur_glibc_epoch"
220+ cur_glibc_epoch+=":"
221+ fi
222+ PKGDEP+=" glibc>=${cur_glibc_epoch}2.36 glibc<<${cur_glibc_epoch}${__GLIBC_VER}.1~"
0 commit comments