diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-12-03 12:06:18 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-12-03 12:07:38 +0000 |
| commit | 0871bca89154139cf993255158a0e6bb1b763958 (patch) | |
| tree | 725c6d7a7b8947cd1c652e03890571920dfb6bed /main/qt5-qtbase | |
| parent | 545977c1fde1dadc99987aedc2912d93243c28a9 (diff) | |
| download | aports-0871bca89154139cf993255158a0e6bb1b763958.tar.bz2 aports-0871bca89154139cf993255158a0e6bb1b763958.tar.xz | |
main/qt5-qtbase: fix arm build
-reduce-relocations is not supported and causes build failure.
pkgrel does not need bump as only non-building armhf is affected.
Diffstat (limited to 'main/qt5-qtbase')
| -rw-r--r-- | main/qt5-qtbase/APKBUILD | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/main/qt5-qtbase/APKBUILD b/main/qt5-qtbase/APKBUILD index 6810bccbdf..33bf4bbfd5 100644 --- a/main/qt5-qtbase/APKBUILD +++ b/main/qt5-qtbase/APKBUILD @@ -72,7 +72,15 @@ prepare() { } build() { + local _arch + cd "$_builddir" + + case "$CTARGET" in + arm*) _arch="";; + *) _arch="-reduce-relocations";; + esac + ./configure -confirm-license -opensource \ -archdatadir /usr/lib/qt5 \ -datadir /usr/share/qt5 \ @@ -98,7 +106,6 @@ build() { -plugin-sql-tds \ -plugindir /usr/lib/qt5/plugins \ -prefix /usr \ - -reduce-relocations \ -silent \ -sysconfdir /etc \ -system-libjpeg \ @@ -108,6 +115,7 @@ build() { -system-xcb \ -system-zlib \ -translationdir /usr/share/qt5/translations \ + $_arch \ || return 1 make || return 1 } |