summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2017-03-14 12:51:30 -0700
committerMike Frysinger <vapier@gentoo.org>2017-03-14 12:51:37 -0700
commit93aa5321b95cd8d36c100135a4394d7682fc41ad (patch)
tree5326f292db8f7aad1daa82d9d5c496b0f4be6770 /net-dns/libidn2
parentsys-apps/man-pages: Removed old. (diff)
downloadgentoo-93aa5321b95cd8d36c100135a4394d7682fc41ad.tar.gz
gentoo-93aa5321b95cd8d36c100135a4394d7682fc41ad.tar.bz2
gentoo-93aa5321b95cd8d36c100135a4394d7682fc41ad.zip
net-dns/libidn2: get cross-compiling working
Diffstat (limited to 'net-dns/libidn2')
-rw-r--r--net-dns/libidn2/files/libidn2-0.16-cross.patch28
-rw-r--r--net-dns/libidn2/libidn2-0.16-r1.ebuild1
2 files changed, 29 insertions, 0 deletions
diff --git a/net-dns/libidn2/files/libidn2-0.16-cross.patch b/net-dns/libidn2/files/libidn2-0.16-cross.patch
new file mode 100644
index 000000000000..bf963e9f4673
--- /dev/null
+++ b/net-dns/libidn2/files/libidn2-0.16-cross.patch
@@ -0,0 +1,28 @@
+https://gitlab.com/jas/libidn2/issues/6
+
+the release ships with this source file, so don't regen it on every build.
+doing so breaks cross-compilation currently.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -66,7 +66,8 @@
+ noinst_PROGRAMS = gentr46map
+ gentr46map_LDADD = $(LTLIBUNISTRING)
+
+-tr46map_data.c: gentr46map.c gentr46map$(EXEEXT) $(TR46MAP) $(NFCQC)
++tr46map_data.c: $(srcdir)/gentr46map.c $(TR46MAP) $(NFCQC)
++ $(MAKE) gentr46map$(EXEEXT)
+ $(builddir)/gentr46map$(EXEEXT) > $@.new
+ mv $@.new $@
+
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -34,7 +34,7 @@
+ dist_man_MANS = idn2.1 $(gdoc_MANS)
+ CLEANFILES = $(dist_man_MANS) lookup.c register.c stamp-vti version.texi $(srcdir)/libidn2.info
+
+-idn2.1: $(top_srcdir)/src/idn2.c $(top_srcdir)/src/idn2.ggo $(top_srcdir)/configure.ac
++idn2.1: $(top_srcdir)/src/idn2.c $(top_srcdir)/src/idn2.ggo
+ $(HELP2MAN) \
+ --name="Libidn2 Internationalized Domain Names (IDNA2008/TR46) conversion" \
+ --output=$@ \
diff --git a/net-dns/libidn2/libidn2-0.16-r1.ebuild b/net-dns/libidn2/libidn2-0.16-r1.ebuild
index a3e7f5ac34d0..b112877f4100 100644
--- a/net-dns/libidn2/libidn2-0.16-r1.ebuild
+++ b/net-dns/libidn2/libidn2-0.16-r1.ebuild
@@ -28,6 +28,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.12-Werror.patch
"${FILESDIR}"/${PN}-0.12-examples.patch
"${FILESDIR}"/${PN}-0.16-gengetopt.patch
+ "${FILESDIR}"/${PN}-0.16-cross.patch
"${FILESDIR}"/${PN}-pkgconfig.diff
)