On 2020/02/11 14:06, Sebastien Marie wrote:
> Hi,
> 
> It seems the latest update of www/newsboat removed an explicit version on libc
> to fallback to the one defined by the upstream. The problem is upstream is 
> using
> an old version which doesn't support OpenBSD sparc64.
> 
> The following diff restore it, and should make www/newsboat to build on 
> sparc64.
> 
> Comments or OK ?
> -- 
> Sebastien Marie
> 
> 
> diff 07b38a519612fa82bbc016498a210424b43b0eab 
> /data/semarie/repos/openbsd/ports
> blob - efa346af0b7511878e13ae6050bbc728d1b85ac3
> file + www/newsboat/Makefile
> --- www/newsboat/Makefile
> +++ www/newsboat/Makefile
> @@ -30,6 +30,7 @@ MODCARGO_BUILD =    No
>  MODCARGO_INSTALL =   No
>  MODCARGO_TEST =              No
>  
> +# keep libc >=0.2.63 for sparc64 support
>  MODCARGO_CRATES_UPDATE +=    libc
>  
>  MODCARGO_CRATES +=   aho-corasick    0.6.9   # Unlicense/MIT
> @@ -60,7 +61,7 @@ MODCARGO_CRATES +=  idna    0.1.5   # MIT/Apache-2.0
>  MODCARGO_CRATES +=   kernel32-sys    0.2.2   # MIT
>  MODCARGO_CRATES +=   lazy_static     0.2.11  # MIT/Apache-2.0
>  MODCARGO_CRATES +=   lazy_static     1.2.0   # MIT/Apache-2.0
> -MODCARGO_CRATES +=   libc    0.2.48  # MIT OR Apache-2.0
> +MODCARGO_CRATES +=   libc    0.2.63  # MIT OR Apache-2.0
>  MODCARGO_CRATES +=   libz-sys        1.0.17  # MIT/Apache-2.0
>  MODCARGO_CRATES +=   locale_config   0.2.2   # MIT
>  MODCARGO_CRATES +=   lock_api        0.1.5   # Apache-2.0/MIT

Maybe like this instead? Then it is more obvious that the output from
modcargo-gen-crates-licenses was modified.

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/newsboat/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile    23 Dec 2019 13:26:34 -0000      1.15
+++ Makefile    11 Feb 2020 15:40:39 -0000
@@ -4,6 +4,7 @@ COMMENT =       RSS/Atom feed reader for text 
 
 V =            2.18
 DISTNAME =     newsboat-$V
+REVISION =     0
 
 CATEGORIES =   www
 
@@ -30,7 +31,9 @@ MODCARGO_BUILD =      No
 MODCARGO_INSTALL =     No
 MODCARGO_TEST =                No
 
+# keep libc >=0.2.63 for sparc64 support
 MODCARGO_CRATES_UPDATE +=      libc
+MODCARGO_CRATES +=     libc    0.2.63  # MIT OR Apache-2.0
 
 MODCARGO_CRATES +=     aho-corasick    0.6.9   # Unlicense/MIT
 MODCARGO_CRATES +=     argon2rs        0.2.5   # MIT
@@ -60,7 +63,7 @@ MODCARGO_CRATES +=    idna    0.1.5   # MIT/Apac
 MODCARGO_CRATES +=     kernel32-sys    0.2.2   # MIT
 MODCARGO_CRATES +=     lazy_static     0.2.11  # MIT/Apache-2.0
 MODCARGO_CRATES +=     lazy_static     1.2.0   # MIT/Apache-2.0
-MODCARGO_CRATES +=     libc    0.2.48  # MIT OR Apache-2.0
+#MODCARGO_CRATES +=    libc    0.2.48  # MIT OR Apache-2.0
 MODCARGO_CRATES +=     libz-sys        1.0.17  # MIT/Apache-2.0
 MODCARGO_CRATES +=     locale_config   0.2.2   # MIT
 MODCARGO_CRATES +=     lock_api        0.1.5   # Apache-2.0/MIT
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/newsboat/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo    23 Dec 2019 13:26:34 -0000      1.11
+++ distinfo    11 Feb 2020 15:40:39 -0000
@@ -26,7 +26,7 @@ SHA256 (cargo/idna-0.1.5.tar.gz) = OPCeD
 SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) = 
dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0=
 SHA256 (cargo/lazy_static-0.2.11.tar.gz) = 
dvAzx61hRFxbNHxzgt0SN4R+sbzlkP5QNl3LM9VGvnM=
 SHA256 (cargo/lazy_static-1.2.0.tar.gz) = 
o3TIm521WJVFOnTB44hh2d7sCwG0BaglFunV3kgg3qE=
-SHA256 (cargo/libc-0.2.48.tar.gz) = 
6WLHZBAIrAEPpgp9/cFxJEnynETvLUcCOUrqlD7nUEc=
+SHA256 (cargo/libc-0.2.63.tar.gz) = 
15WDUCv/BSPhB8pE3TZv+AfGRCtKlMzvBDLH6E+FZYM=
 SHA256 (cargo/libz-sys-1.0.17.tar.gz) = 
ROu8dg/S0vTZPeCaDhPZfgV2EgUuhx2pmFzty0Uea9U=
 SHA256 (cargo/locale_config-0.2.2.tar.gz) = 
FPvuDjm8LdaiQnxP3qZumCbMH9CbCgt1UDWfX27+Has=
 SHA256 (cargo/lock_api-0.1.5.tar.gz) = 
YuvxOR9qytYOXItDcG3eRYLfdcBmmKtEUR0VAWvCRCw=
@@ -129,7 +129,7 @@ SIZE (cargo/idna-0.1.5.tar.gz) = 258735
 SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537
 SIZE (cargo/lazy_static-0.2.11.tar.gz) = 12361
 SIZE (cargo/lazy_static-1.2.0.tar.gz) = 10840
-SIZE (cargo/libc-0.2.48.tar.gz) = 353045
+SIZE (cargo/libc-0.2.63.tar.gz) = 437880
 SIZE (cargo/libz-sys-1.0.17.tar.gz) = 632674
 SIZE (cargo/locale_config-0.2.2.tar.gz) = 20975
 SIZE (cargo/lock_api-0.1.5.tar.gz) = 16967

Reply via email to