diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-extended/ghostscript/files/0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/ghostscript/files/0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/ghostscript/files/0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/files/0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch b/import-layers/yocto-poky/meta/recipes-extended/ghostscript/files/0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch new file mode 100644 index 000000000..fcfc479fb --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/ghostscript/files/0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch @@ -0,0 +1,48 @@ +From 3b43f93ec02611c4d554612953f5b64765b8683b Mon Sep 17 00:00:00 2001 +From: Chris Liddell <chris.liddell@artifex.com> +Date: Wed, 13 Jan 2016 02:14:55 -0500 +Subject: [PATCH 2/2] Bug 696497 (part 2): fix support for building with a JPX + decoder + +Author: Chris Liddell <chris.liddell@artifex.com> + +Upstream-Status: Backport +http://bugs.ghostscript.com/show_bug.cgi?id=696497 +http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=b0f5a975 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + base/lib.mak | 3 +++ + psi/int.mak | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/base/lib.mak b/base/lib.mak +index daa7056..8853dd5 100644 +--- a/base/lib.mak ++++ b/base/lib.mak +@@ -1774,6 +1774,9 @@ $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \ + $(gdebug_h) $(strimpl_h) $(sjpx_h) $(MAKEDIRS) + $(GLJASCC) $(GLO_)sjpx.$(OBJ) $(C_) $(GLSRC)sjpx.c + ++$(GLD)sjpx_.dev : $(LIB_MAK) $(ECHOGS_XE) $(LIB_MAK) $(MAKEDIRS) ++ $(SETMOD) $(GLD)sjpx_ ++ + # luratech version + sjpx_luratech=$(GLOBJ)sjpx_luratech.$(OBJ) + $(GLD)sjpx_luratech.dev : $(LIB_MAK) $(ECHOGS_XE) \ +diff --git a/psi/int.mak b/psi/int.mak +index f9d667d..db01b65 100644 +--- a/psi/int.mak ++++ b/psi/int.mak +@@ -1290,6 +1290,9 @@ $(PSD)jpx.dev : $(INT_MAK) $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev\ + $(MAKEDIRS) + $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev + ++$(PSD)jpx_.dev : $(ECHOGS_XE) $(INT_MAK) $(MAKEDIRS) ++ $(SETMOD) $(PSD)jpx_ ++ + fjpx_luratech=$(PSOBJ)zfjpx_luratech.$(OBJ) + + $(PSOBJ)zfjpx.$(OBJ) : $(PSSRC)zfjpx.c $(OP) $(memory__h)\ +-- +1.9.1 + |