summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--repo/core/bc.xibuild2
-rw-r--r--repo/core/binutils.xibuild7
-rw-r--r--repo/core/bzip2.xibuild14
-rw-r--r--repo/core/dejagnu.xibuild3
-rw-r--r--repo/core/expect.xibuild2
-rw-r--r--repo/core/flex.xibuild2
-rw-r--r--repo/core/gcc.xibuild11
-rw-r--r--repo/core/glibc.xibuild57
-rw-r--r--repo/core/gmp.xibuild3
-rw-r--r--repo/core/libcap.xibuild2
-rw-r--r--repo/core/linux-headers.xibuild3
-rw-r--r--repo/core/m4.xibuild1
-rw-r--r--repo/core/mpc.xibuild2
-rw-r--r--repo/core/readline.xibuild2
-rw-r--r--repo/core/shadow.xibuild7
-rw-r--r--repo/core/tcl.xibuild24
-rw-r--r--repo/core/zstd.xibuild7
17 files changed, 71 insertions, 78 deletions
diff --git a/repo/core/bc.xibuild b/repo/core/bc.xibuild
index 0d6da1c..160b6f5 100644
--- a/repo/core/bc.xibuild
+++ b/repo/core/bc.xibuild
@@ -2,7 +2,7 @@
DEPS=(readline)
-SOURCE=https://github.com/gavinhoward/bc
+SOURCE=https://github.com/gavinhoward/bc/releases/download/5.2.1/bc-5.2.1.tar.xz
DESC="An arbitrary precision numeric processing language"
build () {
diff --git a/repo/core/binutils.xibuild b/repo/core/binutils.xibuild
index 704db29..96d2088 100644
--- a/repo/core/binutils.xibuild
+++ b/repo/core/binutils.xibuild
@@ -6,6 +6,9 @@ SOURCE=https://ftp.gnu.org/gnu/binutils/binutils-2.37.tar.xz
DESC="tools for handling object files"
build () {
+ curl https://www.linuxfromscratch.org/patches/lfs/development/binutils-2.37-upstream_fix-1.patch > binutils-2.37-upstream_fix-1.patch
+ patch -Np1 -i binutils-2.37-upstream_fix-1.patch
+
# An error in the building system causes the shipped man pages to be empty. Workaround the issue and remove the shipped man pages, so the man pages will be regenerated correctly:
sed -i '63d' etc/texi2pod.pl
@@ -23,11 +26,11 @@ build () {
--with-system-zlib
make tooldir=/usr
- make -k check
- make -j1 DESTDIR=$PKG_DEST install
+ make -k check || true
}
package() {
+ make -j1 DESTDIR=$PKG_DEST -j1 install
rm -fv $PKG_DEST/usr/lib/lib{bfd,ctf,ctf-nobfd,opcodes}.a
}
diff --git a/repo/core/bzip2.xibuild b/repo/core/bzip2.xibuild
index f0b8f43..72a364c 100644
--- a/repo/core/bzip2.xibuild
+++ b/repo/core/bzip2.xibuild
@@ -8,10 +8,16 @@ DESC="a selection of programs for compressing and decompressing bzip2 files"
build () {
+ curl https://www.linuxfromscratch.org/patches/lfs/development/bzip2-1.0.8-install_docs-1.patch > bzip2-1.0.8-install_docs-1.patch
+
+ patch -Np1 -i bzip2-1.0.8-install_docs-1.patch
+
# ensure symbolic links are relative
sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile
+ sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile
+
make -f Makefile-libbz2_so
make clean
@@ -26,16 +32,10 @@ package () {
cp -v bzip2-shared $PKG_DEST/usr/bin/bzip2
for i in $PKG_DEST/usr/bin/{bzcat,bunzip2}; do
- cp -afv bzip2 $i
- done
-
- # remove a useless static library
- cp -v bzip2-shared $PKG_DEST/usr/bin/bzip2
- for i in $PKG_DEST/usr/bin/{bzcat,bunzip2}; do
ln -sfv bzip2 $i
done
+ # remove a useless static library
rm -fv $PKG_DEST/usr/lib/libbz2.a
-
}
diff --git a/repo/core/dejagnu.xibuild b/repo/core/dejagnu.xibuild
index 2e6acdc..21a35a4 100644
--- a/repo/core/dejagnu.xibuild
+++ b/repo/core/dejagnu.xibuild
@@ -2,10 +2,9 @@
DEPS=(sh expect)
-SOURCE=git://git.sv.gnu.org/dejagnu.git
+SOURCE=https://ftp.gnu.org/gnu/dejagnu/dejagnu-1.6.3.tar.gz
DESC="a framework for running test suites on GNU tools"
-
build () {
mkdir -v build
cd build
diff --git a/repo/core/expect.xibuild b/repo/core/expect.xibuild
index d2fed3c..cb5b6f6 100644
--- a/repo/core/expect.xibuild
+++ b/repo/core/expect.xibuild
@@ -2,7 +2,7 @@
DEPS=(tcl)
-SOURCE=https://github.com/aeruder/expect
+SOURCE=https://sourceforge.net/projects/expect/files/Expect/5.45.4/expect5.45.4.tar.gz/download
DESC="tools for automating interactive applications"
build () {
diff --git a/repo/core/flex.xibuild b/repo/core/flex.xibuild
index 3016a2f..69f103c 100644
--- a/repo/core/flex.xibuild
+++ b/repo/core/flex.xibuild
@@ -13,7 +13,7 @@ build () {
}
package () {
- ln -v $PKG_DEST/usr/bin/flex $PKG_DEST/usr/bin/lex
+ ln -v flex $PKG_DEST/usr/bin/lex
}
diff --git a/repo/core/gcc.xibuild b/repo/core/gcc.xibuild
index fc00767..37132d1 100644
--- a/repo/core/gcc.xibuild
+++ b/repo/core/gcc.xibuild
@@ -38,22 +38,19 @@ build () {
chown -Rv tester .
su tester -c "PATH=$PATH make $MAKEFLAGS -k check"
- ../contrib/test_summary
+ ../contrib/test_summary | grep -A7 Summ
-
- make DESTDIR=$PKG_DEST install
-
-
- # no build libstdc++
}
package () {
+ make DESTDIR=$PKG_DEST install
+
rm -rf $PKG_DEST/usr/lib/gcc/$(gcc -dumpmachine)/11.2.0/include-fixed/bits/
chown -v -R root:root \
$PKG_DEST/usr/lib/gcc/*linux-gnu/11.2.0/include{,-fixed}
- ln -sv /usr/bin/cpp $PKG_DEST/usr/lib/cpp
+ ln -sv cpp $PKG_DEST/usr/lib/cpp
ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/11.2.0/liblto_plugin.so \
$PKG_DEST/usr/lib/bfd-plugins/
diff --git a/repo/core/glibc.xibuild b/repo/core/glibc.xibuild
index 434cc02..290cb45 100644
--- a/repo/core/glibc.xibuild
+++ b/repo/core/glibc.xibuild
@@ -9,6 +9,10 @@ build () {
# patches as recommended by lfs
sed -e '/NOTIFY_REMOVED)/s/)/ \&\& data.attr != NULL)/' -i sysdeps/unix/sysv/linux/mq_notify.c
+ curl https://www.linuxfromscratch.org/patches/lfs/development/glibc-2.34-fhs-1.patch > glibc-2.34-fhs-1.patch
+
+ patch -Np1 -i glibc-2.34-fhs-1.patch
+
mkdir -v build
cd build
@@ -24,13 +28,13 @@ build () {
make
- # these tests are vital, do not skip
- # make check
+ # some check failures are 'expected'
+ make check || true
}
package () {
- touch /etc/ld.so.conf
+ touch $PKG_DEST/etc/ld.so.conf
sed '/test-installation/s@$(PERL)@echo not running@' -i ../Makefile
make DESTDIR=$PKG_DEST install
@@ -44,43 +48,6 @@ package () {
# create locales for the system
# note, this should be moved to a better place
- mkdir -pv $PKG_DEST/usr/lib/locale
- localedef -i POSIX -f UTF-8 C.UTF-8 2> /dev/null || true
- localedef -i cs_CZ -f UTF-8 cs_CZ.UTF-8
- localedef -i de_DE -f ISO-8859-1 de_DE
- localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
- localedef -i de_DE -f UTF-8 de_DE.UTF-8
- localedef -i el_GR -f ISO-8859-7 el_GR
- localedef -i en_GB -f ISO-8859-1 en_GB
- localedef -i en_GB -f UTF-8 en_GB.UTF-8
- localedef -i en_HK -f ISO-8859-1 en_HK
- localedef -i en_PH -f ISO-8859-1 en_PH
- localedef -i en_US -f ISO-8859-1 en_US
- localedef -i en_US -f UTF-8 en_US.UTF-8
- localedef -i es_ES -f ISO-8859-15 es_ES@euro
- localedef -i es_MX -f ISO-8859-1 es_MX
- localedef -i fa_IR -f UTF-8 fa_IR
- localedef -i fr_FR -f ISO-8859-1 fr_FR
- localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
- localedef -i fr_FR -f UTF-8 fr_FR.UTF-8
- localedef -i is_IS -f ISO-8859-1 is_IS
- localedef -i is_IS -f UTF-8 is_IS.UTF-8
- localedef -i it_IT -f ISO-8859-1 it_IT
- localedef -i it_IT -f ISO-8859-15 it_IT@euro
- localedef -i it_IT -f UTF-8 it_IT.UTF-8
- localedef -i ja_JP -f EUC-JP ja_JP
- localedef -i ja_JP -f SHIFT_JIS ja_JP.SIJS 2> /dev/null || true
- localedef -i ja_JP -f UTF-8 ja_JP.UTF-8
- localedef -i nl_NL@euro -f ISO-8859-15 nl_NL@euro
- localedef -i ru_RU -f KOI8-R ru_RU.KOI8-R
- localedef -i ru_RU -f UTF-8 ru_RU.UTF-8
- localedef -i se_NO -f UTF-8 se_NO.UTF-8
- localedef -i ta_IN -f UTF-8 ta_IN.UTF-8
- localedef -i tr_TR -f UTF-8 tr_TR.UTF-8
- localedef -i zh_CN -f GB18030 zh_CN.GB18030
- localedef -i zh_HK -f BIG5-HKSCS zh_HK.BIG5-HKSCS
- localedef -i zh_TW -f UTF-8 zh_TW.UTF-8
-
make DESTDIR=$PKG_DEST localedata/install-locales
cat > $PKG_DEST/etc/nsswitch.conf << "EOF"
@@ -100,6 +67,11 @@ rpc: files
# End /etc/nsswitch.conf
EOF
+
+ curl https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/glibc/trunk/locale-gen > locale-gen
+
+ install -m755 locale-gen "$PKG_DEST/usr/bin"
+
#curl https://data.iana.org/time-zones/releases/tzdata2021e.tar.gz > tzdata2021e.tar.gz
#tar -xf tzdata2021e.tar.gz
#
@@ -123,12 +95,7 @@ EOF
# Begin /etc/ld.so.conf
/usr/local/lib
/opt/lib
-EOF
-
- cat >> $PKG_DEST/etc/ld.so.conf << "EOF"
-# Add an include directory
include /etc/ld.so.conf.d/*.conf
-
EOF
mkdir -pv $PKG_DEST/etc/ld.so.conf.d
}
diff --git a/repo/core/gmp.xibuild b/repo/core/gmp.xibuild
index f73ba8a..6c426bc 100644
--- a/repo/core/gmp.xibuild
+++ b/repo/core/gmp.xibuild
@@ -17,6 +17,9 @@ build () {
make check 2>&1 | tee gmp-check-log
awk '/# PASS:/{total+=$3} ; END{print total}' gmp-check-log
+}
+
+package() {
make DESTDIR=$PKG_DEST install
make DESTDIR=$PKG_DEST install-html
}
diff --git a/repo/core/libcap.xibuild b/repo/core/libcap.xibuild
index 9e3ec76..01bc414 100644
--- a/repo/core/libcap.xibuild
+++ b/repo/core/libcap.xibuild
@@ -2,7 +2,7 @@
DEPS=(glibc pam)
-SOURCE=https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-2.59.tar.gz
+SOURCE=https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-2.62.tar.gz
DESC="POSIX 1003.1e capabilities"
diff --git a/repo/core/linux-headers.xibuild b/repo/core/linux-headers.xibuild
index 5913d6d..536fdd3 100644
--- a/repo/core/linux-headers.xibuild
+++ b/repo/core/linux-headers.xibuild
@@ -14,5 +14,6 @@ build () {
}
package () {
- cp -rv usr/include $PKG_DEST/usr
+ mkdir -pv $PKG_DEST/usr/include
+ cp -rv usr/include/* $PKG_DEST/usr/include/
}
diff --git a/repo/core/m4.xibuild b/repo/core/m4.xibuild
index 4bf522d..409c9a3 100644
--- a/repo/core/m4.xibuild
+++ b/repo/core/m4.xibuild
@@ -9,5 +9,6 @@ DESC="The gnu m4 macro processor"
build () {
./configure --prefix=/usr
make
+ make check
make DESTDIR=$PKG_DEST install
}
diff --git a/repo/core/mpc.xibuild b/repo/core/mpc.xibuild
index d242a83..5fd5898 100644
--- a/repo/core/mpc.xibuild
+++ b/repo/core/mpc.xibuild
@@ -12,7 +12,9 @@ build () {
make html
make check
+}
+package () {
make DESTDIR=$PKG_DEST install
make DESTDIR=$PKG_DEST install-html
}
diff --git a/repo/core/readline.xibuild b/repo/core/readline.xibuild
index b2797f8..8b47463 100644
--- a/repo/core/readline.xibuild
+++ b/repo/core/readline.xibuild
@@ -2,7 +2,7 @@
DEPS=(glibc ncurses)
-SOURCE=https://git.savannah.gnu.org/git/readline.git
+SOURCE=https://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz
DESC="a set of libraries that offer command line editing and history capabilities"
diff --git a/repo/core/shadow.xibuild b/repo/core/shadow.xibuild
index 55d847f..fa09bbc 100644
--- a/repo/core/shadow.xibuild
+++ b/repo/core/shadow.xibuild
@@ -12,9 +12,10 @@ build () {
find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \;
find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \;
- #sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD SHA512:' \
- #-e 's:/var/spool/mail:/var/mail:' \
- #-e '/PATH=/{s@/sbin:@@;s@/bin:@@}' \
+ sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD SHA512:' \
+ -e 's:/var/spool/mail:/var/mail:' \
+ -e '/PATH=/{s@/sbin:@@;s@/bin:@@}' \
+ -i etc/login.defs
sed -e "224s/rounds/min_rounds/" -i libmisc/salt.c
diff --git a/repo/core/tcl.xibuild b/repo/core/tcl.xibuild
index f7f1c57..f9bebaa 100644
--- a/repo/core/tcl.xibuild
+++ b/repo/core/tcl.xibuild
@@ -11,16 +11,36 @@ build () {
cd unix
./configure --prefix=/usr --mandir=/usr/share/man $([ "$(uname -m)" = x86_64 ] && echo --enable-64bit)
+ make
+
+ sed -e "s|$SRCDIR/unix|/usr/lib|" \
+ -e "s|$SRCDIR|/usr/include|" \
+ -i tclConfig.sh
+
+ sed -e "s|$SRCDIR/unix/pkgs/tdbc1.1.2|/usr/lib/tdbc1.1.2|" \
+ -e "s|$SRCDIR/pkgs/tdbc1.1.2/generic|/usr/include|" \
+ -e "s|$SRCDIR/pkgs/tdbc1.1.2/library|/usr/lib/tcl8.6|" \
+ -e "s|$SRCDIR/pkgs/tdbc1.1.2|/usr/include|" \
+ -i pkgs/tdbc1.1.2/tdbcConfig.sh
+
+ sed -e "s|$SRCDIR/unix/pkgs/itcl4.2.1|/usr/lib/itcl4.2.1|" \
+ -e "s|$SRCDIR/pkgs/itcl4.2.1/generic|/usr/include|" \
+ -e "s|$SRCDIR/pkgs/itcl4.2.1|/usr/include|" \
+ -i pkgs/itcl4.2.1/itclConfig.sh
+
+ unset SRCDIR
+
make test
+}
+
+package () {
make DESTDIR=$PKG_DEST install
chmod -v u+w $PKG_DEST/usr/lib/libtcl8.6.so
make DESTDIR=$PKG_DEST install-private-headers
-}
-package () {
ln $PKG_DEST/usr/bin/tclsh* $PKG_DEST/usr/bin/tclsh
cp -f tclsh9 $PKG_DEST/usr/bin/tclsh
mv $PKG_DEST/usr/share/man/man3/{Thread,Tcl_Thread}.3
diff --git a/repo/core/zstd.xibuild b/repo/core/zstd.xibuild
index dfcdba5..cb3a246 100644
--- a/repo/core/zstd.xibuild
+++ b/repo/core/zstd.xibuild
@@ -2,14 +2,13 @@
DEPS=(glibc gcc-libs zlib xz lz4)
-SOURCE=https://github.com/facebook/zstd
+SOURCE=https://github.com/facebook/zstd/releases/download/v1.5.1/zstd-1.5.1.tar.gz
DESC="the Zstandard real-time compression algorithm"
build () {
make
- make -C contrib/pzstd
- make prefix=/usr check
- make DESTDIR=$PKG_DEST install
+ make check
+ make prefix=$PKG_DEST/usr install
}
package () {
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-26 16:53:43 +0000