diff options
| author | Jonathan Bauer | 2018-01-30 15:06:59 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2018-01-30 15:06:59 +0100 |
| commit | 220f4db324438d8a7bcb86470b37211846b5978d (patch) | |
| tree | 181171d9436e7acdeb2b25b11c5d34fd271bf011 /core/modules/vbox-src | |
| parent | [beamergui] add missing dependency (diff) | |
| download | mltk-220f4db324438d8a7bcb86470b37211846b5978d.tar.gz mltk-220f4db324438d8a7bcb86470b37211846b5978d.tar.xz mltk-220f4db324438d8a7bcb86470b37211846b5978d.zip | |
[vbox-src] add missing deps
+ fix package inclusion to cross compile 32bit binaries on 64bit systems
Diffstat (limited to 'core/modules/vbox-src')
| -rw-r--r-- | core/modules/vbox-src/module.build | 1 | ||||
| -rw-r--r-- | core/modules/vbox-src/module.conf.ubuntu | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/modules/vbox-src/module.build b/core/modules/vbox-src/module.build index 14ab8d2a..b409b036 100644 --- a/core/modules/vbox-src/module.build +++ b/core/modules/vbox-src/module.build @@ -25,7 +25,6 @@ build() { || perror "'configure' failed." # the configure script should have created a file called 'env.sh' - [ -r "${VBOX_BUILD_DIR}/env.sh" ] || perror "Generated file '${VBOX_BUILD_DIR}/env.sh' not found." source "${VBOX_BUILD_DIR}/env.sh" || perror "Failed to source '${VBOX_BUILD_DIR}/env.sh'." kmk || perror "Failed to execute 'kmk'." } diff --git a/core/modules/vbox-src/module.conf.ubuntu b/core/modules/vbox-src/module.conf.ubuntu index da525135..477eb8a9 100644 --- a/core/modules/vbox-src/module.conf.ubuntu +++ b/core/modules/vbox-src/module.conf.ubuntu @@ -1,19 +1,22 @@ REQUIRED_INSTALLED_PACKAGES=" iasl + makeself libcurl4-openssl-dev + libdevmapper-dev libidl-dev libsdl1.2-dev libxml2-dev + libxmu-dev libxinerama-dev libxrandr-dev - $REQUIRED_INSTALLED_PACKAGES_X64 " -# These are required for building 32-bit guest additions on 64-bit systemd -REQUIRED_INSTALLED_PACKGES_X64=" - ia32-libs +# These are required for building 32-bit guest additions on 64-bit systems +REQUIRED_INSTALLED_PACKAGES_X64_X86=" libc6-dev-i386 lib32gcc1 lib32stdc++6 gcc-multilib g++-multilib " +[ "$(uname -m)x" = "x86_64x" ] && REQUIRED_INSTALLED_PACKAGES+="$REQUIRED_INSTALLED_PACKAGES_X64_X86" +true |