Skip to content

Commit

Permalink
Redo pkg-config handling with library collecting
Browse files Browse the repository at this point in the history
pkg-config only handled PKG_CONFIG_SYSROOT_DIR as the stage dir
providing many issues when using packages from installdir for a part
and also build-packages from the host.

For a full implementation, elf dependency tracking from the host
to the snap is also implemented here

LP: #1549570

Signed-off-by: Sergio Schvezov <sergio.schvezov@ubuntu.com>
  • Loading branch information
sergiusens committed Feb 25, 2016
1 parent 8e2bff0 commit 5c4d3c0
Show file tree
Hide file tree
Showing 10 changed files with 693 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -31,7 +31,7 @@ before_script:
- sudo lxc config device add xenial /dev/sda1 disk source=$(pwd) path=$(pwd)
# Install the snapcraft dependencies.
- sudo lxc exec xenial -- apt-get update
- sudo lxc exec xenial -- apt-get install -y lxd pyflakes python-flake8 python3.5 python3-apt python3-docopt python3-coverage python3-fixtures python3-flake8 python3-jsonschema python3-mccabe python3-mock python3-pep8 python3-pexpect python3-pip python3-requests python3-requests-oauthlib python3-responses python3-ssoclient python3-testscenarios python3-testtools python3-xdg python3-yaml python3-lxml squashfs-tools python3-progressbar python3-requests-toolbelt python3-petname
- sudo lxc exec xenial -- apt-get install -y lxd pyflakes python-flake8 python3.5 python3-apt python3-magic python3-docopt python3-coverage python3-fixtures python3-flake8 python3-jsonschema python3-mccabe python3-mock python3-pep8 python3-pexpect python3-pip python3-requests python3-requests-oauthlib python3-responses python3-ssoclient python3-testscenarios python3-testtools python3-xdg python3-yaml python3-lxml squashfs-tools python3-progressbar python3-requests-toolbelt python3-petname
- sudo lxc exec xenial -- usermod ubuntu -a -G lxd
script:
- sudo -E lxc exec xenial -- su - ubuntu -c "cd $(pwd); TEST_USER_PASSWORD=$TEST_USER_PASSWORD ./runtests.sh $TEST_SUITE"
Expand Down
2 changes: 2 additions & 0 deletions debian/control
Expand Up @@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 9),
python3-fixtures,
python3-jsonschema,
python3-lxml,
python3-magic,
python3-petname,
python3-pkg-resources,
python3-progressbar,
Expand All @@ -33,6 +34,7 @@ Depends: lxd,
python3-docopt,
python3-jsonschema,
python3-lxml,
python3-magic,
python3-petname,
python3-pkg-resources,
python3-progressbar,
Expand Down
9 changes: 1 addition & 8 deletions examples/godd/snapcraft.yaml
Expand Up @@ -14,11 +14,4 @@ parts:
plugin: go
source: https://github.com/mvo5/godd
source-type: git
build-packages: [gcc]
stage-packages: [libgudev-1.0-dev]
snap:
- usr/lib/x86_64-linux-gnu/libgudev-1.0.so*
- usr/lib/x86_64-linux-gnu/libobject-2.0.so*
- usr/lib/x86_64-linux-gnu/libglib-2.0.so*
- lib/x86_64-linux-gnu/libglib-2.0.so*
- bin/godd*
build-packages: [gcc, libgudev-1.0-dev]

0 comments on commit 5c4d3c0

Please sign in to comment.