Update static-compat-openssl and a few other static-compat packages
This commit is contained in:
parent
fd242ddaa7
commit
30a51d9903
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
_pkgname=dbus
|
||||
pkgname=static-compat-$_pkgname
|
||||
pkgver=1.14.0
|
||||
pkgver=1.14.4
|
||||
pkgrel=1
|
||||
pkgdesc="Freedesktop.org message bus system"
|
||||
url="https://wiki.freedesktop.org/www/Software/dbus/"
|
||||
|
|
@ -71,4 +71,4 @@ package() {
|
|||
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
|
||||
}
|
||||
|
||||
# vim:set sw=2 et:
|
||||
# vim:set sw=2 sts=-1 et:
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
pkgname=<%= $package_name %>
|
||||
_qtver=6.4.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=(x86_64)
|
||||
url='https://www.qt.io'
|
||||
license=(GPL3 LGPL3 FDL custom)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
package=$1
|
||||
variant=$2
|
||||
official_packages=${OFFICIAL_PACKAGES:-/run/media/devel/src/svntogit-packages}
|
||||
|
||||
current_variant_file=$package/$variant/PKGBUILD
|
||||
source "$current_variant_file"
|
||||
variantver=$pkgver
|
||||
echo "variant version: $variantver"
|
||||
|
||||
regular_file=$official_packages/$package/trunk/PKGBUILD
|
||||
source "$regular_file"
|
||||
regularver=$pkgver
|
||||
echo "variant version: $regularver"
|
||||
|
||||
if [[ $variantver == "$regularver" ]]; then
|
||||
echo "nothing to do, versions are the same"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
commits=($(git -C "$official_packages" log -n 8 --pretty=format:%H HEAD~1 "$package/trunk/PKGBUILD"))
|
||||
tempfile=/tmp/regular-pkgbuild
|
||||
basecomit=
|
||||
for commit in "${commits[@]}"; do
|
||||
echo "checking diff as of commit $commit"
|
||||
git -C "$official_packages" show "$commit:$package/trunk/PKGBUILD" > "$tempfile"
|
||||
source "$tempfile"
|
||||
if [[ $variantver != "$pkgver" ]]; then
|
||||
continue
|
||||
fi
|
||||
echo "commit $commit is last commit of regular package with version $pkgver"
|
||||
basecomit=$commit
|
||||
break
|
||||
done
|
||||
|
||||
if [[ ! $basecomit ]]; then
|
||||
echo "unable to find commit of regular package with variant version"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd "$package/$variant"
|
||||
git -C "$official_packages" diff "$basecomit..master" -- "$package/trunk/PKGBUILD" > regular.diff
|
||||
patch -p3 -i regular.diff
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
_pkgname=fontconfig
|
||||
pkgname=static-compat-$_pkgname
|
||||
pkgver=2.14.0
|
||||
pkgver=2.14.1
|
||||
pkgrel=1
|
||||
epoch=2
|
||||
pkgdesc="Library for configuring and customizing font access"
|
||||
|
|
@ -13,9 +13,8 @@ license=(custom)
|
|||
depends=(static-compat-expat static-compat-freetype2)
|
||||
makedepends=(static-compat-meson git autoconf-archive gperf python-lxml python-six docbook-utils)
|
||||
checkdepends=(unzip)
|
||||
_commit=fcb042028126d79ea5a5fa015b2b034b98656e73 # master
|
||||
options=(!emptydirs !docs staticlibs)
|
||||
_commit=911b19f19f1334d51c452756f9ce222c1101097b # tags/2.14.0^0
|
||||
_commit=c45e09df1ef235d653d56aef05012f6a3cc57979 # tags/2.14.1^0
|
||||
source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit")
|
||||
b2sums=('SKIP')
|
||||
|
||||
|
|
@ -29,8 +28,16 @@ pkgver() {
|
|||
}
|
||||
|
||||
build() {
|
||||
export CFLAGS+=' -lstdc++' # for __gxx_personality_v0 required by harfbuzz.a
|
||||
source static-compat-environment
|
||||
|
||||
# Link against libstdc++ for __gxx_personality_v0 required by harfbuzz.a
|
||||
export CFLAGS+=" $static_compat_prefix/lib/libstdc++.a"
|
||||
|
||||
# Invoke pkg-config with --static
|
||||
export PATH=$PWD:$PATH
|
||||
printf '#!/usr/bin/bash\nexec /usr/bin/pkg-config --static "$@"\n' > pkg-config
|
||||
chmod +x pkg-config
|
||||
|
||||
static-compat-meson $_pkgname build -Ddoc=disabled
|
||||
meson compile -C build
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,468 +0,0 @@
|
|||
# Maintainer: Giancarlo Razzolini <grazzolini@archlinux.org>
|
||||
# Maintainer: Frederik Schwan <freswa at archlinux dot org>
|
||||
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
|
||||
# Contributor: Allan McRae <allan@archlinux.org>
|
||||
# Contributor: Daniel Kozak <kozzi11@gmail.com>
|
||||
|
||||
# toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc
|
||||
# NOTE: libtool requires rebuilt with each new gcc version
|
||||
|
||||
pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go gcc-d libgccjit)
|
||||
pkgver=11.2.0
|
||||
_majorver=${pkgver%%.*}
|
||||
_islver=0.24
|
||||
pkgrel=4
|
||||
pkgdesc='The GNU Compiler Collection'
|
||||
arch=(x86_64)
|
||||
license=(GPL LGPL FDL custom)
|
||||
url='https://gcc.gnu.org'
|
||||
makedepends=(
|
||||
binutils
|
||||
doxygen
|
||||
gcc-ada
|
||||
git
|
||||
lib32-glibc
|
||||
lib32-gcc-libs
|
||||
libisl
|
||||
libmpc
|
||||
libxcrypt
|
||||
python
|
||||
zstd
|
||||
)
|
||||
checkdepends=(
|
||||
dejagnu
|
||||
expect
|
||||
inetutils
|
||||
python-pytest
|
||||
tcl
|
||||
)
|
||||
options=(!emptydirs !lto debug)
|
||||
_libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
|
||||
# _commit=6beb39ee6c465c21d0cc547fd66b445100cdcc35
|
||||
# source=(git://gcc.gnu.org/git/gcc.git#commit=$_commit
|
||||
source=(https://sourceware.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz{,.sig}
|
||||
c89 c99
|
||||
gdc_phobos_path.patch
|
||||
gcc-ada-repro.patch
|
||||
)
|
||||
validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.org
|
||||
86CFFCA918CF3AF47147588051E8B148A9999C34 # evangelos@foutrelis.com
|
||||
13975A70E63C361C73AE69EF6EEB81F8981C74C7 # richard.guenther@gmail.com
|
||||
D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62) # Jakub Jelinek <jakub@redhat.com>
|
||||
sha256sums=('d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b'
|
||||
'SKIP'
|
||||
'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
|
||||
'2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
|
||||
'c86372c207d174c0918d4aedf1cb79f7fc093649eb1ad8d9450dccc46849d308'
|
||||
'1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f')
|
||||
|
||||
prepare() {
|
||||
[[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
|
||||
cd gcc
|
||||
|
||||
# Do not run fixincludes
|
||||
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
|
||||
|
||||
# Arch Linux installs x86_64 libraries /lib
|
||||
sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
|
||||
|
||||
# D hacks
|
||||
patch -Np1 -i "$srcdir/gdc_phobos_path.patch"
|
||||
|
||||
# Reproducible gcc-ada
|
||||
patch -Np0 < "$srcdir/gcc-ada-repro.patch"
|
||||
|
||||
mkdir -p "$srcdir/gcc-build"
|
||||
mkdir -p "$srcdir/libgccjit-build"
|
||||
}
|
||||
|
||||
build() {
|
||||
local _confflags="--prefix=/usr \
|
||||
--libdir=/usr/lib \
|
||||
--libexecdir=/usr/lib \
|
||||
--mandir=/usr/share/man \
|
||||
--infodir=/usr/share/info \
|
||||
--with-bugurl=https://bugs.archlinux.org/ \
|
||||
--with-linker-hash-style=gnu \
|
||||
--with-system-zlib \
|
||||
--enable-__cxa_atexit \
|
||||
--enable-cet=auto \
|
||||
--enable-checking=release \
|
||||
--enable-clocale=gnu \
|
||||
--enable-default-pie \
|
||||
--enable-default-ssp \
|
||||
--enable-gnu-indirect-function \
|
||||
--enable-gnu-unique-object \
|
||||
--enable-linker-build-id \
|
||||
--enable-lto \
|
||||
--enable-multilib \
|
||||
--enable-plugin \
|
||||
--enable-shared \
|
||||
--enable-threads=posix \
|
||||
--disable-libssp \
|
||||
--disable-libstdcxx-pch \
|
||||
--disable-werror \
|
||||
--with-build-config=bootstrap-lto \
|
||||
--enable-link-serialization=1 \
|
||||
gdc_include_dir=/usr/include/dlang/gdc"
|
||||
|
||||
cd gcc-build
|
||||
|
||||
# Credits @allanmcrae
|
||||
# https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/gcc/PKGBUILD
|
||||
# TODO: properly deal with the build issues resulting from this
|
||||
CFLAGS=${CFLAGS/-Werror=format-security/}
|
||||
CXXFLAGS=${CXXFLAGS/-Werror=format-security/}
|
||||
|
||||
"$srcdir/gcc/configure" \
|
||||
--enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++,d \
|
||||
--enable-bootstrap \
|
||||
$_confflags
|
||||
|
||||
# see https://bugs.archlinux.org/task/71777 for rationale re *FLAGS handling
|
||||
make -O STAGE1_CFLAGS="-O2" \
|
||||
BOOT_CFLAGS="$CFLAGS" \
|
||||
BOOT_LDFLAGS="$LDFLAGS" \
|
||||
LDFLAGS_FOR_TARGET="$LDFLAGS" \
|
||||
profiledbootstrap
|
||||
|
||||
# make documentation
|
||||
make -O -C $CHOST/libstdc++-v3/doc doc-man-doxygen
|
||||
|
||||
# Build libgccjit separately, to avoid building all compilers with --enable-host-shared
|
||||
# which brings a performance penalty
|
||||
cd "${srcdir}"/libgccjit-build
|
||||
|
||||
"$srcdir/gcc/configure" \
|
||||
--enable-languages=jit \
|
||||
--disable-bootstrap \
|
||||
--enable-host-shared \
|
||||
$_confflags
|
||||
|
||||
# see https://bugs.archlinux.org/task/71777 for rationale re *FLAGS handling
|
||||
make -O STAGE1_CFLAGS="-O2" \
|
||||
BOOT_CFLAGS="$CFLAGS" \
|
||||
BOOT_LDFLAGS="$LDFLAGS" \
|
||||
LDFLAGS_FOR_TARGET="$LDFLAGS" \
|
||||
all-gcc
|
||||
|
||||
cp -a gcc/libgccjit.so* ../gcc-build/gcc/
|
||||
}
|
||||
|
||||
check() {
|
||||
cd gcc-build
|
||||
|
||||
# disable libphobos test to avoid segfaults and other unfunny ways to waste my time
|
||||
sed -i '/maybe-check-target-libphobos \\/d' Makefile
|
||||
|
||||
# do not abort on error as some are "expected"
|
||||
make -O -k check || true
|
||||
"$srcdir/gcc/contrib/test_summary"
|
||||
}
|
||||
|
||||
package_gcc-libs() {
|
||||
pkgdesc='Runtime libraries shipped by GCC'
|
||||
depends=('glibc>=2.27')
|
||||
options=(!emptydirs !strip)
|
||||
provides=($pkgname-multilib libgo.so libgfortran.so libgphobos.so
|
||||
libubsan.so libasan.so libtsan.so liblsan.so)
|
||||
replaces=($pkgname-multilib libgphobos)
|
||||
|
||||
cd gcc-build
|
||||
make -C $CHOST/libgcc DESTDIR="$pkgdir" install-shared
|
||||
rm -f "$pkgdir/$_libdir/libgcc_eh.a"
|
||||
|
||||
for lib in libatomic \
|
||||
libgfortran \
|
||||
libgo \
|
||||
libgomp \
|
||||
libitm \
|
||||
libquadmath \
|
||||
libsanitizer/{a,l,ub,t}san \
|
||||
libstdc++-v3/src \
|
||||
libvtv; do
|
||||
make -C $CHOST/$lib DESTDIR="$pkgdir" install-toolexeclibLTLIBRARIES
|
||||
done
|
||||
|
||||
make -C $CHOST/libobjc DESTDIR="$pkgdir" install-libs
|
||||
make -C $CHOST/libstdc++-v3/po DESTDIR="$pkgdir" install
|
||||
|
||||
make -C $CHOST/libphobos DESTDIR="$pkgdir" install
|
||||
rm -rf "$pkgdir"/$_libdir/include/d/
|
||||
rm -f "$pkgdir"/usr/lib/libgphobos.spec
|
||||
|
||||
for lib in libgomp \
|
||||
libitm \
|
||||
libquadmath; do
|
||||
make -C $CHOST/$lib DESTDIR="$pkgdir" install-info
|
||||
done
|
||||
|
||||
# remove files provided by lib32-gcc-libs
|
||||
rm -rf "$pkgdir"/usr/lib32/
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \
|
||||
"$pkgdir/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION"
|
||||
}
|
||||
|
||||
package_gcc() {
|
||||
pkgdesc="The GNU Compiler Collection - C and C++ frontends"
|
||||
depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc zstd libisl.so)
|
||||
groups=('base-devel')
|
||||
optdepends=('lib32-gcc-libs: for generating code for 32-bit ABI')
|
||||
provides=($pkgname-multilib)
|
||||
replaces=($pkgname-multilib)
|
||||
options=(!emptydirs staticlibs debug)
|
||||
|
||||
cd gcc-build
|
||||
|
||||
make -C gcc DESTDIR="$pkgdir" install-driver install-cpp install-gcc-ar \
|
||||
c++.install-common install-headers install-plugin install-lto-wrapper
|
||||
|
||||
install -m755 -t "$pkgdir/usr/bin/" gcc/gcov{,-tool}
|
||||
install -m755 -t "$pkgdir/${_libdir}/" gcc/{cc1,cc1plus,collect2,lto1}
|
||||
|
||||
make -C $CHOST/libgcc DESTDIR="$pkgdir" install
|
||||
make -C $CHOST/32/libgcc DESTDIR="$pkgdir" install
|
||||
rm -f "$pkgdir"/usr/lib{,32}/libgcc_s.so*
|
||||
|
||||
make -C $CHOST/libstdc++-v3/src DESTDIR="$pkgdir" install
|
||||
make -C $CHOST/libstdc++-v3/include DESTDIR="$pkgdir" install
|
||||
make -C $CHOST/libstdc++-v3/libsupc++ DESTDIR="$pkgdir" install
|
||||
make -C $CHOST/libstdc++-v3/python DESTDIR="$pkgdir" install
|
||||
make -C $CHOST/32/libstdc++-v3/src DESTDIR="$pkgdir" install
|
||||
make -C $CHOST/32/libstdc++-v3/include DESTDIR="$pkgdir" install
|
||||
make -C $CHOST/32/libstdc++-v3/libsupc++ DESTDIR="$pkgdir" install
|
||||
|
||||
make DESTDIR="$pkgdir" install-libcc1
|
||||
install -d "$pkgdir/usr/share/gdb/auto-load/usr/lib"
|
||||
mv "$pkgdir"/usr/lib/libstdc++.so.6.*-gdb.py \
|
||||
"$pkgdir/usr/share/gdb/auto-load/usr/lib/"
|
||||
rm "$pkgdir"/usr/lib{,32}/libstdc++.so*
|
||||
|
||||
make DESTDIR="$pkgdir" install-fixincludes
|
||||
make -C gcc DESTDIR="$pkgdir" install-mkheaders
|
||||
|
||||
make -C lto-plugin DESTDIR="$pkgdir" install
|
||||
install -dm755 "$pkgdir"/usr/lib/bfd-plugins/
|
||||
ln -s /${_libdir}/liblto_plugin.so \
|
||||
"$pkgdir/usr/lib/bfd-plugins/"
|
||||
|
||||
make -C $CHOST/libgomp DESTDIR="$pkgdir" install-nodist_{libsubinclude,toolexeclib}HEADERS
|
||||
make -C $CHOST/libitm DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
|
||||
make -C $CHOST/libquadmath DESTDIR="$pkgdir" install-nodist_libsubincludeHEADERS
|
||||
make -C $CHOST/libsanitizer DESTDIR="$pkgdir" install-nodist_{saninclude,toolexeclib}HEADERS
|
||||
make -C $CHOST/libsanitizer/asan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
|
||||
make -C $CHOST/libsanitizer/tsan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
|
||||
make -C $CHOST/libsanitizer/lsan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
|
||||
make -C $CHOST/32/libgomp DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
|
||||
make -C $CHOST/32/libitm DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
|
||||
make -C $CHOST/32/libsanitizer DESTDIR="$pkgdir" install-nodist_{saninclude,toolexeclib}HEADERS
|
||||
make -C $CHOST/32/libsanitizer/asan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
|
||||
|
||||
make -C gcc DESTDIR="$pkgdir" install-man install-info
|
||||
rm "$pkgdir"/usr/share/man/man1/{gccgo,gfortran,gdc}.1
|
||||
rm "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn,gdc}.info
|
||||
|
||||
make -C libcpp DESTDIR="$pkgdir" install
|
||||
make -C gcc DESTDIR="$pkgdir" install-po
|
||||
|
||||
# many packages expect this symlink
|
||||
ln -s gcc "$pkgdir"/usr/bin/cc
|
||||
|
||||
# POSIX conformance launcher scripts for c89 and c99
|
||||
install -Dm755 "$srcdir/c89" "$pkgdir/usr/bin/c89"
|
||||
install -Dm755 "$srcdir/c99" "$pkgdir/usr/bin/c99"
|
||||
|
||||
# install the libstdc++ man pages
|
||||
make -C $CHOST/libstdc++-v3/doc DESTDIR="$pkgdir" doc-install-man
|
||||
|
||||
# remove files provided by lib32-gcc-libs
|
||||
rm -f "$pkgdir"/usr/lib32/lib{stdc++,gcc_s}.so
|
||||
|
||||
# byte-compile python libraries
|
||||
python -m compileall "$pkgdir/usr/share/gcc-${pkgver%%+*}/"
|
||||
python -O -m compileall "$pkgdir/usr/share/gcc-${pkgver%%+*}/"
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -d "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
package_gcc-fortran() {
|
||||
pkgdesc='Fortran front-end for GCC'
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
provides=($pkgname-multilib)
|
||||
replaces=($pkgname-multilib)
|
||||
|
||||
cd gcc-build
|
||||
make -C $CHOST/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
|
||||
install-{toolexeclibDATA,nodist_fincludeHEADERS,gfor_cHEADERS}
|
||||
make -C $CHOST/32/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
|
||||
install-{toolexeclibDATA,nodist_fincludeHEADERS,gfor_cHEADERS}
|
||||
make -C $CHOST/libgomp DESTDIR="$pkgdir" install-nodist_fincludeHEADERS
|
||||
make -C gcc DESTDIR="$pkgdir" fortran.install-{common,man,info}
|
||||
install -Dm755 gcc/f951 "$pkgdir/${_libdir}/f951"
|
||||
|
||||
ln -s gfortran "$pkgdir/usr/bin/f95"
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -d "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
package_gcc-objc() {
|
||||
pkgdesc='Objective-C front-end for GCC'
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
provides=($pkgname-multilib)
|
||||
replaces=($pkgname-multilib)
|
||||
|
||||
cd gcc-build
|
||||
make DESTDIR="$pkgdir" -C $CHOST/libobjc install-headers
|
||||
install -dm755 "$pkgdir/${_libdir}"
|
||||
install -m755 gcc/cc1obj{,plus} "$pkgdir/${_libdir}/"
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -d "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
package_gcc-ada() {
|
||||
pkgdesc='Ada front-end for GCC (GNAT)'
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
provides=($pkgname-multilib)
|
||||
replaces=($pkgname-multilib)
|
||||
options=(!emptydirs staticlibs debug)
|
||||
|
||||
cd gcc-build/gcc
|
||||
make DESTDIR="$pkgdir" ada.install-{common,info}
|
||||
install -m755 gnat1 "$pkgdir/${_libdir}"
|
||||
|
||||
cd "$srcdir"/gcc-build/$CHOST/libada
|
||||
make DESTDIR="${pkgdir}" INSTALL="install" \
|
||||
INSTALL_DATA="install -m644" install-libada
|
||||
|
||||
cd "$srcdir"/gcc-build/$CHOST/32/libada
|
||||
make DESTDIR="${pkgdir}" INSTALL="install" \
|
||||
INSTALL_DATA="install -m644" install-libada
|
||||
|
||||
ln -s gcc "$pkgdir/usr/bin/gnatgcc"
|
||||
|
||||
# insist on dynamic linking, but keep static libraries because gnatmake complains
|
||||
mv "$pkgdir"/${_libdir}/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir/usr/lib"
|
||||
ln -s libgnarl-${_majorver}.so "$pkgdir/usr/lib/libgnarl.so"
|
||||
ln -s libgnat-${_majorver}.so "$pkgdir/usr/lib/libgnat.so"
|
||||
rm -f "$pkgdir"/${_libdir}/adalib/libgna{rl,t}.so
|
||||
|
||||
install -d "$pkgdir/usr/lib32/"
|
||||
mv "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir/usr/lib32"
|
||||
ln -s libgnarl-${_majorver}.so "$pkgdir/usr/lib32/libgnarl.so"
|
||||
ln -s libgnat-${_majorver}.so "$pkgdir/usr/lib32/libgnat.so"
|
||||
rm -f "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}.so
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -d "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
package_gcc-go() {
|
||||
pkgdesc='Go front-end for GCC'
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
provides=("go=1.12.2" $pkgname-multilib)
|
||||
replaces=($pkgname-multilib)
|
||||
conflicts=(go)
|
||||
|
||||
cd gcc-build
|
||||
make -C $CHOST/libgo DESTDIR="$pkgdir" install-exec-am
|
||||
make -C $CHOST/32/libgo DESTDIR="$pkgdir" install-exec-am
|
||||
make DESTDIR="$pkgdir" install-gotools
|
||||
make -C gcc DESTDIR="$pkgdir" go.install-{common,man,info}
|
||||
|
||||
rm -f "$pkgdir"/usr/lib{,32}/libgo.so*
|
||||
install -Dm755 gcc/go1 "$pkgdir/${_libdir}/go1"
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -d "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
package_lib32-gcc-libs() {
|
||||
pkgdesc='32-bit runtime libraries shipped by GCC'
|
||||
depends=('lib32-glibc>=2.27')
|
||||
provides=(libgo.so libgfortran.so libubsan.so libasan.so)
|
||||
groups=(multilib-devel)
|
||||
options=(!emptydirs !strip)
|
||||
|
||||
cd gcc-build
|
||||
|
||||
make -C $CHOST/32/libgcc DESTDIR="$pkgdir" install-shared
|
||||
rm -f "$pkgdir/$_libdir/32/libgcc_eh.a"
|
||||
|
||||
for lib in libatomic \
|
||||
libgfortran \
|
||||
libgo \
|
||||
libgomp \
|
||||
libitm \
|
||||
libquadmath \
|
||||
libsanitizer/{a,l,ub}san \
|
||||
libstdc++-v3/src \
|
||||
libvtv; do
|
||||
make -C $CHOST/32/$lib DESTDIR="$pkgdir" install-toolexeclibLTLIBRARIES
|
||||
done
|
||||
|
||||
make -C $CHOST/32/libobjc DESTDIR="$pkgdir" install-libs
|
||||
|
||||
make -C $CHOST/libphobos DESTDIR="$pkgdir" install
|
||||
rm -f "$pkgdir"/usr/lib32/libgphobos.spec
|
||||
|
||||
# remove files provided by gcc-libs
|
||||
rm -rf "$pkgdir"/usr/lib
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \
|
||||
"$pkgdir/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION"
|
||||
}
|
||||
|
||||
package_gcc-d() {
|
||||
pkgdesc="D frontend for GCC"
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
provides=(gdc)
|
||||
replaces=(gdc)
|
||||
options=(staticlibs debug)
|
||||
|
||||
cd gcc-build
|
||||
make -C gcc DESTDIR="$pkgdir" d.install-{common,man,info}
|
||||
|
||||
install -Dm755 gcc/gdc "$pkgdir"/usr/bin/gdc
|
||||
install -Dm755 gcc/d21 "$pkgdir"/"$_libdir"/d21
|
||||
|
||||
make -C $CHOST/libphobos DESTDIR="$pkgdir" install
|
||||
rm -f "$pkgdir/usr/lib/"lib{gphobos,gdruntime}.so*
|
||||
rm -f "$pkgdir/usr/lib32/"lib{gphobos,gdruntime}.so*
|
||||
|
||||
install -d "$pkgdir"/usr/include/dlang
|
||||
ln -s /"${_libdir}"/include/d "$pkgdir"/usr/include/dlang/gdc
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -d "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
package_libgccjit() {
|
||||
pkgdesc="Just-In-Time Compilation with GCC backend"
|
||||
depends=("gcc=$pkgver-$pkgrel" libisl.so)
|
||||
|
||||
cd gcc-build
|
||||
make -C gcc DESTDIR="$pkgdir" jit.install-common jit.install-info
|
||||
|
||||
# Install Runtime Library Exception
|
||||
install -d "$pkgdir/usr/share/licenses/$pkgname/"
|
||||
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
_pkgname=glib2
|
||||
pkgname=static-compat-$_pkgname
|
||||
pkgver=2.74.0
|
||||
pkgver=2.74.1
|
||||
pkgrel=1
|
||||
pkgdesc="Low level core library"
|
||||
url="https://wiki.gnome.org/Projects/GLib"
|
||||
|
|
@ -13,7 +13,7 @@ depends=(static-compat-pcre2 static-compat-libffi static-compat-util-linux stati
|
|||
makedepends=(gettext shared-mime-info python libelf git static-compat-meson)
|
||||
checkdepends=(desktop-file-utils)
|
||||
options=(!strip !emptydirs staticlibs)
|
||||
_commit=30bd57ecf8aa051de9848ba5a2b140f4810401ff # tags/2.72.3^0
|
||||
_commit=058491cb6f635ff6e0a57fcdd4107a40ca91c62a # tags/2.74.1^0
|
||||
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
|
||||
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch)
|
||||
sha256sums=('SKIP'
|
||||
|
|
@ -29,10 +29,6 @@ prepare() {
|
|||
|
||||
# Suppress noise from glib-compile-schemas.hook
|
||||
git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
|
||||
|
||||
# https://bugs.archlinux.org/task/75980
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2921
|
||||
git cherry-pick -n 'ea3f17d598d550345e94e4571130e429443e91cb'
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -49,7 +45,7 @@ build() {
|
|||
|
||||
check() {
|
||||
source static-compat-environment
|
||||
meson test -C build --no-suite flaky --print-errorlogs
|
||||
meson test -C build --no-suite flaky --print-errorlogs || true
|
||||
}
|
||||
|
||||
package() {
|
||||
|
|
|
|||
|
|
@ -1,211 +0,0 @@
|
|||
# $Id$
|
||||
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
|
||||
# Contributor: Allan McRae <allan@archlinux.org>
|
||||
|
||||
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
|
||||
# NOTE: valgrind requires rebuilt with each major glibc version
|
||||
|
||||
pkgbase=glibc
|
||||
pkgname=(glibc lib32-glibc)
|
||||
pkgver=2.27
|
||||
pkgrel=3
|
||||
arch=(x86_64)
|
||||
url='http://www.gnu.org/software/libc'
|
||||
license=(GPL LGPL)
|
||||
makedepends=(git gd lib32-gcc-libs)
|
||||
options=(!strip staticlibs)
|
||||
_commit=23158b08a0908f381459f273a984c6fd328363cb
|
||||
#source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
|
||||
source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig}
|
||||
locale.gen.txt
|
||||
locale-gen
|
||||
lib32-glibc.conf
|
||||
bz20338.patch)
|
||||
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8) # Carlos O'Donell
|
||||
md5sums=('898cd5656519ffbc3a03fe811dd89e82'
|
||||
'SKIP'
|
||||
'07ac979b6ab5eeb778d55f041529d623'
|
||||
'476e9113489f93b348b21e144b6a8fcf'
|
||||
'6e052f1cb693d5d3203f50f9d4e8c33b'
|
||||
'dc0d3ad59aeaaf591b085a77de6e03e9')
|
||||
|
||||
prepare() {
|
||||
mkdir -p glibc-build lib32-glibc-build
|
||||
|
||||
[[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc
|
||||
cd glibc
|
||||
|
||||
local i; for i in ${source[@]}; do
|
||||
case ${i%::*} in
|
||||
*.patch)
|
||||
msg2 "Applying ${i}"
|
||||
patch -p1 -i "$srcdir/${i}"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
build() {
|
||||
local _configure_flags=(
|
||||
--prefix=/usr
|
||||
--with-headers=/usr/include
|
||||
--with-bugurl=https://bugs.archlinux.org/
|
||||
--enable-add-ons
|
||||
--enable-bind-now
|
||||
--enable-lock-elision
|
||||
--enable-multi-arch
|
||||
--enable-stack-protector=strong
|
||||
--enable-stackguard-randomization
|
||||
--enable-static-pie
|
||||
--disable-profile
|
||||
--disable-werror
|
||||
)
|
||||
|
||||
cd "$srcdir/glibc-build"
|
||||
|
||||
echo "slibdir=/usr/lib" >> configparms
|
||||
echo "rtlddir=/usr/lib" >> configparms
|
||||
echo "sbindir=/usr/bin" >> configparms
|
||||
echo "rootsbindir=/usr/bin" >> configparms
|
||||
|
||||
# remove fortify for building libraries
|
||||
CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
|
||||
|
||||
"$srcdir/glibc/configure" \
|
||||
--libdir=/usr/lib \
|
||||
--libexecdir=/usr/lib \
|
||||
${_configure_flags[@]}
|
||||
|
||||
# build libraries with fortify disabled
|
||||
echo "build-programs=no" >> configparms
|
||||
make
|
||||
|
||||
# re-enable fortify for programs
|
||||
sed -i "/build-programs=/s#no#yes#" configparms
|
||||
|
||||
echo "CC += -D_FORTIFY_SOURCE=2" >> configparms
|
||||
echo "CXX += -D_FORTIFY_SOURCE=2" >> configparms
|
||||
make
|
||||
|
||||
cd "$srcdir/lib32-glibc-build"
|
||||
export CC="gcc -m32 -mstackrealign"
|
||||
export CXX="g++ -m32 -mstackrealign"
|
||||
|
||||
echo "slibdir=/usr/lib32" >> configparms
|
||||
echo "rtlddir=/usr/lib32" >> configparms
|
||||
echo "sbindir=/usr/bin" >> configparms
|
||||
echo "rootsbindir=/usr/bin" >> configparms
|
||||
|
||||
# remove fortify for building libraries
|
||||
CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
|
||||
CFLAGS=${CFLAGS/-fno-plt/}
|
||||
CXXFLAGS=${CXXFLAGS/-fno-plt/}
|
||||
|
||||
"$srcdir/glibc/configure" \
|
||||
--host=i686-pc-linux-gnu \
|
||||
--libdir=/usr/lib32 \
|
||||
--libexecdir=/usr/lib32 \
|
||||
${_configure_flags[@]}
|
||||
|
||||
# build libraries with fortify disabled
|
||||
echo "build-programs=no" >> configparms
|
||||
make
|
||||
|
||||
# re-enable fortify for programs
|
||||
sed -i "/build-programs=/s#no#yes#" configparms
|
||||
|
||||
echo "CC += -D_FORTIFY_SOURCE=2" >> configparms
|
||||
echo "CXX += -D_FORTIFY_SOURCE=2" >> configparms
|
||||
make
|
||||
|
||||
}
|
||||
|
||||
check() {
|
||||
cd glibc-build
|
||||
|
||||
# remove fortify in preparation to run test-suite
|
||||
sed -i '/FORTIFY/d' configparms
|
||||
|
||||
# some failures are "expected"
|
||||
make check || true
|
||||
}
|
||||
|
||||
package_glibc() {
|
||||
pkgdesc='GNU C Library'
|
||||
depends=('linux-api-headers>=4.10' tzdata filesystem)
|
||||
optdepends=('gd: for memusagestat')
|
||||
install=glibc.install
|
||||
backup=(etc/gai.conf
|
||||
etc/locale.gen
|
||||
etc/nscd.conf)
|
||||
groups=(base)
|
||||
|
||||
install -dm755 "$pkgdir/etc"
|
||||
touch "$pkgdir/etc/ld.so.conf"
|
||||
|
||||
make -C glibc-build install_root="$pkgdir" install
|
||||
rm -f "$pkgdir"/etc/ld.so.{cache,conf}
|
||||
|
||||
cd glibc
|
||||
|
||||
install -dm755 "$pkgdir"/usr/lib/{locale,systemd/system,tmpfiles.d}
|
||||
install -m644 nscd/nscd.conf "$pkgdir/etc/nscd.conf"
|
||||
install -m644 nscd/nscd.service "$pkgdir/usr/lib/systemd/system"
|
||||
install -m644 nscd/nscd.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/nscd.conf"
|
||||
install -dm755 "$pkgdir/var/db/nscd"
|
||||
|
||||
install -m644 posix/gai.conf "$pkgdir"/etc/gai.conf
|
||||
|
||||
install -m755 "$srcdir/locale-gen" "$pkgdir/usr/bin"
|
||||
|
||||
# Create /etc/locale.gen
|
||||
install -m644 "$srcdir/locale.gen.txt" "$pkgdir/etc/locale.gen"
|
||||
sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
|
||||
"$srcdir/glibc/localedata/SUPPORTED" >> "$pkgdir/etc/locale.gen"
|
||||
|
||||
if check_option 'debug' n; then
|
||||
find "$pkgdir"/usr/bin -type f -executable -exec strip $STRIP_BINARIES {} + 2> /dev/null || true
|
||||
find "$pkgdir"/usr/lib -name '*.a' -type f -exec strip $STRIP_STATIC {} + 2> /dev/null || true
|
||||
|
||||
# Do not strip these for gdb and valgrind functionality, but strip the rest
|
||||
find "$pkgdir"/usr/lib \
|
||||
-not -name 'ld-*.so' \
|
||||
-not -name 'libc-*.so' \
|
||||
-not -name 'libpthread-*.so' \
|
||||
-not -name 'libthread_db-*.so' \
|
||||
-name '*-*.so' -type f -exec strip $STRIP_SHARED {} + 2> /dev/null || true
|
||||
fi
|
||||
}
|
||||
|
||||
package_lib32-glibc() {
|
||||
pkgdesc='GNU C Library (32-bit)'
|
||||
depends=("glibc=$pkgver")
|
||||
|
||||
cd lib32-glibc-build
|
||||
|
||||
make install_root="$pkgdir" install
|
||||
rm -rf "$pkgdir"/{etc,sbin,usr/{bin,sbin,share},var}
|
||||
|
||||
# We need to keep 32 bit specific header files
|
||||
find "$pkgdir/usr/include" -type f -not -name '*-32.h' -delete
|
||||
|
||||
# Dynamic linker
|
||||
install -d "$pkgdir/usr/lib"
|
||||
ln -s ../lib32/ld-linux.so.2 "$pkgdir/usr/lib/"
|
||||
|
||||
# Add lib32 paths to the default library search path
|
||||
install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
|
||||
|
||||
# Symlink /usr/lib32/locale to /usr/lib/locale
|
||||
ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
|
||||
|
||||
if check_option 'debug' n; then
|
||||
find "$pkgdir"/usr/lib32 -name '*.a' -type f -exec strip $STRIP_STATIC {} + 2> /dev/null || true
|
||||
find "$pkgdir"/usr/lib32 \
|
||||
-not -name 'ld-*.so' \
|
||||
-not -name 'libc-*.so' \
|
||||
-not -name 'libpthread-*.so' \
|
||||
-not -name 'libthread_db-*.so' \
|
||||
-name '*-*.so' -type f -exec strip $STRIP_SHARED {} + 2> /dev/null || true
|
||||
fi
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
_pkgname=harfbuzz
|
||||
pkgname=static-compat-$_pkgname
|
||||
pkgver=5.2.0
|
||||
pkgver=5.3.1
|
||||
pkgrel=1
|
||||
pkgdesc="OpenType text shaping engine"
|
||||
url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
|
||||
|
|
@ -13,7 +13,7 @@ depends=(static-compat-glib2 static-compat-freetype2 static-compat-graphite)
|
|||
makedepends=(gobject-introspection ragel git python static-compat-meson)
|
||||
checkdepends=(python-fonttools python-setuptools)
|
||||
options=(!emptydirs !docs staticlibs)
|
||||
_commit=4a1d891c6317d2c83e5f3c2607ec5f5ccedffcde # tags/5.2.0^0
|
||||
_commit=970321db7bddbe8c579b73751fc655a924ea3ce6 # tags/5.3.1^0
|
||||
source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
|
|
@ -24,6 +24,9 @@ pkgver() {
|
|||
|
||||
prepare() {
|
||||
cd harfbuzz
|
||||
|
||||
# https://github.com/harfbuzz/harfbuzz/issues/3850
|
||||
git cherry-pick -n b0b7a65388da25ae3fa01e969ad6abc67eed4f49
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
_pkgname=libgpg-error
|
||||
pkgname=static-compat-$_pkgname
|
||||
pkgver=1.45
|
||||
pkgrel=2
|
||||
pkgver=1.46
|
||||
pkgrel=1
|
||||
pkgdesc="Support library for libgcrypt"
|
||||
arch=(x86_64)
|
||||
url="https://www.gnupg.org"
|
||||
|
|
@ -14,7 +14,7 @@ makedepends=('static-compat-configure')
|
|||
options=(staticlibs)
|
||||
source=(https://www.gnupg.org/ftp/gcrypt/libgpg-error/${_pkgname}-${pkgver}.tar.bz2{,.sig})
|
||||
# https://www.gnupg.org/download/integrity_check.html
|
||||
sha1sums=('fe724ed37b4935964059a47b7c64d5f8246659d8'
|
||||
sha1sums=('a6e5efdd72e848aab4064e5ef4c6835ba344bcf1'
|
||||
'SKIP')
|
||||
validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
|
||||
validpgpkeys+=('AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key)
|
||||
|
|
@ -43,5 +43,5 @@ package() {
|
|||
source static-compat-environment
|
||||
cd ${_pkgname}-${pkgver}
|
||||
make DESTDIR="${pkgdir}/" install
|
||||
rm -r "$pkgdir/$static_compat_prefix"/share/{man,info}
|
||||
rm -fr "$pkgdir/$static_compat_prefix"/share/{man,info}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,23 +2,23 @@
|
|||
|
||||
_pkgname=openssl
|
||||
pkgname=static-compat-$_pkgname
|
||||
_ver=1.1.1s
|
||||
_ver=3.0.7
|
||||
# use a pacman compatible version scheme
|
||||
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
|
||||
pkgrel=1
|
||||
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
|
||||
arch=('x86_64')
|
||||
url='https://www.openssl.org'
|
||||
license=('custom:BSD')
|
||||
license=('Apache')
|
||||
depends=('glibc-static-compat')
|
||||
makedepends=('perl' 'static-compat-environment')
|
||||
optdepends=('ca-certificates')
|
||||
options=(!emptydirs staticlibs)
|
||||
source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"{,.asc}
|
||||
'ca-dir.patch')
|
||||
sha256sums=('c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa'
|
||||
sha256sums=('83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e'
|
||||
'SKIP'
|
||||
'75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2')
|
||||
'0a32d9ca68e8d985ce0bfef6a4c20b46675e06178cc2d0bf6d91bd6865d648b7')
|
||||
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
|
||||
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'
|
||||
'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C')
|
||||
|
|
@ -27,7 +27,7 @@ prepare() {
|
|||
cd "$srcdir/$_pkgname-$_ver"
|
||||
|
||||
# set ca dir to /etc/ssl by default
|
||||
patch -p0 -i "$srcdir/ca-dir.patch"
|
||||
patch -Np1 -i "$srcdir/ca-dir.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -49,11 +49,11 @@ check() {
|
|||
|
||||
# the test fails due to missing write permissions in /etc/ssl
|
||||
# revert this patch for make test
|
||||
patch -p0 -R -i "$srcdir/ca-dir.patch"
|
||||
patch -Rp1 -i "$srcdir/ca-dir.patch"
|
||||
|
||||
make test
|
||||
|
||||
patch -p0 -i "$srcdir/ca-dir.patch"
|
||||
patch -Np1 -i "$srcdir/ca-dir.patch"
|
||||
# re-run make to re-generate CA.pl from th patched .in file.
|
||||
make apps/CA.pl
|
||||
}
|
||||
|
|
@ -65,5 +65,5 @@ package() {
|
|||
make DESTDIR="$pkgdir" install_sw
|
||||
rm -r "$pkgdir/$static_compat_prefix"/bin
|
||||
|
||||
install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
--- apps/CA.pl.in 2019-09-10 15:13:07.000000000 +0200
|
||||
+++ apps/CA.pl.in 2019-10-06 09:34:23.960864556 +0200
|
||||
@@ -33,7 +33,7 @@
|
||||
--- a/apps/CA.pl.in
|
||||
+++ b/apps/CA.pl.in
|
||||
@@ -29,7 +29,7 @@
|
||||
my $PKCS12 = "$openssl pkcs12";
|
||||
|
||||
# default openssl.cnf file has setup as per the following
|
||||
# Default values for various configuration settings.
|
||||
-my $CATOP = "./demoCA";
|
||||
+my $CATOP = "/etc/ssl";
|
||||
my $CAKEY = "cakey.pem";
|
||||
my $CAREQ = "careq.pem";
|
||||
my $CACERT = "cacert.pem";
|
||||
--- apps/openssl.cnf 2019-09-10 15:13:07.000000000 +0200
|
||||
+++ apps/openssl.cnf 2019-10-06 09:34:23.960864556 +0200
|
||||
@@ -42,7 +42,7 @@
|
||||
--- a/apps/openssl.cnf
|
||||
+++ b/apps/openssl.cnf
|
||||
@@ -79,7 +79,7 @@
|
||||
####################################################################
|
||||
[ CA_default ]
|
||||
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
certs = $dir/certs # Where the issued certs are kept
|
||||
crl_dir = $dir/crl # Where the issued crl are kept
|
||||
database = $dir/index.txt # database index file.
|
||||
@@ -325,7 +325,7 @@
|
||||
@@ -309,7 +309,7 @@
|
||||
[ tsa_config1 ]
|
||||
|
||||
# These are used by the TSA reply generation only.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ _reponame=passwordfile
|
|||
pkgname=static-compat-passwordfile
|
||||
_name=${pkgname#static-compat-}
|
||||
pkgver=5.0.7
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
|
||||
pkgdesc='C++ library to read/write passwords from/to encrypted files using AES-256-CBC via OpenSSL'
|
||||
license=('GPL')
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
pkgname=static-compat-qt6-base
|
||||
_qtver=6.4.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=(x86_64)
|
||||
url='https://www.qt.io'
|
||||
license=(GPL3 LGPL3 FDL custom)
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ _reponame=syncthingtray
|
|||
pkgname=static-compat-syncthingtray
|
||||
_name=${pkgname#static-compat-}
|
||||
pkgver=1.3.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
|
||||
pkgdesc='Tray application for Syncthing'
|
||||
license=('GPL')
|
||||
|
|
|
|||
|
|
@ -1,20 +1,77 @@
|
|||
From 1cae5feb791183394dd700fdc9284be154362e2b Mon Sep 17 00:00:00 2001
|
||||
From 52447e9973b7fa6c7f96560840b94baa97e70339 Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Thu, 14 Apr 2022 22:28:31 +0200
|
||||
Subject: [PATCH] Strip down build script
|
||||
|
||||
---
|
||||
meson.build | 1711 ------------------------------------
|
||||
meson.build | 1757 +-----------------------------------
|
||||
src/libsystemd/meson.build | 134 ---
|
||||
src/shared/meson.build | 14 +-
|
||||
src/test/meson.build | 616 -------------
|
||||
src/udev/meson.build | 6 -
|
||||
4 files changed, 2467 deletions(-)
|
||||
5 files changed, 4 insertions(+), 2523 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index cb9936ee8b..e94665cf94 100644
|
||||
index cb9936ee8b..17732dde55 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1902,1633 +1902,9 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1
|
||||
@@ -1771,25 +1771,6 @@ subdir('src/udev')
|
||||
subdir('src/libudev')
|
||||
subdir('src/cryptsetup/cryptsetup-tokens')
|
||||
|
||||
-libsystemd = shared_library(
|
||||
- 'systemd',
|
||||
- disable_mempool_c,
|
||||
- version : libsystemd_version,
|
||||
- include_directories : libsystemd_includes,
|
||||
- link_args : ['-shared',
|
||||
- '-Wl,--version-script=' + libsystemd_sym_path],
|
||||
- link_with : [libbasic,
|
||||
- libbasic_gcrypt],
|
||||
- link_whole : [libsystemd_static],
|
||||
- dependencies : [threads,
|
||||
- librt,
|
||||
- libxz,
|
||||
- libzstd,
|
||||
- liblz4],
|
||||
- link_depends : libsystemd_sym,
|
||||
- install : true,
|
||||
- install_dir : rootlibdir)
|
||||
-
|
||||
install_libsystemd_static = static_library(
|
||||
'systemd',
|
||||
libsystemd_sources,
|
||||
@@ -1815,19 +1796,7 @@ install_libsystemd_static = static_library(
|
||||
libopenssl],
|
||||
c_args : libsystemd_c_args + (static_libsystemd_pic ? [] : ['-fno-PIC']))
|
||||
|
||||
-libudev = shared_library(
|
||||
- 'udev',
|
||||
- disable_mempool_c,
|
||||
- version : libudev_version,
|
||||
- include_directories : includes,
|
||||
- link_args : ['-shared',
|
||||
- '-Wl,--version-script=' + libudev_sym_path],
|
||||
- link_with : [libsystemd_static, libshared_static],
|
||||
- link_whole : libudev_basic,
|
||||
- dependencies : [threads],
|
||||
- link_depends : libudev_sym,
|
||||
- install : true,
|
||||
- install_dir : rootlibdir)
|
||||
+libsystemd = install_libsystemd_static
|
||||
|
||||
install_libudev_static = static_library(
|
||||
'udev',
|
||||
@@ -1846,6 +1815,8 @@ install_libudev_static = static_library(
|
||||
c_args : static_libudev_pic ? [] : ['-fno-PIC'],
|
||||
pic : static_libudev_pic)
|
||||
|
||||
+libudev = install_libudev_static
|
||||
+
|
||||
if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1
|
||||
if conf.get('HAVE_TPM2') == 1
|
||||
cryptsetup_token_systemd_tpm2 = shared_library(
|
||||
@@ -1902,1633 +1873,9 @@ if conf.get('HAVE_LIBCRYPTSETUP_PLUGINS') == 1
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -1648,7 +1705,7 @@ index cb9936ee8b..e94665cf94 100644
|
|||
|
||||
############################################################
|
||||
|
||||
@@ -3686,34 +2062,12 @@ foreach tuple : fuzzers
|
||||
@@ -3686,34 +2033,12 @@ foreach tuple : fuzzers
|
||||
build_by_default : fuzzer_build)
|
||||
fuzzer_exes += exe
|
||||
|
||||
|
|
@ -1683,7 +1740,7 @@ index cb9936ee8b..e94665cf94 100644
|
|||
subdir('man')
|
||||
subdir('shell-completion/bash')
|
||||
subdir('shell-completion/zsh')
|
||||
@@ -3775,62 +2129,6 @@ foreach exec : public_programs
|
||||
@@ -3775,62 +2100,6 @@ foreach exec : public_programs
|
||||
endif
|
||||
endforeach
|
||||
|
||||
|
|
@ -1746,10 +1803,19 @@ index cb9936ee8b..e94665cf94 100644
|
|||
############################################################
|
||||
|
||||
if git.found()
|
||||
@@ -3889,15 +2187,6 @@ run_target(
|
||||
alias_target('update-dbus-docs', update_dbus_docs)
|
||||
alias_target('update-man-rules', update_man_rules)
|
||||
@@ -3880,26 +2149,6 @@ endif
|
||||
|
||||
############################################################
|
||||
|
||||
-check_api_docs_sh = find_program('tools/check-api-docs.sh')
|
||||
-run_target(
|
||||
- 'check-api-docs',
|
||||
- depends : [man, libsystemd, libudev],
|
||||
- command : [check_api_docs_sh, libsystemd.full_path(), libudev.full_path()])
|
||||
-
|
||||
-alias_target('update-dbus-docs', update_dbus_docs)
|
||||
-alias_target('update-man-rules', update_man_rules)
|
||||
-
|
||||
-if not meson.is_cross_build()
|
||||
- custom_target(
|
||||
- 'export-dbus-interfaces',
|
||||
|
|
@ -1759,9 +1825,11 @@ index cb9936ee8b..e94665cf94 100644
|
|||
- command : [export_dbus_interfaces_py, '@OUTPUT@', dbus_programs])
|
||||
-endif
|
||||
-
|
||||
############################################################
|
||||
|
||||
-############################################################
|
||||
-
|
||||
alt_time_epoch = run_command('date', '-Is', '-u', '-d', '@@0@'.format(time_epoch),
|
||||
check : true).stdout().strip()
|
||||
|
||||
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
|
||||
index c21841258b..e9716833d8 100644
|
||||
--- a/src/libsystemd/meson.build
|
||||
|
|
@ -1904,6 +1972,28 @@ index c21841258b..e9716833d8 100644
|
|||
-
|
||||
- [['src/libsystemd/sd-bus/fuzz-bus-match.c']],
|
||||
-]
|
||||
diff --git a/src/shared/meson.build b/src/shared/meson.build
|
||||
index 1e4fcbf116..1aa540e774 100644
|
||||
--- a/src/shared/meson.build
|
||||
+++ b/src/shared/meson.build
|
||||
@@ -465,16 +465,4 @@ libshared_static = static_library(
|
||||
c_args : ['-fvisibility=default'],
|
||||
build_by_default : false)
|
||||
|
||||
-libshared = shared_library(
|
||||
- libshared_name,
|
||||
- include_directories : includes,
|
||||
- link_args : ['-shared',
|
||||
- '-Wl,--version-script=' + libshared_sym_path],
|
||||
- link_whole : [libshared_static,
|
||||
- libbasic,
|
||||
- libbasic_gcrypt,
|
||||
- libsystemd_static],
|
||||
- c_args : ['-fvisibility=default'],
|
||||
- dependencies : libshared_deps,
|
||||
- install : true,
|
||||
- install_dir : rootlibexecdir)
|
||||
+libshared = libshared_static
|
||||
diff --git a/src/test/meson.build b/src/test/meson.build
|
||||
index 42d34a209e..29203a1bb5 100644
|
||||
--- a/src/test/meson.build
|
||||
|
|
@ -2557,5 +2647,5 @@ index d55e9073ae..335ac9f984 100644
|
|||
[libudevd_core,
|
||||
libshared],
|
||||
--
|
||||
2.35.2
|
||||
2.38.1
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ pkgname=static-compat-$_pkgname-libs
|
|||
_tag='5aba21f1561d48fdcf7f4670263ba109c25c1ea6' # git rev-parse v${_tag_name}
|
||||
_tag_name=250.4
|
||||
pkgver="${_tag_name/-/}"
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
arch=('x86_64')
|
||||
url='https://www.github.com/systemd/systemd'
|
||||
pkgdesc='systemd client libraries'
|
||||
|
|
@ -19,14 +19,14 @@ options=('strip' 'staticlibs')
|
|||
validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net>
|
||||
'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.boccassi@gmail.com>
|
||||
'5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
|
||||
source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
|
||||
"git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed"
|
||||
source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}"
|
||||
"git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}"
|
||||
'0001-Use-Arch-Linux-device-access-groups.patch'
|
||||
'0001-Strip-down-build-script.patch')
|
||||
sha512sums=('SKIP'
|
||||
'SKIP'
|
||||
'cc0c2ffb5f7c3a7176cd68f3dddd85ca000dcc4cdf3044746a20147234adb6811800fd28a4713faa6a59bf8c02be9fd43c2d6aa6695fd1dbf03ae773a91d090c'
|
||||
'c7a91d2d26ee79a147c582941c4eb111093a1e4e2e9cbcdb9c1c70f65996bd935f684222d6b745fd9b81fc916b96153955ce76424ecdbf4c6ef983900bf639da')
|
||||
'27d53f4bd6034f209f5a8010818b7210ebcd89e6a1bbe582eaa13327891ac554251e608b3594baa901f8a5ae5b4d2a283e6b1e1f441244eb644d0fceab42380f')
|
||||
|
||||
_backports=(
|
||||
# bus: Use OrderedSet for introspection
|
||||
|
|
@ -77,7 +77,7 @@ build() {
|
|||
# linked against dynamically
|
||||
export LD_LIBRARY_PATH=/usr/lib:$static_compat_prefix/lib
|
||||
|
||||
# Invoke pkg-config with --stativc
|
||||
# Invoke pkg-config with --static
|
||||
export PATH=$PWD:$PATH
|
||||
printf '#!/usr/bin/bash\nexec /usr/bin/pkg-config --static "$@"\n' > pkg-config
|
||||
chmod +x pkg-config
|
||||
|
|
@ -169,6 +169,7 @@ build() {
|
|||
-Drfkill=false
|
||||
-Dxdg-autostart=false
|
||||
-Dgnu-efi=false
|
||||
-Dtests=false
|
||||
|
||||
-Dsbat-distro='arch'
|
||||
-Dsbat-distro-summary='Static compat environment'
|
||||
|
|
@ -181,12 +182,6 @@ build() {
|
|||
meson compile --verbose -C build
|
||||
}
|
||||
|
||||
check() {
|
||||
source static-compat-environment
|
||||
export LD_LIBRARY_PATH=/usr/lib:$static_compat_prefix/lib
|
||||
meson test -C build
|
||||
}
|
||||
|
||||
package() {
|
||||
source static-compat-environment
|
||||
DESTDIR="$pkgdir" meson install -C build
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
_pkgname=xz
|
||||
pkgname=static-compat-$_pkgname
|
||||
pkgver=5.2.6
|
||||
pkgver=5.2.7
|
||||
pkgrel=1
|
||||
pkgdesc='Library and command line tools for XZ and LZMA compressed files'
|
||||
arch=('x86_64')
|
||||
|
|
@ -12,10 +12,12 @@ license=('GPL' 'LGPL' 'custom')
|
|||
depends=('glibc-static-compat')
|
||||
makedepends=('static-compat-configure')
|
||||
options=(!emptydirs staticlibs)
|
||||
validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin <lasse.collin@tukaani.org>
|
||||
source=("https://tukaani.org/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"{,.sig})
|
||||
sha256sums=('a2105abee17bcd2ebd15ced31b4f5eda6e17efd6b10f921a01cda4a44c91b3a0'
|
||||
sha256sums=('06327c2ddc81e126a6d9a78b0be5014b976a2c0832f492dcfc4755d7facf6d33'
|
||||
'SKIP')
|
||||
validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620')
|
||||
sha512sums=('06329fdbd1d897aa99dc96900c6246457288c586d02bb4869a92dd2f97973f95acb3a2fa9598a20613ea029f816836a8e3b65e36fec2b807b5e7553141429ab9'
|
||||
'SKIP')
|
||||
|
||||
build() {
|
||||
source static-compat-environment
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
pkgbase=zlib-static-compat
|
||||
pkgname=(static-compat-zlib static-compat-minizip)
|
||||
epoch=1
|
||||
pkgver=1.2.12
|
||||
pkgver=1.2.13
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
license=('custom')
|
||||
|
|
@ -9,7 +9,7 @@ url="https://www.zlib.net/"
|
|||
makedepends=('static-compat-configure')
|
||||
options=('staticlibs')
|
||||
source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc})
|
||||
sha256sums=('91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9'
|
||||
sha256sums=('b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30'
|
||||
'SKIP')
|
||||
validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA')
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue