glibc:patch for gconv

Entware · Sep 17, 2020 · 0a006c9 · 0a006c9
1 parent 8ad5ea3
commit 0a006c9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=toolchain
 PKG_RELEASE:=3
 
 ifeq ($(CONFIG_USE_GLIBC),y)
-        PKG_RELEASE=10
+        PKG_RELEASE=11
 endif
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>

diff --git a/toolchain/glibc/patches/2.27/9999-gconvdir.patch b/toolchain/glibc/patches/2.27/9999-gconvdir.patch
@@ -0,0 +1,14 @@
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -197,7 +197,7 @@
+
+ # Where to install the shared object for charset transformation.
+ ifndef gconvdir
+-gconvdir = $(libdir)/gconv
++gconvdir = /opt/lib/gconv1
+ endif
+-inst_gconvdir = $(install_root)$(gconvdir)
++inst_gconvdir = $(install_root)/lib/gconv
+
+ # Where to install programs.
+ ifndef bindir