diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
| commit | 71e39ce025e46b17e9634cb8fdeec7af04f2f0fa (patch) | |
| tree | ab6569d59ab7f79ae8cb7c677658f9ba12854069 /testing/fuse/fuse-iconv.patch | |
| parent | 01fd4f6611dd2b61cd8ceee01b4a454d74bbbc51 (diff) | |
| parent | 692f71db5a7621fe29b255de3ef9ae973b74eacb (diff) | |
| download | aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.bz2 aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.xz | |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports-amanison
Conflicts:
main/iaxmodem/APKBUILD
Diffstat (limited to 'testing/fuse/fuse-iconv.patch')
| -rw-r--r-- | testing/fuse/fuse-iconv.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/testing/fuse/fuse-iconv.patch b/testing/fuse/fuse-iconv.patch deleted file mode 100644 index 4710f576f2..0000000000 --- a/testing/fuse/fuse-iconv.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 3eec119..c7414ac 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -11,8 +11,10 @@ else - mount_source = mount.c mount_util.c mount_util.h - endif - -+libfuse_la_LDFLAGS = - if ICONV - iconv_source = modules/iconv.c -+libfuse_la_LDFLAGS += -liconv - else - iconv_source = - endif -@@ -35,7 +37,7 @@ libfuse_la_SOURCES = \ - $(iconv_source) \ - $(mount_source) - --libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:1 \ -+libfuse_la_LDFLAGS += @libfuse_libs@ -version-number 2:8:1 \ - -Wl,--version-script,$(srcdir)/fuse_versionscript - - libulockmgr_la_SOURCES = ulockmgr.c |