diff options
Diffstat (limited to 'meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch')
| -rw-r--r-- | meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch new file mode 100644 index 000000000..329637604 --- /dev/null +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | From 355c014573de7f95202cc7c819f81f0f230e4a1a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ting Liu <b28495@freescale.com> | ||
| 3 | Date: Mon, 18 Jun 2012 16:37:05 +0800 | ||
| 4 | Subject: [PATCH] skip checking LIB32 and LIB64 if they point to the same place | ||
| 5 | |||
| 6 | |||
| 7 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 8 | Signed-off-by: Ting Liu <b28495@freescale.com> | ||
| 9 | --- | ||
| 10 | Makefile | 22 +++++++++++----------- | ||
| 11 | 1 files changed, 11 insertions(+), 11 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/Makefile b/Makefile | ||
| 14 | index 1017950..bac5f01 100644 | ||
| 15 | --- a/Makefile | ||
| 16 | +++ b/Makefile | ||
| 17 | @@ -131,17 +131,17 @@ endif | ||
| 18 | |||
| 19 | # If TMPLIB64 is set, then sure we are not resolving LIB32 and LIB64 to the | ||
| 20 | # same place | ||
| 21 | -ifdef TMPLIB64 | ||
| 22 | - | ||
| 23 | -REALLIB32 = $(realpath $(PREFIX)/$(LIB32)) | ||
| 24 | -REALLIB64 = $(realpath $(PREFIX)/$(LIB64)) | ||
| 25 | -ifneq ($(realpath $(PREFIX)),) | ||
| 26 | -ifeq ($(REALLIB32),$(REALLIB64)) | ||
| 27 | -$(error LIB32 ($(PREFIX)/$(LIB32) to $(REALLIB32)) and LIB64 ($(PREFIX)/$(LIB64) to $(REALLIB64)) are resolving to the same place. Manually specify LIB32 and LIB64. e.g. make PREFIX=$(PREFIX) LIB32=lib32 LIB64=lib64) | ||
| 28 | -endif | ||
| 29 | -endif | ||
| 30 | - | ||
| 31 | -endif | ||
| 32 | +#ifdef TMPLIB64 | ||
| 33 | +# | ||
| 34 | +#REALLIB32 = $(realpath $(PREFIX)/$(LIB32)) | ||
| 35 | +#REALLIB64 = $(realpath $(PREFIX)/$(LIB64)) | ||
| 36 | +#ifneq ($(realpath $(PREFIX)),) | ||
| 37 | +#ifeq ($(REALLIB32),$(REALLIB64)) | ||
| 38 | +#$(error LIB32 ($(PREFIX)/$(LIB32) to $(REALLIB32)) and LIB64 ($(PREFIX)/$(LIB64) to $(REALLIB64)) are resolving to the same place. Manually specify LIB32 and LIB64. e.g. make PREFIX=$(PREFIX) LIB32=lib32 LIB64=lib64) | ||
| 39 | +#endif | ||
| 40 | +#endif | ||
| 41 | +# | ||
| 42 | +#endif | ||
| 43 | |||
| 44 | HEADERDIR = $(PREFIX)/include | ||
| 45 | LIBDIR32 = $(PREFIX)/$(LIB32) | ||
| 46 | -- | ||
| 47 | 1.7.0.4 | ||
| 48 | |||