Skip to content
Snippets Groups Projects
Commit 2a38fef9 authored by Simon McVittie's avatar Simon McVittie
Browse files

Package shim libraries separately


This will let us install x86_64 and i386 libraries together.
Use a directory layout suitable for tests/manual/gl.pl.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 63d12799
No related branches found
No related tags found
1 merge request!311Build capsule-capture-libs from a bundled copy of libcapsule
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
/libGL-proxy-build/ /libGL-proxy-build/
/libcapsule-dev /libcapsule-dev
/libcapsule-dev-bin /libcapsule-dev-bin
/libcapsule-libgl1-shims/
/libcapsule-tests /libcapsule-tests
/libcapsule0 /libcapsule0
/tmp /tmp
...@@ -52,11 +52,24 @@ Description: ...@@ -52,11 +52,24 @@ Description:
. .
This package contains the files needed to generate libcapsule proxy libraries. This package contains the files needed to generate libcapsule proxy libraries.
Package: libcapsule-libgl1-shims
Architecture: amd64 i386
Multi-Arch: same
Section: libs
Description:
libcapsule is a helper library used to implement segregated run-time
dynamic linking proxy libraries - used (for example) to load a library
that has dependencies incompatible with the regular libraries that are
part of the host OS, such as an incompatible libstdc++ version.
.
This package contains automated tests.
Package: libcapsule-tests Package: libcapsule-tests
Architecture: amd64 i386 Architecture: amd64 i386
Section: misc Section: misc
Depends: Depends:
bubblewrap, bubblewrap,
libcapsule-libgl1-shims (= ${binary:Version}),
libipc-run-perl, libipc-run-perl,
perl, perl,
${shlibs:Depends}, ${shlibs:Depends},
......
usr/lib/libcapsule/shims
usr/lib/*/libcapsule/shims
usr/lib/libcapsule/installed-tests/libcapsule usr/lib/libcapsule/installed-tests/libcapsule
usr/share/installed-tests/libcapsule usr/share/installed-tests/libcapsule
...@@ -47,13 +47,13 @@ override_dh_auto_install: ...@@ -47,13 +47,13 @@ override_dh_auto_install:
dh_auto_install dh_auto_install
$(MAKE) -C debian/libGL-proxy-build install V=1 $(proxy_vars) \ $(MAKE) -C debian/libGL-proxy-build install V=1 $(proxy_vars) \
DESTDIR=$(CURDIR)/debian/libGL-proxy-build/shims DESTDIR=$(CURDIR)/debian/libGL-proxy-build/shims
install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcapsule/shims install -d debian/tmp/usr/lib/libcapsule/shims/lib/$(DEB_HOST_MULTIARCH)
mv debian/libGL-proxy-build/shims/usr/lib/* \ mv debian/libGL-proxy-build/shims/usr/lib/* \
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcapsule/shims debian/tmp/usr/lib/libcapsule/shims/lib/$(DEB_HOST_MULTIARCH)
override_dh_install: override_dh_install:
rm -f debian/tmp/usr/lib/*/*.la rm -f debian/tmp/usr/lib/*/*.la
rm -f debian/tmp/usr/lib/*/libcapsule/shims/*.la rm -f debian/tmp/usr/lib/libcapsule/shims/lib/*/*.la
find debian/tmp/usr/lib/libcapsule/installed-tests -name '*.la' -print -delete find debian/tmp/usr/lib/libcapsule/installed-tests -name '*.la' -print -delete
# Only keep the architecture-qualified version, delete the unprefixed # Only keep the architecture-qualified version, delete the unprefixed
# version, so we can be Multi-Arch: same # version, so we can be Multi-Arch: same
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment