diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-03-01 16:51:26 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2022-03-29 15:24:56 -0400 |
| commit | f8e4906de8e21b9affb9f901527d587eb31b68ff (patch) | |
| tree | 5cbe01f89ae34f69b8e7d842d4868f1355b96b22 /meta-agl-core-test/recipes-test/freetype/files/0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch | |
| parent | 79e2730b6a64aa4acbf0b78e805b945960f3d47c (diff) | |
meta-agl-core-test: Fix freetype-demos build
Update freetype bbappend and patches for building freetype-demos
with freetype 2.11 in poky master.
Bug-AGL: SPEC-3819
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I393cec758934786cfa1d9d261b7e069b4d7514b5
Diffstat (limited to 'meta-agl-core-test/recipes-test/freetype/files/0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch')
| -rw-r--r-- | meta-agl-core-test/recipes-test/freetype/files/0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/meta-agl-core-test/recipes-test/freetype/files/0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch b/meta-agl-core-test/recipes-test/freetype/files/0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch index 7803ad7e0..879b80506 100644 --- a/meta-agl-core-test/recipes-test/freetype/files/0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch +++ b/meta-agl-core-test/recipes-test/freetype/files/0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch @@ -8,23 +8,24 @@ Content-Transfer-Encoding: 8bit It is already known and imported through config.mk. +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> +[Updated for freetype 2.10.4] +Signed-off-by: Scott Murray <scott.murray@konsulko.com> --- - Makefile | 1 - - 1 file changed, 1 deletion(-) + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index a5d34bd..254aad4 100644 +index 851c4f7..c537983 100644 --- a/Makefile +++ b/Makefile -@@ -153,7 +153,6 @@ else +@@ -165,7 +165,7 @@ else ifeq ($(PLATFORM),unix) - CC = $(CCraw) -- LIBTOOL = $(OBJ_BUILD)/libtool - LINK_CMD = $(subst /,$(SEP),$(LIBTOOL)) \ - --mode=link $(CC) \ - $(subst /,$(COMPILER_SEP),$(LDFLAGS)) --- -2.1.4 - + override CC = $(CCraw) +- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \ ++ LINK_CMD = $(subst /,$(SEP),$(LIBTOOL)) \ + --mode=link $(CC) \ + $(subst /,$(COMPILER_SEP),$(LDFLAGS)) + LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME) |