diff mbox series

libidn2: Fix charset.alias issue with musl

Message ID 20180803173014.20748-1-raj.khem@gmail.com
State Accepted
Commit 3f3899e9e68aae2d43cd41e2f0760ac9da6e86e5
Headers show
Series libidn2: Fix charset.alias issue with musl | expand

Commit Message

Khem Raj Aug. 3, 2018, 5:30 p.m. UTC 
Fixes
ERROR: libidn2-2.0.5-r0 do_package: QA Issue: libidn2: Files/directories were installed but not shipped in any packag
e:
  /usr/lib/charset.alias
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or del
ete them within do_install.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...charset_alias-when-building-for-musl.patch | 23 +++++++++++++++++++
 meta/recipes-extended/libidn/libidn2_2.0.5.bb |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch

-- 
2.18.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Ross Burton Aug. 3, 2018, 6:16 p.m. UTC | #1 
Has that actually been fixed in gnulib yet?

Ross

On 3 August 2018 at 18:30, Khem Raj <raj.khem@gmail.com> wrote:
> Fixes

> ERROR: libidn2-2.0.5-r0 do_package: QA Issue: libidn2: Files/directories were installed but not shipped in any packag

> e:

>   /usr/lib/charset.alias

> Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or del

> ete them within do_install.

>

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>  ...charset_alias-when-building-for-musl.patch | 23 +++++++++++++++++++

>  meta/recipes-extended/libidn/libidn2_2.0.5.bb |  4 +++-

>  2 files changed, 26 insertions(+), 1 deletion(-)

>  create mode 100644 meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch

>

> diff --git a/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch

> new file mode 100644

> index 0000000000..ace50bbfde

> --- /dev/null

> +++ b/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch

> @@ -0,0 +1,23 @@

> +Unset need_charset_alias when building for musl

> +

> +localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4

> +which actually shoudl be fixed in gnulib and then all downstream

> +projects will get it eventually. For now we apply the fix to

> +coreutils

> +

> +Upstream-Status: Pending

> +

> +Signed-off-by: Khem Raj <raj.khem@gmail.com>

> +Index: libidn2-2.0.5/unistring/Makefile.am

> +===================================================================

> +--- libidn2-2.0.5.orig/unistring/Makefile.am

> ++++ libidn2-2.0.5/unistring/Makefile.am

> +@@ -293,7 +293,7 @@ install-exec-localcharset: all-local

> +         case '$(host_os)' in \

> +           darwin[56]*) \

> +             need_charset_alias=true ;; \

> +-          darwin* | cygwin* | mingw* | pw32* | cegcc*) \

> ++          darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \

> +             need_charset_alias=false ;; \

> +           *) \

> +             need_charset_alias=true ;; \

> diff --git a/meta/recipes-extended/libidn/libidn2_2.0.5.bb b/meta/recipes-extended/libidn/libidn2_2.0.5.bb

> index aaf9ecd7e7..0d7bddbc7f 100644

> --- a/meta/recipes-extended/libidn/libidn2_2.0.5.bb

> +++ b/meta/recipes-extended/libidn/libidn2_2.0.5.bb

> @@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ab90e75ef97cc6318ce4f2fbda62fe4d \

>                      file://src/idn2.c;endline=16;md5=0283aec28e049f5bcaaeee52aa865874 \

>                      file://lib/idn2.h.in;endline=27;md5=c2cd28d3f87260f157f022eabb83714f"

>

> -SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"

> +SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \

> +           file://Unset-need_charset_alias-when-building-for-musl.patch \

> +          "

>  SRC_URI[md5sum] = "eaf9a5b9d03b0cce3760f34b3124eb36"

>  SRC_URI[sha256sum] = "53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8"

>

> --

> 2.18.0

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj Aug. 3, 2018, 6:38 p.m. UTC | #2 
On Fri, Aug 3, 2018 at 11:17 AM Burton, Ross <ross.burton@intel.com> wrote:
>

> Has that actually been fixed in gnulib yet?

>


haven't check lately but few months back it is not fixed yet.

> Ross

>

> On 3 August 2018 at 18:30, Khem Raj <raj.khem@gmail.com> wrote:

> > Fixes

> > ERROR: libidn2-2.0.5-r0 do_package: QA Issue: libidn2: Files/directories were installed but not shipped in any packag

> > e:

> >   /usr/lib/charset.alias

> > Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or del

> > ete them within do_install.

> >

> > Signed-off-by: Khem Raj <raj.khem@gmail.com>

> > ---

> >  ...charset_alias-when-building-for-musl.patch | 23 +++++++++++++++++++

> >  meta/recipes-extended/libidn/libidn2_2.0.5.bb |  4 +++-

> >  2 files changed, 26 insertions(+), 1 deletion(-)

> >  create mode 100644 meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch

> >

> > diff --git a/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch

> > new file mode 100644

> > index 0000000000..ace50bbfde

> > --- /dev/null

> > +++ b/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch

> > @@ -0,0 +1,23 @@

> > +Unset need_charset_alias when building for musl

> > +

> > +localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4

> > +which actually shoudl be fixed in gnulib and then all downstream

> > +projects will get it eventually. For now we apply the fix to

> > +coreutils

> > +

> > +Upstream-Status: Pending

> > +

> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>

> > +Index: libidn2-2.0.5/unistring/Makefile.am

> > +===================================================================

> > +--- libidn2-2.0.5.orig/unistring/Makefile.am

> > ++++ libidn2-2.0.5/unistring/Makefile.am

> > +@@ -293,7 +293,7 @@ install-exec-localcharset: all-local

> > +         case '$(host_os)' in \

> > +           darwin[56]*) \

> > +             need_charset_alias=true ;; \

> > +-          darwin* | cygwin* | mingw* | pw32* | cegcc*) \

> > ++          darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \

> > +             need_charset_alias=false ;; \

> > +           *) \

> > +             need_charset_alias=true ;; \

> > diff --git a/meta/recipes-extended/libidn/libidn2_2.0.5.bb b/meta/recipes-extended/libidn/libidn2_2.0.5.bb

> > index aaf9ecd7e7..0d7bddbc7f 100644

> > --- a/meta/recipes-extended/libidn/libidn2_2.0.5.bb

> > +++ b/meta/recipes-extended/libidn/libidn2_2.0.5.bb

> > @@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ab90e75ef97cc6318ce4f2fbda62fe4d \

> >                      file://src/idn2.c;endline=16;md5=0283aec28e049f5bcaaeee52aa865874 \

> >                      file://lib/idn2.h.in;endline=27;md5=c2cd28d3f87260f157f022eabb83714f"

> >

> > -SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"

> > +SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \

> > +           file://Unset-need_charset_alias-when-building-for-musl.patch \

> > +          "

> >  SRC_URI[md5sum] = "eaf9a5b9d03b0cce3760f34b3124eb36"

> >  SRC_URI[sha256sum] = "53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8"

> >

> > --

> > 2.18.0

> >

> > --

> > _______________________________________________

> > Openembedded-core mailing list

> > Openembedded-core@lists.openembedded.org

> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox series

Patch

diff --git a/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch
new file mode 100644
index 0000000000..ace50bbfde
--- /dev/null
+++ b/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch
@@ -0,0 +1,23 @@ 
+Unset need_charset_alias when building for musl
+
+localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
+which actually shoudl be fixed in gnulib and then all downstream
+projects will get it eventually. For now we apply the fix to
+coreutils
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Index: libidn2-2.0.5/unistring/Makefile.am
+===================================================================
+--- libidn2-2.0.5.orig/unistring/Makefile.am
++++ libidn2-2.0.5/unistring/Makefile.am
+@@ -293,7 +293,7 @@ install-exec-localcharset: all-local
+ 	  case '$(host_os)' in \
+ 	    darwin[56]*) \
+ 	      need_charset_alias=true ;; \
+-	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++	    darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
+ 	      need_charset_alias=false ;; \
+ 	    *) \
+ 	      need_charset_alias=true ;; \
diff --git a/meta/recipes-extended/libidn/libidn2_2.0.5.bb b/meta/recipes-extended/libidn/libidn2_2.0.5.bb
index aaf9ecd7e7..0d7bddbc7f 100644
--- a/meta/recipes-extended/libidn/libidn2_2.0.5.bb
+++ b/meta/recipes-extended/libidn/libidn2_2.0.5.bb
@@ -9,7 +9,9 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=ab90e75ef97cc6318ce4f2fbda62fe4d \
                     file://src/idn2.c;endline=16;md5=0283aec28e049f5bcaaeee52aa865874 \
                     file://lib/idn2.h.in;endline=27;md5=c2cd28d3f87260f157f022eabb83714f"
 
-SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
+           file://Unset-need_charset_alias-when-building-for-musl.patch \
+          "
 SRC_URI[md5sum] = "eaf9a5b9d03b0cce3760f34b3124eb36"
 SRC_URI[sha256sum] = "53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8"