Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

olm: update to 3.0.0 #7151

Closed
wants to merge 1 commit into from
Closed

olm: update to 3.0.0 #7151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion common/shlibs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3331,7 +3331,7 @@ libretro-gtk-0.14.so.0 retro-gtk-0.16.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
libfmt.so.5 fmt-5.2.1_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.2 olm-2.3.0_1
libolm.so.3 olm-2.3.0_1
libcrypto.so.44 libcrypto44-2.8.2_1
libtls.so.18 libtls18-2.8.2_1
libssl.so.46 libssl46-2.8.2_1
Expand Down
16 changes: 0 additions & 16 deletions srcpkgs/olm/patches/python-find-olm.patch
View file
Open in desktop

This file was deleted.

22 changes: 17 additions & 5 deletions srcpkgs/olm/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# Template file for 'olm'
pkgname=olm
version=2.3.0
version=3.0.0
revision=1
build_style=gnu-makefile
make_check_target=test
hostmakedepends="python-devel python3-devel"
makedepends="python-devel python3-devel"
short_desc="An implementation of the Double Ratchet cryptographic ratchet"
hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
makedepends="python-devel python3-devel libffi-devel"
depends="python-cffi python3-cffi python-future python3-future"
short_desc="Implementation of the Double Ratchet cryptographic ratchet"
maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
license="Apache-2.0"
homepage="https://git.matrix.org/git/olm/about/"
distfiles="https://git.matrix.org/git/olm/snapshot/${pkgname}-${version}.tar.gz"
checksum=533714fb84860e04c185790d16ef9085f15e902c2105db941d5c7e92b0565ef8
checksum=4c54f93e4f426a9d5c8e66e63113d42fd2afca240cdcff30a469a342a6ec3bc6
nocross=yes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why mark it nocross? It was possible to cross-compile before, the package is in the aarch64 repo.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

During the install stage it uses the host gcc instead of target’s

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An it isn't possible to find a way around that or patch it to do the right thing? Adding nocross to new packages that simply cannot be crosscompiled is one thing but setting existing packages nocross means the repositories have to be cleaned up manually and people already using a package on cross-compiled architectures will loose functionality.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will try more, as I was trying to avoid setting nocross

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After digging more into it, seems it is CFFI causing issues


post_configure() {
# -O0 prevents _FORTIFY_SOURCE working
Expand All @@ -20,12 +22,22 @@ post_configure() {
done
}

# Makefile doesn't cd into python dir and build
post_build() {
make -C python
}

do_install() {
make DESTDIR=${DESTDIR} PREFIX=/usr install
for pysl in $py2_sitelib $py3_sitelib; do
mkdir -p ${DESTDIR}${pysl}
cp -r ${wrksrc}/python/olm ${DESTDIR}${pysl}
done
# Install needed python modules
cd python ; python setup.py install --skip-build \
--root=${DESTDIR} ; \
python3 setup.py install --skip-build \
--root=${DESTDIR}
}

olm-devel_package() {
Expand Down