Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 64fd25af5fea3a3c9c12122a2fd0fab3cd420f72 Mon Sep 17 00:00:00 2001 |
| 2 | From: asmitk01-in <asmitk01@in.ibm.com> |
| 3 | Date: Wed, 5 Feb 2020 00:14:42 -0600 |
| 4 | Subject: [PATCH] libmimetic: Removing test directory from the Makefile |
| 5 | |
| 6 | The test directory is removed as there were errors (relocation errors) |
| 7 | since the shared object files of libc++ and libc were not taken from the |
| 8 | sysroot path but from the system's library path where the required |
| 9 | version of the .so is not present. |
| 10 | |
| 11 | The files 'mimetic/codec/other_codecs.h' and 'mimetic/contenttype.cxx' |
| 12 | contains changes that resolves errors when compiling on target system |
| 13 | aarch64-yoe-linux-musl. |
| 14 | |
| 15 | Signed-off-by: asmitk01-in <asmitk01@in.ibm.com> |
| 16 | Change-Id: I1822b36ad4a1fa5e7b165d8cac3a6e96aca11c35 |
| 17 | --- |
| 18 | Makefile.am | 2 +- |
| 19 | mimetic/codec/other_codecs.h | 4 ++++ |
| 20 | mimetic/contenttype.cxx | 4 ++++ |
| 21 | 3 files changed, 9 insertions(+), 1 deletion(-) |
| 22 | |
| 23 | diff --git a/Makefile.am b/Makefile.am |
| 24 | index 634bd4c..c7cbae7 100644 |
| 25 | --- a/Makefile.am |
| 26 | +++ b/Makefile.am |
| 27 | @@ -1,6 +1,6 @@ |
| 28 | MAINTAINERCLEANFILES = Makefile Makefile.in config.cache |
| 29 | EXTRA_DIST=LICENSE m4 |
| 30 | -SUBDIRS = mimetic doc examples test win32 |
| 31 | +SUBDIRS = mimetic doc examples win32 |
| 32 | INCLUDES=-I$(top_srcdir) |
| 33 | ACLOCAL_AMFLAGS=-I m4 |
| 34 | |
| 35 | diff --git a/mimetic/codec/other_codecs.h b/mimetic/codec/other_codecs.h |
| 36 | index c4ccf3f..0fc88fd 100644 |
| 37 | --- a/mimetic/codec/other_codecs.h |
| 38 | +++ b/mimetic/codec/other_codecs.h |
| 39 | @@ -8,6 +8,10 @@ |
| 40 | #define _MIMETIC_CODEC_OTHER_CODECS_H_ |
| 41 | #include <mimetic/codec/codec_base.h> |
| 42 | |
| 43 | +#ifndef __GLIBC__ |
| 44 | + typedef unsigned int uint; |
| 45 | +#endif |
| 46 | + |
| 47 | namespace mimetic |
| 48 | { |
| 49 | |
| 50 | diff --git a/mimetic/contenttype.cxx b/mimetic/contenttype.cxx |
| 51 | index 522082d..0577d44 100644 |
| 52 | --- a/mimetic/contenttype.cxx |
| 53 | +++ b/mimetic/contenttype.cxx |
| 54 | @@ -13,6 +13,10 @@ |
| 55 | #include <mimetic/tokenizer.h> |
| 56 | #include <mimetic/utils.h> |
| 57 | |
| 58 | +#ifndef __GLIBC__ |
| 59 | + typedef unsigned int uint; |
| 60 | +#endif |
| 61 | + |
| 62 | namespace mimetic |
| 63 | { |
| 64 | using namespace std; |
| 65 | -- |
| 66 | 2.9.3 |
| 67 | |