diff options
Diffstat (limited to 'meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch')
| -rw-r--r-- | meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch deleted file mode 100644 index 676fa8a7af..0000000000 --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch +++ /dev/null | |||
| @@ -1,75 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 2 | |||
| 3 | |||
| 4 | fix the below error: | ||
| 5 | ERROR: QA Issue: libhugetlbfs: Files/directories were installed but not shipped | ||
| 6 | /usr/lib64 | ||
| 7 | /usr/lib64/libhugetlbfs.so | ||
| 8 | /usr/lib64/libhugetlbfs.a | ||
| 9 | /usr/lib64/libhugetlbfs_privutils.so | ||
| 10 | /usr/lib64/perl5 | ||
| 11 | /usr/lib64/perl5/TLBC | ||
| 12 | /usr/lib64/perl5/TLBC/PerfCollect.pm | ||
| 13 | /usr/lib64/perl5/TLBC/Report.pm | ||
| 14 | /usr/lib64/perl5/TLBC/DataCollect.pm | ||
| 15 | /usr/lib64/perl5/TLBC/OpCollect.pm | ||
| 16 | $<50>ERROR: QA run found fatal errors. Please consider fixing them. | ||
| 17 | |||
| 18 | |||
| 19 | Signed-off-by: Guo Chunrong <B40290@freescale.com> | ||
| 20 | |||
| 21 | --- a/Makefile 2013-09-23 02:28:57.340566998 -0500 | ||
| 22 | +++ b/Makefile 2013-09-23 02:31:05.344569896 -0500 | ||
| 23 | @@ -33,7 +33,6 @@ | ||
| 24 | CPPFLAGS += -D__LIBHUGETLBFS__ -DPPC_NO_SEGMENTS | ||
| 25 | |||
| 26 | ARCH = $(shell uname -m | sed -e s/i.86/i386/) | ||
| 27 | -CC = gcc | ||
| 28 | |||
| 29 | CUSTOM_LDSCRIPTS = yes | ||
| 30 | |||
| 31 | @@ -59,9 +58,9 @@ | ||
| 32 | CUSTOM_LDSCRIPTS = no | ||
| 33 | else | ||
| 34 | ifeq ($(ARCH),aarch64) | ||
| 35 | -CC64 = gcc | ||
| 36 | +CC64 = $(CC) | ||
| 37 | ELF64 = aarch64elf | ||
| 38 | -TMPLIB64 = lib64 | ||
| 39 | +TMPLIB64 = lib | ||
| 40 | CUSTOM_LDSCRIPTS = no | ||
| 41 | else | ||
| 42 | ifeq ($(ARCH),i386) | ||
| 43 | @@ -72,7 +71,7 @@ | ||
| 44 | ifeq ($(ARCH),x86_64) | ||
| 45 | CC64 = $(CC) -m64 | ||
| 46 | ELF64 = elf_x86_64 | ||
| 47 | -TMPLIB64 = lib64 | ||
| 48 | +TMPLIB64 = lib | ||
| 49 | TMPLIB32 = lib | ||
| 50 | ifneq ($(BUILDTYPE),NATIVEONLY) | ||
| 51 | CC32 = $(CC) -m32 | ||
| 52 | @@ -172,11 +171,23 @@ | ||
| 53 | BINDIR = $(PREFIX)/share/libhugetlbfs | ||
| 54 | EXEDIR = $(PREFIX)/bin | ||
| 55 | DOCDIR = $(PREFIX)/share/doc/libhugetlbfs | ||
| 56 | + | ||
| 57 | ifdef CC32 | ||
| 58 | PMDIR = $(PREFIX)/lib/perl5/TLBC | ||
| 59 | +endif | ||
| 60 | + | ||
| 61 | +ifdef CC64 | ||
| 62 | +ifeq ($(ARCH),x86_64) | ||
| 63 | +PMDIR = $(PREFIX)/lib/perl5/TLBC | ||
| 64 | +else | ||
| 65 | +ifeq ($(ARCH),aarch64) | ||
| 66 | +PMDIR = $(PREFIX)/lib/perl5/TLBC | ||
| 67 | else | ||
| 68 | PMDIR = $(PREFIX)/lib64/perl5/TLBC | ||
| 69 | endif | ||
| 70 | +endif | ||
| 71 | +endif | ||
| 72 | + | ||
| 73 | MANDIR1 = $(PREFIX)/share/man/man1 | ||
| 74 | MANDIR3 = $(PREFIX)/share/man/man3 | ||
| 75 | MANDIR7 = $(PREFIX)/share/man/man7 | ||
