mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-11 09:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

ghostscript: fix and enable parallel build

Browse Source 
(From OE-Core rev: 065f4034698caaaab9c8076d3c7e4ebafb8a9353)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2015-01-29 17:33:35 -08:00
committed by Richard Purdie
parent 2d9763a1c8
commit 8d30c2a0b3
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch Normal file
View File

@@ -0,0 +1,40 @@
From be1e1b33191afdcfe3c2ecc4ff3e361a5859e9c6 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Fri, 30 Jan 2015 00:40:22 -0800
Subject: [PATCH] contrib.mak: fix for parallel build
Fixed:
rm: cannot remove `/usr/share/ghostscript/9.15/lib': Is a directory
Create lib before install to fix the race issue.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
contrib/contrib.mak | 2 ++
1 file changed, 2 insertions(+)
diff --git a/contrib/contrib.mak b/contrib/contrib.mak
index 08a80d1..de2e20d 100644
--- a/contrib/contrib.mak
+++ b/contrib/contrib.mak
@@ -947,6 +947,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h
$(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
extra-dmprt-install:
+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib
$(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
$(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
$(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
@@ -1088,6 +1089,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH)
### ----------------- Additional .upp files ---------------- ###
extra-upp-install:
+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib
for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \
$(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
done
--
1.7.9.5

6
meta/recipes-extended/ghostscript/ghostscript_9.15.bb
View File

@@ -24,6 +24,7 @@ SRC_URI = "${SRC_URI_BASE} \
file://objarch.h \
file://ghostscript-9.02-parallel-make.patch \
file://cups-no-gcrypt.patch \
file://ghostscript-9.15-parallel-make.patch \
"
SRC_URI_class-native = "${SRC_URI_BASE} \
@@ -101,8 +102,3 @@ do_install_class-native () {
}
BBCLASSEXTEND = "native"
# Ghostscript install tool 'instcopy' tries to remove already created
# directories during install and parallel make causes problems.
PARALLEL_MAKEINST=""