diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-17 08:17:41 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-17 08:18:03 +0000 |
| commit | b608a8327f20bd38c068102da75f3591d178d31c (patch) | |
| tree | 7d2c5923cb3f1e6f63a41d036bacf709373c067e /testing/nx-libs | |
| parent | 484e6f932c3ce72e6de3242d9ac39bf3447056aa (diff) | |
| download | aports-b608a8327f20bd38c068102da75f3591d178d31c.tar.bz2 aports-b608a8327f20bd38c068102da75f3591d178d31c.tar.xz | |
testing/nx-libs: build fix for x86
Diffstat (limited to 'testing/nx-libs')
| -rw-r--r-- | testing/nx-libs/APKBUILD | 15 | ||||
| -rw-r--r-- | testing/nx-libs/fix-musl-headers-x86.patch | 11 |
2 files changed, 21 insertions, 5 deletions
diff --git a/testing/nx-libs/APKBUILD b/testing/nx-libs/APKBUILD index 2acb208b0..18df02083 100644 --- a/testing/nx-libs/APKBUILD +++ b/testing/nx-libs/APKBUILD @@ -13,7 +13,9 @@ makedepends="$depends_dev libx11-dev zlib-dev libjpeg-turbo-dev libpng-dev libfo install="" subpackages="$pkgname-dev $pkgname-doc" source="http://code.x2go.org/releases/source/$pkgname/$pkgname-$pkgver-full.tar.gz - xf86bigfont.patch" + xf86bigfont.patch + fix-musl-headers-x86.patch + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -37,13 +39,16 @@ build() { package() { cd "$_builddir" #find ./ -name Makefile | xargs sed -e 's#/usr/local#/usr#g' -i - make -j1 PREFIX=/usr DESTDIR="$pkgdir" USRLIBDIR=/usr/lib SHLIBDIR=/usr/lib install CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include" || return 1 + make PREFIX=/usr DESTDIR="$pkgdir" USRLIBDIR=/usr/lib SHLIBDIR=/usr/lib install CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include" || return 1 rm -f "$pkgdir"/usr/lib/*.la } md5sums="4c458d18885257da83677f7514620f01 nx-libs-3.5.0.30-full.tar.gz -6030f6b55bcd54be7a5f9c5e796d3759 xf86bigfont.patch" +6030f6b55bcd54be7a5f9c5e796d3759 xf86bigfont.patch +5f26a25ccc1d50693c0b4efe287a95f2 fix-musl-headers-x86.patch" sha256sums="60bf86a41f6e7a04a17d5fb471f77a37045c11e06e5e0786b3dc959bb6a3fc5a nx-libs-3.5.0.30-full.tar.gz -51dc9bad9cc410654bf6c657abdd1bfb2ec5e6e6349ffb701b39cc11e46d2c2e xf86bigfont.patch" +51dc9bad9cc410654bf6c657abdd1bfb2ec5e6e6349ffb701b39cc11e46d2c2e xf86bigfont.patch +a09d175c62e1ae6017e161ccb7ed56b38da26ad2fa95b74357c9e4e78034b56f fix-musl-headers-x86.patch" sha512sums="223c73de1b8988d17a555a7dd56c14ddc27855b7c1d9a9b28c053161a707520c1fcef697c3d9148222dae23e1465e72821455271477ac835d5cc63498b45e005 nx-libs-3.5.0.30-full.tar.gz -ee090f4e7f5933cbea6398ac461539cbdc8b7fd62f32934c78298c1e217d2a60e7f796bffdb88d36816bbfa9becd810846f5b988b5191e5a5b9da5def5d730fa xf86bigfont.patch" +ee090f4e7f5933cbea6398ac461539cbdc8b7fd62f32934c78298c1e217d2a60e7f796bffdb88d36816bbfa9becd810846f5b988b5191e5a5b9da5def5d730fa xf86bigfont.patch +d4a881b66f0258d6d9fb947a526868944e58217d534316dfa3f0837035415467a1e8841bf6c5b821ccedcc0c9e07b425f05243ddbd22aaec7ea2165c87d9211e fix-musl-headers-x86.patch" diff --git a/testing/nx-libs/fix-musl-headers-x86.patch b/testing/nx-libs/fix-musl-headers-x86.patch new file mode 100644 index 000000000..3f51b8e4b --- /dev/null +++ b/testing/nx-libs/fix-musl-headers-x86.patch @@ -0,0 +1,11 @@ +--- ./nx-X11/extras/Mesa/src/mesa/main/glheader.h.orig ++++ ./nx-X11/extras/Mesa/src/mesa/main/glheader.h +@@ -62,7 +62,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +-#if defined(__linux__) && defined(__i386__) ++#if defined(__GLIBC__) && defined(__i386__) + #include <fpu_control.h> + #endif + #endif |