diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-26 03:27:23 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-01-26 03:27:23 +0000 |
| commit | 59e9bd2f6ad0a5b0d1923729e5c37331bb086d99 (patch) | |
| tree | 4d575e34794fffed151cb4363e06ba38aac66045 /user/xterm/APKBUILD | |
| parent | f6c2d0df8a9b1a16c3419a5dc8e0db2af97b9842 (diff) | |
| download | packages-59e9bd2f6ad0a5b0d1923729e5c37331bb086d99.tar.gz packages-59e9bd2f6ad0a5b0d1923729e5c37331bb086d99.tar.bz2 packages-59e9bd2f6ad0a5b0d1923729e5c37331bb086d99.tar.xz packages-59e9bd2f6ad0a5b0d1923729e5c37331bb086d99.zip | |
user/xterm: what a day
The /dev/ptmx code wasn't POSIX enough for musl.
And utmps wasn't being used properly.
Fix both.
Diffstat (limited to 'user/xterm/APKBUILD')
| -rw-r--r-- | user/xterm/APKBUILD | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 35177bf1a..ab8a22b7a 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xterm pkgver=341 -pkgrel=0 +pkgrel=1 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" arch="all" @@ -11,11 +11,13 @@ license="X11" makedepends="libx11-dev libsm-dev libice-dev libxt-dev utmps-dev libxaw-dev libxext-dev freetype-dev ncurses-dev pcre-dev" subpackages="$pkgname-doc" -source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz" +source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz + posix-ptmx.patch + " build() { cd "$builddir" - LIBS="-lutmps -lskarnet -ltinfow" ./configure \ + LIBS="-ltinfow" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -23,7 +25,18 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --with-pcre - make + # This is NOT A TYPO! + # + # XTerm does not use ld(1) as a linker. It uses a shell script + # called 'plink.sh' which tries to Be Smart, but is actually + # Quite Dumb. + # + # It determines that the utmp symbols are in musl, and decides + # -lutmps really isn't necessary. However! There is some solace. + # + # -k is like -l, but is forced, even if it isn't "really needed". + # So we use -k for utmps. + make EXTRA_LOADFLAGS="-kutmps -lskarnet" } package() { @@ -31,4 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="336b8e8d3bfbc373ce1a0547571f705401142b54a8206050d2cdf961dfd99e01c9e78e10df443eb3278fb02116536cf55bc1501835978b9b390399614ab77494 xterm-341.tgz" +sha512sums="336b8e8d3bfbc373ce1a0547571f705401142b54a8206050d2cdf961dfd99e01c9e78e10df443eb3278fb02116536cf55bc1501835978b9b390399614ab77494 xterm-341.tgz +e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch" |