Skip to content

Commit 0ed18e3

Browse files
committed
All lib32 packages are now up to date
1 parent 7dbbcc5 commit 0ed18e3

79 files changed

Lines changed: 237 additions & 330 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

base/vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ cd /pkgs
4141

4242

4343

44-
sudo echo "ncurses glibc tcl python attr acl" > /pkgs/$PACKAGE/depends
44+
sudo echo "gpm ncurses glibc tcl python attr acl" > /pkgs/$PACKAGE/depends
4545
sudo echo "" > /pkgs/$PACKAGE/make-depends
4646
sudo tar -cvzpf $PACKAGE.tar.xz $PACKAGE
4747
sudo cp $PACKAGE.tar.xz /finished

ca-certificate-utils

Lines changed: 0 additions & 64 deletions
This file was deleted.

ca-certificates

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ cd $DIR
2525
sudo make DESTDIR=/pkgs/$PACKAGE install
2626
mkdir -p /pkgs/$PACKAGE/usr/bin
2727
install -vdm755 /pkgs/$PACKAGE/etc/ssl/local
28+
mkdir -p /pkgs/$PACKAGE/etc/ssl/certs/
29+
ln -svf /etc/pki/tls/certs/ca-bundle.crt /pkgs/$PACKAGE/etc/ssl/certs/ca-certificates.crt
2830
cd /pkgs
2931

3032

gnome/loupe

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ DESTDIR=/pkgs/$PACKAGE ninja install
3434
cd /pkgs
3535

3636

37-
sudo echo "glycin cairo glib2 graphene gtk4 adwaita libadwaita libgweather" > /pkgs/$PACKAGE/depends
37+
sudo echo "glycin cairo glib graphene gtk4 adwaita libadwaita libgweather" > /pkgs/$PACKAGE/depends
3838
sudo echo "rustc" > /pkgs/$PACKAGE/make-depends
3939
sudo echo "glib-compile-schemas /usr/share/glib-2.0/schemas" > /pkgs/$PACKAGE/postinst
4040
sudo rm -rf /pkgs/$PACKAGE/blfs

gobject-introspection

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mkdir build
2525
cd build
2626

2727

28-
meson --prefix=/usr --buildtype=release ..
28+
meson setup --prefix=/usr --buildtype=release ..
2929
ninja
3030

3131

lib32/lib32-at-spi2-core

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ cd build
3030

3131
meson --prefix=/usr \
3232
--buildtype=release \
33+
-Dintrospection=disabled \
3334
--libdir=/usr/lib32 \
3435
..
3536

lib32/lib32-cairo

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,19 @@ cd $DIR
2222
export CFLAGS+="-m32"
2323
export CXXFLAGS+="-m32"
2424
export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
25-
26-
27-
sed 's/PTR/void */' -i util/cairo-trace/lookup-symbol.c
28-
sed -e "/@prefix@/a exec_prefix=@exec_prefix@" \
29-
-i util/cairo-script/cairo-script-interpreter.pc.in
30-
./configure --prefix=/usr \
31-
--disable-static \
32-
--enable-tee \
33-
--enable-gl \
25+
mkdir build
26+
cd build
27+
meson setup --prefix=/usr \
28+
--buildtype=release \
3429
--libdir=/usr/lib32 \
30+
..
3531

3632

37-
make -j16
38-
33+
ninja
3934

4035
# Install
4136
mkdir -p /pkgs/$PACKAGE/usr/lib32
42-
make DESTDIR=$PWD/DESTDIR install
37+
DESTDIR=$PWD/DESTDIR ninja install
4338
cp -Rv DESTDIR/usr/lib32/* /pkgs/$PACKAGE/usr/lib32
4439
rm -rf DESTDIR
4540
cp -rpv /pkgs/$PACKAGE/* /

lib32/lib32-glib

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,34 @@ export CFLAGS="-O2 "
44
export CXXFLAGS="-O2 "
55

66
PKG_VER=2.80.4
7-
7+
MINOR=$(echo $PKG_VER | sed 's|.[^.]*$||g')
88
URL=https://download.gnome.org/sources/glib/$MINOR/glib-$PKG_VER.tar.xz
99
TAR=$(echo $URL | sed -r 's|(.*)/||')
1010
DIR=$(echo $TAR | sed 's|.tar.*||g')
1111
PACKAGE=lib32-$(echo $DIR | sed 's|-[^-]*$||g')
1212
set -e
13-
export CFLAGS+="-m32 -mstackrealign"
14-
export CXXFLAGS+="-m32 -mstackrealign"
13+
export CC="gcc -m32"
14+
export CXX="gcc -m32"
15+
export CFLAGS+="-mstackrealign"
16+
export CXXFLAGS+="-mstackrealign"
1517
export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
1618
# Get Package
17-
# Credit to archlinux for the test patches
1819
cd /blfs/builds
19-
20-
wget https://raw.githubusercontent.com/archlinux/svntogit-community/packages/lib32-glib2/trunk/multilib.diff
2120
wget $URL
2221
tar -xvf $TAR
2322
cd $DIR
2423

2524
# Build
26-
patch -Np1 < ../multilib.diff
2725
mkdir build
2826
cd build
2927

30-
meson --prefix=/usr \
28+
meson setup --prefix=/usr \
3129
--buildtype=release \
3230
-Dman=false \
3331
-Dglib_debug=disabled \
3432
-Dselinux=disabled \
33+
-Dintrospection=disabled \
3534
-Dsysprof=disabled \
36-
-Dman=false \
3735
-Dgtk_doc=false \
3836
--libdir=/usr/lib32 \
3937
..

lib32/lib32-gmp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/bin/bash
22

3-
export CFLAGS="-O2 "
4-
export CXXFLAGS="-O2 "
53

64
URL=https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz
75
TAR=$(echo $URL | sed -r 's|(.*)/||')
@@ -16,9 +14,9 @@ tar -xvf $TAR
1614
cd $DIR
1715

1816
# Build
19-
ABI="32" \
20-
CFLAGS="-m32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=i686" \
21-
CXXFLAGS="$CFLAGS" \
17+
export ABI="32"
18+
export CFLAGS="-m32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=i686"
19+
export CXXFLAGS="$CFLAGS"
2220
cp -v configfsf.guess config.guess
2321
cp -v configfsf.sub config.sub
2422

@@ -28,7 +26,6 @@ cp -v configfsf.sub config.sub
2826
--libdir=/usr/lib32 \
2927
--host=i686-pc-linux-gnu \
3028
--includedir=/usr/include/m32/gmp
31-
--docdir=/usr/share/doc/gmp-6.2.1
3229
sed -i 's/$(exec_prefix)\/include/$\(includedir\)/' Makefile
3330
make -j16
3431

lib32/lib32-gnutls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ cd /pkgs
5050

5151

5252

53-
sudo echo "gnutls lib32-glibc" > /pkgs/$PACKAGE/depends
53+
sudo echo "gnutls lib32-nettle lib32-p11-kit lib32-zstd lib32-brotli lib32-libtasn1 lib32-glibc" > /pkgs/$PACKAGE/depends
5454
sudo echo "" > /pkgs/$PACKAGE/make-depends
5555
sudo tar -cvzpf $PACKAGE.tar.xz $PACKAGE
5656
sudo cp $PACKAGE.tar.xz /finished

0 commit comments

Comments
 (0)