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

Add libdir to autotools builds #103

Draft
wants to merge 1 commit into
base: gnome-42-2204-sdk
Choose a base branch
from
Draft

Add libdir to autotools builds #103

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
31 changes: 21 additions & 10 deletions snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ parts:
build-environment: &buildenv
- ACLOCAL_PATH: $CRAFT_STAGE/usr/share/aclocal
- XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/usr/share
- LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/vala-0.56:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/vala-0.56:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET:$CRAFT_STAGE/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- GDK_PIXBUF_MODULE_FILE: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0/2.10.0/loaders.cache
- PKG_CONFIG_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig:$CRAFT_STAGE/usr/lib/pkgconfig:$CRAFT_STAGE/usr/share/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
- CRAFT_EXT_CORE_LEVEL: core22
Expand Down Expand Up @@ -76,7 +76,9 @@ parts:
# ext:updatesnap
# version-format:
# ignore: true
autotools-configure-parameters: [ --prefix=/usr ]
autotools-configure-parameters:
- --prefix=/usr
- --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET
build-environment: *buildenv
build-packages:
- help2man
Expand Down Expand Up @@ -208,7 +210,9 @@ parts:
source: https://gitlab.gnome.org/GNOME/vala.git
source-tag: '0.56.4'
plugin: autotools
autotools-configure-parameters: [ --prefix=/usr ]
autotools-configure-parameters:
- --prefix=/usr
- --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET
build-environment: *buildenv
build-packages:
- autoconf-archive
Expand All @@ -221,7 +225,9 @@ parts:
source-tag: '0.20.6'
source-depth: 1
plugin: autotools
autotools-configure-parameters: [ --prefix=/usr ]
autotools-configure-parameters:
- --prefix=/usr
- --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET
build-environment: *buildenv
override-build: |
set -eux
Expand Down Expand Up @@ -401,6 +407,7 @@ parts:
plugin: autotools
autotools-configure-parameters:
- --prefix=/usr
- --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET
- --enable-introspection=yes
- --enable-vala=yes
- --enable-pixbuf-loader
Expand Down Expand Up @@ -514,7 +521,9 @@ parts:
# same-minor: true
source-depth: 1
plugin: autotools
autotools-configure-parameters: [ --prefix=/usr ]
autotools-configure-parameters:
- --prefix=/usr
- --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET
build-environment: *buildenv
build-packages:
- gtk-doc-tools
Expand Down Expand Up @@ -815,7 +824,7 @@ parts:
build-environment:
- ACLOCAL_PATH: $CRAFT_STAGE/usr/share/aclocal
- XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/usr/share
- LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/vala-0.56${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/vala-0.56${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- GDK_PIXBUF_MODULE_FILE: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0/2.10.0/loaders.cache
- M4PATH: $CRAFT_STAGE/usr/lib/glibmm-2.4/proc/m4
override-build: |
Expand All @@ -841,7 +850,7 @@ parts:
build-environment:
- ACLOCAL_PATH: $CRAFT_STAGE/usr/share/aclocal
- XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/usr/share
- LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET:$CRAFT_STAGE/usr/lib/vala-0.56${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/vala-0.56${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- GDK_PIXBUF_MODULE_FILE: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0/2.10.0/loaders.cache
- M4PATH: $CRAFT_STAGE/usr/lib/glibmm-2.4/proc/m4

Expand All @@ -863,7 +872,7 @@ parts:
build-environment:
- ACLOCAL_PATH: $CRAFT_STAGE/usr/share/aclocal
- XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/usr/share
- LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/vala-0.56:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/vala-0.56:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- GDK_PIXBUF_MODULE_FILE: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0/2.10.0/loaders.cache
- M4PATH: $CRAFT_STAGE/usr/lib/glibmm-2.4/proc/m4
override-build: |
Expand Down Expand Up @@ -919,6 +928,7 @@ parts:
plugin: autotools
autotools-configure-parameters:
- --prefix=/usr
- --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET
- --with-builtin=pulse
build-environment: *buildenv
build-packages:
Expand Down Expand Up @@ -990,6 +1000,7 @@ parts:
plugin: autotools
autotools-configure-parameters:
- --prefix=/usr
- --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET
- --enable-wayland-egl-platform=yes
- --enable-kms-egl-platform=yes
- --enable-introspection=yes
Expand Down Expand Up @@ -1556,10 +1567,10 @@ parts:
XML2_CONFIG=usr/bin/xml2-config
sed -i 's#/root/parts/debs/install#/snap/gnome-42-2204-sdk/current#g' $XML2_CONFIG

rm -f usr/lib/vala-current
rm -f usr/lib/$CRAFT_ARCH_TRIPLET/vala-current
rm -f usr/share/gettext-current
rm -f usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-current
ln -s vala-0.56 usr/lib/vala-current
ln -s vala-0.56 usr/lib/$CRAFT_ARCH_TRIPLET/vala-current
ln -s gettext-0.19.8 usr/share/gettext-current
ln -s gdk-pixbuf-2.0/2.10.0 usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-current

Expand Down