diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-11-25 18:12:27 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-11-25 18:12:27 +0000 |
| commit | 392c6e5f4d69485f4492673d1fb45e62d762e175 (patch) | |
| tree | a51fae07de1288bea75126eed6bda5589907e7e4 | |
| parent | 203b8298b8857d15c4d8ba273c34c4412087b75c (diff) | |
| download | trousers-392c6e5f4d69485f4492673d1fb45e62d762e175.tar.gz | |
Link libtspi with libiconv
| -rw-r--r-- | debian/patches/iconv.patch | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/debian/patches/iconv.patch b/debian/patches/iconv.patch index ef82c32..a8cef09 100644 --- a/debian/patches/iconv.patch +++ b/debian/patches/iconv.patch @@ -1,7 +1,7 @@ Index: trousers/configure.in =================================================================== ---- trousers.orig/configure.in 2012-11-25 15:51:39.787964322 +0000 -+++ trousers/configure.in 2012-11-25 15:51:40.056309798 +0000 +--- trousers.orig/configure.in 2012-11-25 18:09:53.851511864 +0000 ++++ trousers/configure.in 2012-11-25 18:09:54.133033300 +0000 @@ -12,6 +12,7 @@ # compute $target AC_CANONICAL_TARGET @@ -10,7 +10,7 @@ Index: trousers/configure.in # Debugging support AC_ARG_ENABLE([debug], -@@ -348,6 +349,7 @@ +@@ -349,6 +350,7 @@ AC_DISABLE_STATIC AC_PROG_CC AC_PROG_LIBTOOL @@ -21,7 +21,7 @@ Index: trousers/configure.in Index: trousers/config.rpath =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ trousers/config.rpath 2012-11-25 15:51:40.059398451 +0000 ++++ trousers/config.rpath 2012-11-25 18:09:54.135783791 +0000 @@ -0,0 +1,672 @@ +#! /bin/sh +# Output a system dependent set of variables, describing how to set the @@ -697,8 +697,8 @@ Index: trousers/config.rpath +EOF Index: trousers/src/trspi/trousers.c =================================================================== ---- trousers.orig/src/trspi/trousers.c 2012-11-25 14:36:23.022902667 +0000 -+++ trousers/src/trspi/trousers.c 2012-11-25 15:55:41.300817664 +0000 +--- trousers.orig/src/trspi/trousers.c 2012-11-25 18:09:43.078743465 +0000 ++++ trousers/src/trspi/trousers.c 2012-11-25 18:09:54.145451906 +0000 @@ -1573,7 +1573,7 @@ ptr = (char *)string; errno = 0; @@ -717,3 +717,15 @@ Index: trousers/src/trspi/trousers.c } while (rc == (size_t)-1 && errno == E2BIG); /* add terminating bytes of the correct width */ +Index: trousers/src/tspi/Makefile.am +=================================================================== +--- trousers.orig/src/tspi/Makefile.am 2012-11-25 18:09:38.940850056 +0000 ++++ trousers/src/tspi/Makefile.am 2012-11-25 18:10:12.939207210 +0000 +@@ -1,6 +1,6 @@ + lib_LTLIBRARIES=libtspi.la + +-libtspi_la_LIBADD=${top_builddir}/src/trspi/libtrousers.la ++libtspi_la_LIBADD=${top_builddir}/src/trspi/libtrousers.la @LTLIBICONV@ + + # On setting -version-info, from the libtool manual: + # |