diff options
| author | S. Davilla <davilla@4pi.com> | 2011-05-31 08:54:15 -0400 |
|---|---|---|
| committer | S. Davilla <davilla@4pi.com> | 2011-05-31 08:54:15 -0400 |
| commit | 8a248b00f495048185b7f3522630079ad845e568 (patch) | |
| tree | e2c87f52fdb58185c9cc2f94b6d11f8db0f48e70 /tools | |
| parent | f0947fd7a64319d51b1c3b3858c9851b48545760 (diff) | |
[ios] fixed darwin depends, ios sdk 4.3 needs stpncpy patch for gettext
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/darwin/depends/gettext/02-gettext-tools-stpncpy.patch | 12 | ||||
| -rw-r--r-- | tools/darwin/depends/gettext/Makefile | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/tools/darwin/depends/gettext/02-gettext-tools-stpncpy.patch b/tools/darwin/depends/gettext/02-gettext-tools-stpncpy.patch new file mode 100644 index 0000000000..cc01d2f0d4 --- /dev/null +++ b/tools/darwin/depends/gettext/02-gettext-tools-stpncpy.patch @@ -0,0 +1,12 @@ +diff -ur gettext-0.17.orig/gettext-tools/gnulib-lib/stpncpy.c gettext-0.17/gettext-tools/gnulib-lib/stpncpy.c +--- gettext-0.17.orig/gettext-tools/gnulib-lib/stpncpy.c 2007-10-07 23:29:35.000000000 +0300 ++++ gettext-0.17/gettext-tools/gnulib-lib/stpncpy.c 2011-03-11 23:34:40.000000000 +0200 +@@ -24,7 +24,7 @@ + #include <string.h> + + #ifndef weak_alias +-# define __stpncpy stpncpy ++//# define __stpncpy stpncpy + #endif + + /* Copy no more than N bytes of SRC to DST, returning a pointer past the diff --git a/tools/darwin/depends/gettext/Makefile b/tools/darwin/depends/gettext/Makefile index c31e901cde..26d6369a49 100644 --- a/tools/darwin/depends/gettext/Makefile +++ b/tools/darwin/depends/gettext/Makefile @@ -28,6 +28,9 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) echo $(SOURCE) > .gitignore cd $(SOURCE); patch -p0 <../01-gettext-tools-Makefile.in.patch + if [ "$(platform_sdk_version)" != "4.2" ]; then \ + cd $(SOURCE); patch -p1 <../02-gettext-tools-stpncpy.patch; \ + fi cd $(SOURCE); $(CONFIGURE) $(LIBDYLIB): $(SOURCE) |