@@ -40,10 +40,14 @@ glibc_build() {
40
40
mkdir -pv "$BLDDIR/build/glibc"
41
41
42
42
pushd "$BLDDIR/build/glibc"
43
- local GLIBC_VER="2.38"
44
43
local cflags_common="-O2 -g -ffile-prefix-map=$BLDDIR=."
45
44
local ldflags_common="-Wl,-O1,--sort-common,--as-needed -Wl,-build-id=sha1"
46
45
46
+ local debver=$PKGVER
47
+ if [ "$PKGREL" != 0 ]; then
48
+ debver+="-$PKGREL"
49
+ fi
50
+
47
51
cat > configparms <<EOF
48
52
install_root = \$(DESTDIR)
49
53
exec_prefix = \${prefix}
74
78
--prefix="/usr" \
75
79
--enable-obsolete-rpc \
76
80
--enable-crypt \
81
+ --with-pkgversion="LibLoL $debver" \
82
+ --with-bugurl="https://github.com/AOSC-Dev/liblol/issues"
83
+
77
84
78
85
env -i "MAKEFLAGS=$MAKEFLAGS" "TERM=$TERM" "PATH=$PATH" \
79
86
make "$PWD/libc.so.6"
143
150
-t "$PKGDIR$LOLPREFIX/support/lib/$OWTARGET/"
144
151
done
145
152
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"
147
156
148
157
mkdir -pv "$PKGDIR/usr/lib" #/lib64 is /usr/lib on AOSC
149
158
ln -sfvr "$PKGDIR$LOLPREFIX/support/lib/$OWTARGET/ld.so.1" \
@@ -197,3 +206,17 @@ done
197
206
198
207
abinfo "Installing package hooks ..."
199
208
install_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