diff options
| author | Florian Franzmann | 2010-04-01 11:04:39 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2010-04-01 11:04:39 +0200 |
| commit | d95db7692bb598f29d2d235d401ecf70f0530118 (patch) | |
| tree | 9840bcb0f441049712fcf8081ecd951cb7035b19 | |
| parent | 961c43c8f8d9eb6d33f0fb8ad47989d784734c2a (diff) | |
crypto/encfs: fixed build with gcc 4.4
| -rw-r--r-- | crypto/encfs/HISTORY | 4 | ||||
| -rwxr-xr-x | crypto/encfs/PRE_BUILD | 3 | ||||
| -rw-r--r-- | crypto/encfs/gcc4.4_fix | 13 |
3 files changed, 20 insertions, 0 deletions
diff --git a/crypto/encfs/HISTORY b/crypto/encfs/HISTORY index 4fba4167c8..6321983b0c 100644 --- a/crypto/encfs/HISTORY +++ b/crypto/encfs/HISTORY @@ -1,3 +1,7 @@ +2010-04-01 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * gcc4.4_fix, PRE_BUILD: added patch from ubuntu to fix build + with gcc 4.4 + 2008-10-08 Jeremy Blosser <jblosser-smgl@firinn.org> * DEPENDS: Now requires boost diff --git a/crypto/encfs/PRE_BUILD b/crypto/encfs/PRE_BUILD new file mode 100755 index 0000000000..a480a1da5d --- /dev/null +++ b/crypto/encfs/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd ${SOURCE_DIRECTORY} && +patch -p1 < ${SCRIPT_DIRECTORY}/gcc4.4_fix diff --git a/crypto/encfs/gcc4.4_fix b/crypto/encfs/gcc4.4_fix new file mode 100644 index 0000000000..687751503d --- /dev/null +++ b/crypto/encfs/gcc4.4_fix @@ -0,0 +1,13 @@ +Index: encfs-1.5.2/encfs/NameIO.cpp +=================================================================== +--- encfs-1.5.2.orig/encfs/NameIO.cpp 2009-09-12 23:25:14.968555890 +0200 ++++ encfs-1.5.2/encfs/NameIO.cpp 2009-09-12 23:25:30.576536972 +0200 +@@ -190,7 +190,7 @@ + } else + { + bool isDotFile = (*path == '.'); +- char *next = strchr( path, '/' ); ++ const char *next = strchr( path, '/' ); + int len = next ? next - path : strlen( path ); + + // at this point we know that len > 0 |