commit a93ca5bc55adbb337309ea85de3c89d584c0c584 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Dec 8 23:15:22 2019 +1100 elilo: fix build diff --git a/elilo/.signature b/elilo/.signature index 024dc9c9b..f688f4db8 100644 --- a/elilo/.signature +++ b/elilo/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UOhTqebxkml0ExXwCLLxi53wLOMQ2M/KGw/F6P7jaRVDbJhGeJwy/awSvmgmrCqEiKJe+09QYAFOatAbf26xQw= -SHA256 (Pkgfile) = 32a2460df662410aea18f40b14b5ac322c4f47eeee2883a26e271585363b9c9f +RWSE3ohX2g5d/UrniTyen21dIpZdrBgKO4+TIq/ocFmUfmAzMvO2+m20wD5lypaijAvcUozkHlnQhWrsNWxDRJm/rbyMZI2gDg4= +SHA256 (Pkgfile) = ee592f58750d5af3e0260640bcd89de25df44bbf532f98cb2089d0eb473d38de SHA256 (.footprint) = 14b5a412144a3aa56ee80500beb67647f360cc8f50af0a7213fa83afd3072103 SHA256 (elilo-3.16-all.tar.gz) = 69e361d95c01ea2657200b2215464fc0235b01d3e317d2f2276284259b06d392 +SHA256 (elilo-3.16-strncpy-clash.patch) = c213ecd8097739a08f905749c951bcfba909b6be776734dfe69fe3432246baa1 diff --git a/elilo/Pkgfile b/elilo/Pkgfile index c3b3f298f..f2f65279c 100644 --- a/elilo/Pkgfile +++ b/elilo/Pkgfile @@ -5,8 +5,9 @@ name=elilo version=3.16 -release=1 -source=(https://downloads.sourceforge.net/project/$name/$name/$name-$version/$name-$...) +release=2 +source=(https://downloads.sourceforge.net/project/$name/$name/$name-$version/$name-$... + elilo-3.16-strncpy-clash.patch) build() { tar xzf elilo-$version-source.tar.gz @@ -15,6 +16,8 @@ build() { #sed -i 's|DEBUGFLAGS = -Wall|DEBUGFLAGS = -Wall -Wno-error|g' Make.defaults sed -i 's|dpkg-architecture -qDEB_BUILD_ARCH|uname -m|g' Make.defaults + patch -p1 -i $SRC/elilo-3.16-strncpy-clash.patch + make -j1 install -D elilo.efi $PKG/usr/share/elilo/elilo.efi install -D tools/eliloalt $PKG/usr/sbin/eliloalt diff --git a/elilo/elilo-3.16-strncpy-clash.patch b/elilo/elilo-3.16-strncpy-clash.patch new file mode 100644 index 000000000..fb2f6878b --- /dev/null +++ b/elilo/elilo-3.16-strncpy-clash.patch @@ -0,0 +1,23 @@ +gnu-efi-3.0.8 added StrnCpy. This caused conflict with elilo's definition: + ./../fs/../strops.h:30:16: error: conflicting types for 'StrnCpy' + extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count); + ^~~~~~~ + +Work it around by always using private copy. + +Reported-by: Bill Glessner +--- a/strops.h ++++ b/strops.h +@@ -29,3 +29,4 @@ + extern CHAR16 *StrChr(IN const CHAR16 *s, const CHAR16 c); ++#define StrnCpy elilo_StrnCpy + extern CHAR16 *StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, UINTN count); + extern CHAR8 *StrnXCpy(OUT CHAR8 *dst, IN const CHAR16 *src, UINTN count); +--- a/strops.c ++++ b/strops.c +@@ -27,4 +27,6 @@ + #include <efilib.h> + ++#include "strops.h" ++ + //#define CHAR_NULL (CHAR16)'\0'