Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/pkgs/gsl/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=gsl-VERSION.tar.gz
sha1=549e1105cd1198537be9707257161531e109bd94
sha256=dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b
upstream_url=https://ftp.gnu.org/gnu/gsl/gsl-VERSION.tar.gz
sha1=5190579205ca2e8763ef83ee375f1da9b880461a
sha256=6a99eeed15632c6354895b1dd542ed5a855c0f15d9ad1326c6fe2b2c9e423190
upstream_url=https://ftpmirror.gnu.org/gnu/gsl/gsl-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/gsl/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.1
2.8
23 changes: 0 additions & 23 deletions build/pkgs/gsl/patches/configure-big_sur.patch

This file was deleted.

4 changes: 2 additions & 2 deletions build/pkgs/mpfr/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=mpfr-VERSION.tar.bz2
sha1=f9dbe49b092e4c8e0a039e6d46c059696cc2f51c
sha256=b9df93635b20e4089c29623b19420c4ac848a1b29df1cfd59f26cab0d2666aa0
sha1=7e21e5bcfa67db572e5f2f38029fc731a19aecce
sha256=9ad62c7dc910303cd384ff8f1f4767a655124980bb6d8650fe62c815a231bb7b
upstream_url=https://www.mpfr.org/mpfr-current/mpfr-VERSION.tar.bz2
2 changes: 1 addition & 1 deletion build/pkgs/mpfr/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.1
4.2.2
6 changes: 3 additions & 3 deletions build/pkgs/ncurses/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=ncurses-VERSION.tar.gz
sha1=38fb1462d13b04bb900adf07918725c4b7ed0682
sha256=97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059
upstream_url=https://ftp.gnu.org/pub/gnu/ncurses/ncurses-VERSION.tar.gz
sha1=cde3024ac3f9ef21eaed6f001476ea8fffcaa381
sha256=136d91bc269a9a5785e5f9e980bc76ab57428f604ce3e5a5a90cebc767971cc6
upstream_url=https://ftpmirror.gnu.org/gnu/ncurses/ncurses-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/ncurses/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.3
6.5
39 changes: 6 additions & 33 deletions build/pkgs/ncurses/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,9 @@ fi

cd src

# Ncurses cannot build narrow and wide (unicode, --enable-widec)
# versions in one go. Need to compile twice. Note that Python's curses
# module will want the wide version, and readline the narrow version.

###################################################
mkdir narrow
cd narrow
ln -s ../configure .

echo "Configuring ncurses (narrow)..."
sdh_configure --with-termlib \
--with-shared \
--without-normal \
--without-ada \
--disable-rpath-hack \
--enable-overwrite \
--with-pkg-config-libdir="$SAGE_LOCAL/lib/pkgconfig" \
--enable-pc-files \
"$DEBUG_CONFIGURE_FLAG"

echo "Building ncurses (narrow)..."
sdh_make

echo "Installing ncurses (narrow)..."
sdh_make_install

cd .. # leave narrow

###################################################
mkdir wide
cd wide
ln -s ../configure .
# Build only the wide (unicode, --enable-widec) version of ncurses.
# Python's curses module wants the wide version.
# Readline should also work with wide version via compatibility symlinks.

echo "Configuring ncurses (wide)..."
sdh_configure --with-termlib \
Expand All @@ -50,6 +21,8 @@ sdh_configure --with-termlib \
--enable-overwrite \
--with-pkg-config-libdir="$SAGE_LOCAL/lib/pkgconfig" \
--enable-pc-files \
--without-cxx \
--without-cxx-binding \
"$DEBUG_CONFIGURE_FLAG"

echo "Building ncurses (wide)..."
Expand All @@ -58,4 +31,4 @@ sdh_make
echo "Installing ncurses (wide)..."
sdh_make_install

cd .. # leave wide
# Note: Symbolic links for compatibility are created in spkg-postinst
51 changes: 51 additions & 0 deletions build/pkgs/ncurses/spkg-postinst
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#!/usr/bin/env bash
#
# Create compatibility symbolic links for narrow ncurses libraries
# These link libncurses.so -> libncursesw.so if libncurses.so doesn't exist
#
# This is needed because some packages (like readline) need narrow version,
# but we only build wide version. Other packages (like Python's curses module)
# work better with wide version.

cd "$SAGE_LOCAL/lib" || exit 1

echo "Creating compatibility symbolic links..."

# Create symlinks for libraries (only if narrow version doesn't exist)
if [ ! -e libncurses.so ] && [ -e libncursesw.so ]; then
ln -sf libncursesw.so libncurses.so
echo "Created libncurses.so -> libncursesw.so"
fi

if [ ! -e libtinfo.so ] && [ -e libtinfow.so ]; then
ln -sf libtinfow.so libtinfo.so
echo "Created libtinfo.so -> libtinfow.so"
fi

# Create versioned symlinks
for ver in 6 5; do
if [ ! -e libncurses.so.$ver ] && [ -e libncursesw.so.$ver ]; then
ln -sf libncursesw.so.$ver libncurses.so.$ver
echo "Created libncurses.so.$ver -> libncursesw.so.$ver"
fi

if [ ! -e libtinfo.so.$ver ] && [ -e libtinfow.so.$ver ]; then
ln -sf libtinfow.so.$ver libtinfo.so.$ver
echo "Created libtinfo.so.$ver -> libtinfow.so.$ver"
fi
done

# Create symlinks for pkg-config files
cd "$SAGE_LOCAL/lib/pkgconfig" || exit 1

if [ ! -e ncurses.pc ] && [ -e ncursesw.pc ]; then
ln -sf ncursesw.pc ncurses.pc
echo "Created ncurses.pc -> ncursesw.pc"
fi

if [ ! -e tinfo.pc ] && [ -e tinfow.pc ]; then
ln -sf tinfow.pc tinfo.pc
echo "Created tinfo.pc -> tinfow.pc"
fi

echo "Symbolic links created successfully."
6 changes: 3 additions & 3 deletions build/pkgs/openssl/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=openssl-VERSION.tar.gz
sha1=b12311372a0277ca0eb218a68a7fd9f5ce66d162
sha256=197149c18d9e9f292c43f0400acaba12e5f52cacfe050f3d199277ea738ec2e7
upstream_url=https://www.openssl.org/source/openssl-VERSION.tar.gz
sha1=b75daac8e10f189abe28a076ba5905d363e4801f
sha256=967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99
upstream_url=https://www.openssl.org/source/openssl-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/openssl/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.5.4
4 changes: 2 additions & 2 deletions build/pkgs/python3/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=Python-VERSION.tar.xz
sha1=d9b83c17a717e1cbd3ab6bd14cfe3e508e6d87b2
sha256=fa8a2e12c5e620b09f53e65bcd87550d2e5a1e2e04bf8ba991dcc55113876397
sha1=53a9cd799370adad6fe471a2ee45874bbf6ccfc1
sha256=ed5ef34cda36cfa2f3a340f07cac7e7814f91c7f3c411f6d3562323a866c5c66
upstream_url=https://www.python.org/ftp/python/VERSION/Python-VERSION.tar.xz
2 changes: 1 addition & 1 deletion build/pkgs/python3/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.12.5
3.13.9
3 changes: 2 additions & 1 deletion build/pkgs/python3/spkg-build.in
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ fi
echo "Testing importing of various modules..."
import_errors=false
# Issue #31160: We no longer check for readline here.
test_modules="ctypes math hashlib crypt socket zlib sqlite3 ssl"
# https://github.com/passagemath/passagemath/issues/813: _posixsubprocess is missing on ubuntu-{xenial,bionic}
test_modules="ctypes math hashlib socket zlib sqlite3 ssl _posixsubprocess"
if [ "$UNAME" = "Darwin" ]; then
test_modules="$test_modules _scproxy"
fi
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/readline/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=readline-VERSION.tar.gz
sha1=8a05ad0d0ad67e18c383f1b2cf6a23bcbd46f87a
sha256=7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6
upstream_url=https://ftp.gnu.org/gnu/readline/readline-VERSION.tar.gz
sha1=2c05ae9350b695f69d70b47f17f092611de2081f
sha256=fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc
upstream_url=https://ftpmirror.gnu.org/gnu/readline/readline-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/readline/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.1.2
8.3
18 changes: 0 additions & 18 deletions build/pkgs/readline/patches/0001-macports.patch

This file was deleted.

28 changes: 13 additions & 15 deletions build/pkgs/readline/patches/0002-ltinfo.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
--- src/support/shobj-conf 2014-02-24 03:06:29.000000000 +0100
+++ new/support/shobj-conf 2014-06-15 14:04:15.561786158 +0200
@@ -39,10 +39,10 @@
SHOBJ_LD=
SHOBJ_LDFLAGS=
SHOBJ_XLDFLAGS=
-SHOBJ_LIBS=
+SHOBJ_LIBS='$(TERMCAP_LIB)'
--- a/support/shobj-conf
+++ b/support/shobj-conf
@@ -127,8 +127,10 @@
SHOBJ_CFLAGS=-fPIC
SHOBJ_LD='${CC}'
SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+ SHOBJ_LIBS='-Wl,--no-as-needed -lncursesw -Wl,--as-needed'

SHLIB_XLDFLAGS=
-SHLIB_LIBS=
+SHLIB_LIBS='$(TERMCAP_LIB)'
SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+ SHLIB_LIBS='-Wl,--no-as-needed -lncursesw -Wl,--as-needed'
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
;;

SHLIB_DOT='.'
SHLIB_LIBPREF='lib'
@@ -209,7 +209,7 @@
@@ -171,7 +173,7 @@
;;
esac

- SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
+ SHLIB_LIBS='$(TERMCAP_LIB)'
+ SHLIB_LIBS='-lncursesw' # see if -lcurses works on MacOS X 10.1
;;

openbsd*|netbsd*|mirbsd*)
6 changes: 3 additions & 3 deletions build/pkgs/sqlite/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=sqlite-autoconf-${VERSION_MAJOR}${VERSION_MINOR}0${VERSION_MICRO}00.tar.gz
sha1=a4bcf9e951bfb9745214241ba08476299fc2dc1e
sha256=bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3
upstream_url=https://www.sqlite.org/2021/sqlite-autoconf-${VERSION_MAJOR}${VERSION_MINOR}0${VERSION_MICRO}00.tar.gz
sha1=145048005c777796dd8494aa1cfed304e8c34283
sha256=a3db587a1b92ee5ddac2f66b3edb41b26f9c867275782d46c3a088977d6a5b18
upstream_url=https://www.sqlite.org/2025/sqlite-autoconf-${VERSION_MAJOR}${VERSION_MINOR}0${VERSION_MICRO}00.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/sqlite/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.36.0
3.50.4
4 changes: 2 additions & 2 deletions build/pkgs/xz/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=xz-VERSION.tar.gz
sha1=fa2ae4db119f639a01b02f99f1ba671ece2828eb
sha256=f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10
sha1=ed4d5589c4cfe84e1697bd02a9954b76af336931
sha256=507825b599356c10dca1cd720c9d0d0c9d5400b9de300af00e4d1ea150795543
upstream_url=https://tukaani.org/xz/xz-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/xz/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2.5
5.8.1
Loading