mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-04 06:54:27 -05:00 
			
		
		
		
	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>
SVN-Revision: 46127
			
			
This commit is contained in:
		
							parent
							
								
									9b01282515
								
							
						
					
					
						commit
						a98549b8ec
					
				@ -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.
 | 
					# This is free software, licensed under the GNU General Public License v2.
 | 
				
			||||||
# See /LICENSE for more information.
 | 
					# See /LICENSE for more information.
 | 
				
			||||||
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
PKG_NAME:=libiconv-full
 | 
					PKG_NAME:=libiconv-full
 | 
				
			||||||
PKG_VERSION:=1.11.1
 | 
					PKG_VERSION:=1.11.1
 | 
				
			||||||
PKG_RELEASE:=1
 | 
					PKG_RELEASE:=2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 | 
					PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -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
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user