Author: jow
Date: 2015-06-25 14:13:57 +0200 (Thu, 25 Jun 2015)
New Revision: 46127
Added:
trunk/package/libs/libiconv-full/patches/300-fortify-source-compat.patch
Modified:
trunk/package/libs/libiconv-full/Makefile
Log:
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 <[email protected]>
Modified: trunk/package/libs/libiconv-full/Makefile
===================================================================
--- trunk/package/libs/libiconv-full/Makefile 2015-06-25 11:20:39 UTC (rev
46126)
+++ trunk/package/libs/libiconv-full/Makefile 2015-06-25 12:13:57 UTC (rev
46127)
@@ -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 @@
PKG_NAME:=libiconv-full
PKG_VERSION:=1.11.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MAINTAINER:=Jo-Philipp Wich <[email protected]>
Added: trunk/package/libs/libiconv-full/patches/300-fortify-source-compat.patch
===================================================================
--- trunk/package/libs/libiconv-full/patches/300-fortify-source-compat.patch
(rev 0)
+++ trunk/package/libs/libiconv-full/patches/300-fortify-source-compat.patch
2015-06-25 12:13:57 UTC (rev 46127)
@@ -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
+
+
+
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
