summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--groups/251.native_packages_lib.group5
-rw-r--r--patches/libiconv-1.16_pre.local.patch12
2 files changed, 16 insertions, 1 deletions
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index fc4683fd..30db45f9 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -4,7 +4,7 @@
GROUP_TARGET="native_packages";
NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
bearssl glib jansson lame libarchive libass libassuan libatomic_ops libdmtx libedit libeditline libelf libestr
-libevent libexif libfastjson libfetch libffi libfirm libflac libgcrypt libgpg_error libidn2 libite
+libevent libexif libfastjson libfetch libffi libfirm libflac libgcrypt libgpg_error libiconv libidn2 libite
libjpeg_turbo libksba libmad libmspack libmp3splt libogg libpcap libpipeline libpng libpsl
readline libredwg libressl libsasl2 libshine libsndfile libsolv libssh
libstrophe libtasn1 libtelnet libtheora libtirpc libudns libunistring
@@ -118,6 +118,9 @@ gcry_cv_visibility_attribute=yes"};
: ${PKG_LIBGPG_ERROR_URL:=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${PKG_LIBGPG_ERROR_VERSION}.tar.bz2};
: ${PKG_LIBGPG_ERROR_FORCE_AUTORECONF:=1};
: ${PKG_LIBGPG_ERROR_IN_TREE:=1};
+: ${PKG_LIBICONV_SHA256SUM:=e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04};
+: ${PKG_LIBICONV_VERSION:=1.16};
+: ${PKG_LIBICONV_URL:=https://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PKG_LIBICONV_VERSION}.tar.gz};
: ${PKG_LIBIDN2_DEPENDS:="libunistring"};
: ${PKG_LIBIDN2_SHA256SUM:=76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91};
: ${PKG_LIBIDN2_VERSION:=2.3.2};
diff --git a/patches/libiconv-1.16_pre.local.patch b/patches/libiconv-1.16_pre.local.patch
new file mode 100644
index 00000000..8a8f860f
--- /dev/null
+++ b/patches/libiconv-1.16_pre.local.patch
@@ -0,0 +1,12 @@
+diff -ru libiconv-1.16.orig/src/Makefile.in libiconv-1.16/src/Makefile.in
+--- libiconv-1.16.orig/src/Makefile.in 2019-01-27 23:07:13.000000000 +0100
++++ libiconv-1.16/src/Makefile.in 2021-11-21 02:07:16.220970962 +0100
+@@ -113,7 +113,7 @@
+ if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+ case "@host_os@" in \
+ hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
+- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/.libs/libiconv.so.2 @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
+ esac
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
+