diff options
| author | Martin Lambers <marlam@marlam.de> | 2011-04-27 14:11:54 (GMT) |
|---|---|---|
| committer | Martin Lambers <marlam@marlam.de> | 2011-04-27 14:11:54 (GMT) |
| commit | e330c85907ad3fe482208382b06d42738aba177c (patch) | |
| tree | 48db61b556029dc90f7b51847e0f8636a8942070 /src | |
| parent | b74c8a76bebdc8498879eef6dc3d243b8ea0d4b4 (diff) | |
| download | mxe-e330c85907ad3fe482208382b06d42738aba177c.zip mxe-e330c85907ad3fe482208382b06d42738aba177c.tar.gz mxe-e330c85907ad3fe482208382b06d42738aba177c.tar.bz2 | |
package libidn: add "-liconv" to libidn.pc
This is necessary for static linking, as demonstrated by the test
program that this patch also adds.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libidn-1-fix-pc.patch | 14 | ||||
| -rw-r--r-- | src/libidn-test.c | 20 | ||||
| -rw-r--r-- | src/libidn.mk | 5 |
3 files changed, 39 insertions, 0 deletions
diff --git a/src/libidn-1-fix-pc.patch b/src/libidn-1-fix-pc.patch new file mode 100644 index 0000000..1a34401 --- /dev/null +++ b/src/libidn-1-fix-pc.patch @@ -0,0 +1,14 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Hack to use pkg-config with static linking. + +--- a/libidn.pc.in ++++ b/libidn.pc.in +@@ -19,5 +19,5 @@ + Description: IETF stringprep, nameprep, punycode, IDNA text processing. + URL: http://www.gnu.org/software/libidn/ + Version: @VERSION@ +-Libs: -L${libdir} -lidn ++Libs: -L${libdir} -lidn -liconv + Cflags: -I${includedir} diff --git a/src/libidn-test.c b/src/libidn-test.c new file mode 100644 index 0000000..24d9f0a --- /dev/null +++ b/src/libidn-test.c @@ -0,0 +1,20 @@ +/* This file is part of mingw-cross-env. */ +/* See doc/index.html for further information. */ + +#include <stdlib.h> +#include <idna.h> + +int main(int argc, char *argv[]) +{ + char *hostname_ascii; + + (void)argc; + (void)argv; + + if (idna_to_ascii_lz("www.google.com", &hostname_ascii, 0) == IDNA_SUCCESS) + { + free(hostname_ascii); + } + + return 0; +} diff --git a/src/libidn.mk b/src/libidn.mk index de4fcd3..80f9c5f 100644 --- a/src/libidn.mk +++ b/src/libidn.mk @@ -29,4 +29,9 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --with-libiconv-prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libidn.exe' \ + `'$(TARGET)-pkg-config' libidn --cflags --libs` endef |