diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-09 18:20:38 +0200 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-09 18:24:36 +0200 |
commit | 99cef05b4c32c401868c7f487784130e607ca74c (patch) | |
tree | 21c978e2209cddafd44e8b850eaa53dde7ed7553 /meta-agl-profile-core/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch | |
parent | 0f1670b4b635d54c744a3e697be169957f321808 (diff) | |
parent | ffa9f4476251778974c77e35d924c20b29bf2792 (diff) |
Merge remote-tracking branch 'origin/sandbox/sdesneux/thud-upgrade'
Update the core distro to YP 2.6 'thud'.
Bug-AGL: SPEC-1837
Change-Id: I5a753503c4ca15bcb0d4f0f30c4a91e7d50ab024
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-profile-core/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch')
-rw-r--r-- | meta-agl-profile-core/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-agl-profile-core/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch b/meta-agl-profile-core/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch index 1f3acf28e..4d0d09aea 100644 --- a/meta-agl-profile-core/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch +++ b/meta-agl-profile-core/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch @@ -1,7 +1,7 @@ -diff -urN /tmp/ft2demos-2.6.orig/Makefile /tmp/ft2demos-2.6/Makefile ---- ft2demos-2.6.orig/Makefile 2015-06-07 07:34:19.000000000 +0000 -+++ ft2demos-2.6/Makefile 2016-06-17 14:25:37.640456725 +0000 -@@ -153,7 +153,8 @@ +diff -ur ft2demos-2.9.1.orig/Makefile ft2demos-2.9.1/Makefile +--- ft2demos-2.9.1.orig/Makefile 2018-04-22 05:41:50.000000000 -0400 ++++ ft2demos-2.9.1/Makefile 2019-02-18 23:28:59.794678736 -0500 +@@ -163,7 +163,8 @@ ifeq ($(PLATFORM),unix) CC = $(CCraw) @@ -10,8 +10,8 @@ diff -urN /tmp/ft2demos-2.6.orig/Makefile /tmp/ft2demos-2.6/Makefile + LINK_CMD = $(subst /,$(SEP),$(LIBTOOL)) \ --mode=link $(CC) \ $(subst /,$(COMPILER_SEP),$(LDFLAGS)) - LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) -@@ -279,12 +280,12 @@ + LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME) +@@ -289,12 +290,12 @@ ttdebug # Comment out the next line if you don't have a graphics subsystem. |