Skip to content

Commit 082dfb2

Browse files
liblol: add package info and dependency info
1 parent 5c7ea72 commit 082dfb2

File tree

3 files changed

+31
-18
lines changed

3 files changed

+31
-18
lines changed

autobuild/build

+25-2
Original file line numberDiff line numberDiff line change
@@ -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
4852
install_root = \$(DESTDIR)
4953
exec_prefix = \${prefix}
@@ -74,6 +78,9 @@ EOF
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"
@@ -143,7 +150,9 @@ EOF
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

198207
abinfo "Installing package hooks ..."
199208
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~"

spec

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
# AUTOGENERATED FILE from spec.main using genspec
2-
VER=0.1.4~pre2
2+
VER=0.1.4~pre3
33
_mirror="http://pkg.loongnix.cn/loongnix"
4-
5-
### For pkgs from outside loongnix repo
6-
# make-4.3:
7-
# File generation loop in stdio-common dir when installing target glibc 2.28 using latest make
8-
# ref: https://github.com/crosstool-ng/crosstool-ng/issues/1932#issuecomment-1528139734
9-
#
4+
__GLIBC_VER=2.38
105

116
SRCS="\
12-
file::rename=glibc.tar.xz::https://ftp.gnu.org/gnu/glibc/glibc-2.38.tar.xz \
7+
file::rename=glibc.tar.xz::https://ftp.gnu.org/gnu/glibc/glibc-${__GLIBC_VER}.tar.xz \
138
file::rename=patchelf.tar.gz::https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0.tar.gz \
149
"
1510
CHKSUMS="\

spec.main

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
VER=0.1.4~pre2
1+
VER=0.1.4~pre3
22
_mirror="http://pkg.loongnix.cn/loongnix"
3-
4-
### For pkgs from outside loongnix repo
5-
# make-4.3:
6-
# File generation loop in stdio-common dir when installing target glibc 2.28 using latest make
7-
# ref: https://github.com/crosstool-ng/crosstool-ng/issues/1932#issuecomment-1528139734
8-
#
3+
__GLIBC_VER=2.38
94

105
SRCS="\
11-
file::rename=glibc.tar.xz::https://ftp.gnu.org/gnu/glibc/glibc-2.38.tar.xz \
6+
file::rename=glibc.tar.xz::https://ftp.gnu.org/gnu/glibc/glibc-${__GLIBC_VER}.tar.xz \
127
file::rename=patchelf.tar.gz::https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0.tar.gz \
138
"
149
CHKSUMS="\

0 commit comments

Comments
 (0)