diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-12-17 14:36:08 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-17 14:36:08 +0000 |
| commit | 9e3938adb923253fc79611ea71fe4c23af243f2c (patch) | |
| tree | d413880a9e6b28e09ca5894bb47d208504ca0509 /main | |
| parent | 7e57a8a81d1ebb0be378f712c18e63f30c847145 (diff) | |
main/ntfs-3g: fix musl build, remove unneeded patch
Diffstat (limited to 'main')
| -rw-r--r-- | main/ntfs-3g/APKBUILD | 21 | ||||
| -rw-r--r-- | main/ntfs-3g/musl-fixes.patch | 20 | ||||
| -rw-r--r-- | main/ntfs-3g/nocxx.patch | 15 |
3 files changed, 37 insertions, 19 deletions
diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD index d657e14c6a6..a2d4d5631bc 100644 --- a/main/ntfs-3g/APKBUILD +++ b/main/ntfs-3g/APKBUILD @@ -2,22 +2,30 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ntfs-3g pkgver=2013.1.13 -pkgrel=0 +pkgrel=1 pkgdesc="A userspace ntfs driver with write support" url="http://www.tuxera.com/community/ntfs-3g-download/" arch="all" license="GPL" depends= -makedepends="attr-dev" +makedepends="attr-dev util-linux-dev" subpackages="$pkgname-doc $pkgname-dev" -source="http://tuxera.com/opensource/ntfs-3g_ntfsprogs-$pkgver.tgz" +source="http://tuxera.com/opensource/ntfs-3g_ntfsprogs-$pkgver.tgz + musl-fixes.patch + " _builddir="$srcdir"/ntfs-3g_ntfsprogs-$pkgver prepare() { cd "$_builddir" update_config_sub || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } + build() { cd "$_builddir" ./configure \ @@ -37,4 +45,9 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="2d6fb47ddf62b51733227126fe9227fe ntfs-3g_ntfsprogs-2013.1.13.tgz" +md5sums="2d6fb47ddf62b51733227126fe9227fe ntfs-3g_ntfsprogs-2013.1.13.tgz +cdfca9f0d20ef96ec60e072ffe4fd061 musl-fixes.patch" +sha256sums="4b383f0074a3ab7683339d1f18222b107aaeb4983db119292c43c2b275cefb27 ntfs-3g_ntfsprogs-2013.1.13.tgz +f60f15b5650ada189d880ffea0e199869b3d5e855913d353cab8b0b7ebc47ae4 musl-fixes.patch" +sha512sums="34cc930320a9a54df406d0fdd71154503bac1181b5642382fcb38fa8c51235fa252c74a5c1ab06019972a236bbd717b47d2acbc7581a747657e4f7a8f216d8bc ntfs-3g_ntfsprogs-2013.1.13.tgz +5b4680956f11c75ee3122923f36b840e2a0a38e6cebecbe7be4a02f4423746f8b7d7a89b16d7a9bea62e64534d20e87503beb582273af38d458b946387e85a02 musl-fixes.patch" diff --git a/main/ntfs-3g/musl-fixes.patch b/main/ntfs-3g/musl-fixes.patch new file mode 100644 index 00000000000..258588c7ce6 --- /dev/null +++ b/main/ntfs-3g/musl-fixes.patch @@ -0,0 +1,20 @@ +--- ntfs-3g_ntfsprogs-2013.1.13.orig/libfuse-lite/fusermount.c ++++ ntfs-3g_ntfsprogs-2013.1.13/libfuse-lite/fusermount.c +@@ -18,6 +18,7 @@ + #include <getopt.h> + #include <errno.h> + #include <fcntl.h> ++#include <paths.h> + #include <pwd.h> + + #ifdef __SOLARIS__ +--- ntfs-3g_ntfsprogs-2013.1.13.orig/libfuse-lite/mount_util.c ++++ ntfs-3g_ntfsprogs-2013.1.13/libfuse-lite/mount_util.c +@@ -14,6 +14,7 @@ + #include <string.h> + #include <dirent.h> + #include <errno.h> ++#include <paths.h> + #include <limits.h> + #include <sys/stat.h> + #include <sys/wait.h> diff --git a/main/ntfs-3g/nocxx.patch b/main/ntfs-3g/nocxx.patch deleted file mode 100644 index beb1ab9006b..00000000000 --- a/main/ntfs-3g/nocxx.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure 2004-12-07 21:34:23.205172545 +0000 -+++ b/configure 2004-12-07 21:37:17.726654782 +0000 -@@ -5148,10 +5148,8 @@ - : - else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+See \`config.log' for more details." >&5;} -+ { echo "C++ sucks, ignoring ..." >&5; }; } - fi - - ac_ext=cc |