mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-12 05:11:59 +00:00
Armin Kuster
a7318f33e8
WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file Makefile.in
Hunk #1 succeeded at 18 with fuzz 1.
Hunk #2 succeeded at 150 (offset -1 lines).
checking file examples/Makefile.in
checking file lib/Makefile.in
checking file lib/t1lib/Makefile.in
checking file lib/type1/Makefile.in
checking file type1afm/Makefile.in
checking file xglyph/Makefile.in
Signed-off-by: Armin Kuster <akuster808@gmail.com>
145 lines
3.3 KiB
Diff
145 lines
3.3 KiB
Diff
From bab41f5e1fc1fc809da1371e6a0222e0eb21e5f0 Mon Sep 17 00:00:00 2001
|
|
From: Koen Kooi <koen@dominion.thruhere.net>
|
|
Date: Mon, 21 Nov 2011 12:00:54 +0100
|
|
Subject: [PATCH] t1lib: add 5.1.2
|
|
|
|
#
|
|
# Patch managed by http://www.holgerschurig.de/patcher.html
|
|
#
|
|
|
|
---
|
|
Makefile.in | 5 +++--
|
|
examples/Makefile.in | 5 +++--
|
|
lib/Makefile.in | 6 ++++--
|
|
lib/t1lib/Makefile.in | 6 ++++--
|
|
lib/type1/Makefile.in | 6 ++++--
|
|
type1afm/Makefile.in | 6 ++++--
|
|
xglyph/Makefile.in | 6 ++++--
|
|
7 files changed, 26 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 29c3468..396c020 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -18,7 +18,8 @@
|
|
# Last modified: 2005-05-01
|
|
#
|
|
|
|
-SHELL = /bin/sh
|
|
+SHELL = @SHELL@
|
|
+LIBTOOL = @LIBTOOL@
|
|
CC = @CC@
|
|
CPP = @CPP@
|
|
CFLAGS = @CFLAGS@
|
|
@@ -149,7 +150,7 @@ distclean: clean
|
|
$(RM) examples/Makefile
|
|
$(RM) xglyph/Makefile
|
|
$(RM) doc/Makefile
|
|
- $(RM) libtool
|
|
+ $(RM) $(LIBTOOL)
|
|
|
|
|
|
# The following two targets are for building and cleaning the python-
|
|
diff --git a/examples/Makefile.in b/examples/Makefile.in
|
|
index b301db5..7a6a514 100644
|
|
--- a/examples/Makefile.in
|
|
+++ b/examples/Makefile.in
|
|
@@ -14,9 +14,10 @@
|
|
# Last modified: 2001-04-01
|
|
#
|
|
|
|
+top_builddir = @top_builddir@
|
|
|
|
-LIBTOOL = ../libtool
|
|
-SHELL = /bin/sh
|
|
+LIBTOOL = @LIBTOOL@
|
|
+SHELL = @SHELL@
|
|
CC = @CC@
|
|
CPP = @CPP@
|
|
CFLAGS = @CFLAGS@
|
|
diff --git a/lib/Makefile.in b/lib/Makefile.in
|
|
index 89e5e86..6e0f960 100644
|
|
--- a/lib/Makefile.in
|
|
+++ b/lib/Makefile.in
|
|
@@ -15,8 +15,10 @@
|
|
#
|
|
# Contributions by H.Kakugawa to use libtool!
|
|
|
|
-LIBTOOL = ../libtool
|
|
-SHELL = /bin/sh
|
|
+top_builddir = @top_builddir@
|
|
+
|
|
+LIBTOOL = @LIBTOOL@
|
|
+SHELL = @SHELL@
|
|
CC = @CC@
|
|
CPP = @CPP@
|
|
CFLAGS = @CFLAGS@
|
|
diff --git a/lib/t1lib/Makefile.in b/lib/t1lib/Makefile.in
|
|
index a6c2478..32434b3 100644
|
|
--- a/lib/t1lib/Makefile.in
|
|
+++ b/lib/t1lib/Makefile.in
|
|
@@ -14,8 +14,10 @@
|
|
#
|
|
# Modified by H.Kakugawa to use libtool
|
|
|
|
-LIBTOOL = ../../libtool
|
|
-SHELL = /bin/sh
|
|
+top_builddir = @top_builddir@
|
|
+
|
|
+LIBTOOL = @LIBTOOL@
|
|
+SHELL = @SHELL@
|
|
CC = @CC@
|
|
CPP = @CPP@
|
|
CFLAGS = @CFLAGS@
|
|
diff --git a/lib/type1/Makefile.in b/lib/type1/Makefile.in
|
|
index 241f124..42efa94 100644
|
|
--- a/lib/type1/Makefile.in
|
|
+++ b/lib/type1/Makefile.in
|
|
@@ -14,8 +14,10 @@
|
|
#
|
|
# Modified by H.Kakugawa to use libtool
|
|
|
|
-LIBTOOL = ../../libtool
|
|
-SHELL = /bin/sh
|
|
+top_builddir = @top_builddir@
|
|
+
|
|
+LIBTOOL = @LIBTOOL@
|
|
+SHELL = @SHELL@
|
|
CC = @CC@
|
|
CPP = @CPP@
|
|
CFLAGS = @CFLAGS@
|
|
diff --git a/type1afm/Makefile.in b/type1afm/Makefile.in
|
|
index 61611e1..9b51406 100644
|
|
--- a/type1afm/Makefile.in
|
|
+++ b/type1afm/Makefile.in
|
|
@@ -15,8 +15,10 @@
|
|
#
|
|
# Modified by H.Kakugawa to use libtool
|
|
|
|
-LIBTOOL = ../libtool
|
|
-SHELL = /bin/sh
|
|
+top_builddir = @top_builddir@
|
|
+
|
|
+LIBTOOL = @LIBTOOL@
|
|
+SHELL = @SHELL@
|
|
CC = @CC@
|
|
CPP = @CPP@
|
|
CFLAGS = @CFLAGS@
|
|
diff --git a/xglyph/Makefile.in b/xglyph/Makefile.in
|
|
index 8da9b63..741334c 100644
|
|
--- a/xglyph/Makefile.in
|
|
+++ b/xglyph/Makefile.in
|
|
@@ -15,8 +15,10 @@
|
|
#
|
|
# Modified by H.Kakugawa to use libtool
|
|
|
|
-LIBTOOL = ../libtool
|
|
-SHELL = /bin/sh
|
|
+top_builddir = @top_builddir@
|
|
+
|
|
+LIBTOOL = @LIBTOOL@
|
|
+SHELL = @SHELL@
|
|
CC = @CC@
|
|
CPP = @CPP@
|
|
CFLAGS = @CFLAGS@
|