Re: [Minios-devel] [UNIKRAFT/LWIP PATCH v2 3/5] patches: Declare mem_* functions only for lwip internal use

[Felipe Huici <Felipe.Huici@xxxxxxxxx>]

Hi Costin,

Unfortunately this patch (the patch within it) still fails to apply:

[...]
  UNZIP   liblwip: lwip-2.1.2.zip
  PATCH   liblwip: 0001-timeval-for-socket-c.patch
  PATCH   liblwip: 
0002-Don-t-provide-file-status-flags-when-we-have-a-libc.patch
  PATCH   liblwip: 0003-Declare-mem_-functions-only-for-lwip-internal-use.patch
1 out of 1 hunk FAILED -- saving rejects to file src/include/lwip/mem.h.rej
[...]

-- Felipe


On 16.08.19, 09:09, "Costin Lupu" <costin.lupu@xxxxxxxxx> wrote:

    Openssl has its own mem_* functions declarations, which differ from the lwip
    ones. Therefore we enable the lwip declarations only for lwip code.
    
    Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
    ---
     Makefile.uk                                   |  2 ++
     ...functions-only-for-lwip-internal-use.patch | 31 +++++++++++++++++++
     2 files changed, 33 insertions(+)
     create mode 100644 
patches/0003-Declare-mem_-functions-only-for-lwip-internal-use.patch
    
    diff --git a/Makefile.uk b/Makefile.uk
    index 675d52e..5249df1 100644
    --- a/Makefile.uk
    +++ b/Makefile.uk
    @@ -65,6 +65,8 @@ CXXINCLUDES-$(CONFIG_LIBLWIP) += 
-I$(LIBLWIP_BASE)/include -I$(LIBLWIP_EXTRACTED
     
################################################################################
     LIBLWIP_CFLAGS-y += -Wno-type-limits -Wunused-parameter
     LIBLWIP_CFLAGS-$(CONFIG_LWIP_DEBUG) += -DUK_DEBUG
    +LIBLWIP_CFLAGS-y   += -D__IN_LIBLWIP__
    +LIBLWIP_CXXFLAGS-y += -D__IN_LIBLWIP__
     
     
################################################################################
     # Core
    diff --git 
a/patches/0003-Declare-mem_-functions-only-for-lwip-internal-use.patch 
b/patches/0003-Declare-mem_-functions-only-for-lwip-internal-use.patch
    new file mode 100644
    index 0000000..45f8920
    --- /dev/null
    +++ b/patches/0003-Declare-mem_-functions-only-for-lwip-internal-use.patch
    @@ -0,0 +1,31 @@
    +From f9306780b544b45cdb091695b486ba56a892e70d Mon Sep 17 00:00:00 2001
    +From: Costin Lupu <costin.lup@xxxxxxxxx>
    +Date: Fri, 2 Aug 2019 13:21:19 +0200
    +Subject: [UNIKRAFT PATCH] Declare mem_* functions only for lwip internal 
use
    +
    +Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
    +---
    + src/include/lwip/mem.h | 2 ++
    + 1 file changed, 2 insertions(+)
    +
    +diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h
    +index 424de91..dbb5230 100644
    +--- a/src/include/lwip/mem.h
    ++++ b/src/include/lwip/mem.h
    +@@ -69,11 +69,13 @@ typedef u16_t mem_size_t;
    + #endif /* MEM_SIZE > 64000 */
    + #endif
    + 
    ++#ifdef __IN_LIBLWIP__
    + void  mem_init(void);
    + void *mem_trim(void *mem, mem_size_t size);
    + void *mem_malloc(mem_size_t size);
    + void *mem_calloc(mem_size_t count, mem_size_t size);
    + void  mem_free(void *mem);
    ++#endif
    + 
    + #ifdef __cplusplus
    + }
    +-- 
    +2.20.1
    +
    -- 
    2.20.1
    
    

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel