diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-06-25 12:13:57 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-06-25 12:13:57 +0000 |
| commit | af1973bb573f724a3e3e2c35db8c28b46ff1da44 (patch) | |
| tree | 628f1c11521f6e0e20b40830e8952209116abd46 /package/libs | |
| parent | 34d431976bea6eb6df4756566f6084a382e40ad2 (diff) | |
| download | master-187ad058-af1973bb573f724a3e3e2c35db8c28b46ff1da44.tar.gz master-187ad058-af1973bb573f724a3e3e2c35db8c28b46ff1da44.tar.bz2 master-187ad058-af1973bb573f724a3e3e2c35db8c28b46ff1da44.zip | |
libiconv-full: fix build with fortify source
Avoid redefining `realpath` to fix the following error:
.../include/fortify/stdlib.h:36:13: error: 'realpath' undeclared here (not in a function)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46127 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs')
| -rw-r--r-- | package/libs/libiconv-full/Makefile | 4 | ||||
| -rw-r--r-- | package/libs/libiconv-full/patches/300-fortify-source-compat.patch | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/package/libs/libiconv-full/Makefile b/package/libs/libiconv-full/Makefile index 75bca83348..997cce2365 100644 --- a/package/libs/libiconv-full/Makefile +++ b/package/libs/libiconv-full/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libiconv-full PKG_VERSION:=1.11.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> diff --git a/package/libs/libiconv-full/patches/300-fortify-source-compat.patch b/package/libs/libiconv-full/patches/300-fortify-source-compat.patch new file mode 100644 index 0000000000..e7e92235e5 --- /dev/null +++ b/package/libs/libiconv-full/patches/300-fortify-source-compat.patch @@ -0,0 +1,23 @@ +--- a/m4/canonicalize.m4 ++++ b/m4/canonicalize.m4 +@@ -11,8 +11,6 @@ AC_DEFUN([gl_CANONICALIZE], + AC_CHECK_FUNCS(canonicalize_file_name) + if test $ac_cv_func_canonicalize_file_name = no; then + AC_LIBOBJ(canonicalize) +- AC_DEFINE([realpath], [rpl_realpath], +- [Define to a replacement function name for realpath().]) + gl_PREREQ_CANONICALIZE + fi + ]) +--- a/configure ++++ b/configure +@@ -35532,9 +35532,6 @@ done + if test $ac_cv_func_canonicalize_file_name = no; then + SRCLIBOBJS="$SRCLIBOBJS canonicalize.$ac_objext" + +-cat >>confdefs.h <<\_ACEOF +-#define realpath rpl_realpath +-_ACEOF + + + |