mirror of
https://github.com/thead-yocto-mirror/meta-openembedded
synced 2026-09-16 12:12:16 +02:00
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>
142 lines
3.8 KiB
Diff
142 lines
3.8 KiB
Diff
From 81c1ba940415595584a837ab1078c64855072f0c 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
|
|
#
|
|
|
|
---
|
|
configure.in | 95 ++++++++++++++++++++++++------------------------------------
|
|
1 file changed, 38 insertions(+), 57 deletions(-)
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
index eade4c0..e649ea9 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -74,9 +74,9 @@ T1LIB_PATCHLEVEL=builtin(eval, MACRO_T1LIB_LT_REVISION)
|
|
T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\"
|
|
|
|
|
|
-dnl We use this file by Andreas Zeller to check for libXaw
|
|
-builtin(include, ac-tools/ice_find_athena.m4)
|
|
-builtin(include, ac-tools/aclocal.m4)
|
|
+#dnl We use this file by Andreas Zeller to check for libXaw
|
|
+#builtin(include, ac-tools/ice_find_athena.m4)
|
|
+#builtin(include, ac-tools/aclocal.m4)
|
|
|
|
dnl We want these before the checks, so the checks can modify their values.
|
|
test -z "$LDLIBS" && LDLIBS=-lm AC_SUBST(LDLIBS)
|
|
@@ -162,6 +162,7 @@ fi
|
|
|
|
dnl **** Check for underscore on external symbols ****
|
|
|
|
+AH_TEMPLATE([NEED_UNDERSCORE_PREFIX], [Define if external symbols need an underscore prefix])
|
|
AC_CACHE_CHECK("whether external symbols need an underscore prefix",
|
|
ac_cv_c_extern_prefix,
|
|
[saved_libs=$LIBS
|
|
@@ -179,68 +180,48 @@ then
|
|
AC_DEFINE(NEED_UNDERSCORE_PREFIX)
|
|
fi
|
|
|
|
-dnl **** Check which ANSI integer type is 16 bit
|
|
-
|
|
-AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type,
|
|
- AC_TRY_RUN([
|
|
-int main(void) {
|
|
- if (sizeof(short)==2)
|
|
- return(0);
|
|
- else if (sizeof(int)==2)
|
|
- return(1);
|
|
- else
|
|
- return(2);
|
|
-}], ac_16bit_type="short", ac_16bit_type="int", ac_16bit_type=))
|
|
-if test "$ac_16bit_type" = "short"
|
|
-then
|
|
- T1_AA_TYPE16="-DT1_AA_TYPE16=short"
|
|
- T1_INT16="short"
|
|
-else
|
|
- T1_AA_TYPE16="-DT1_AA_TYPE16=int"
|
|
- T1_INT16="int"
|
|
+dnl **** Check which ANSI integer type is 16 bit
|
|
+T1_AA_TYPE16=""
|
|
+for type in short int; do
|
|
+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then
|
|
+ T1_AA_TYPE16="-DT1_AA_TYPE16=$type"
|
|
+ T1_INT16="$type"
|
|
+ break
|
|
+ fi
|
|
+done
|
|
+
|
|
+if test x"$T1_AA_TYPE16" = "x"; then
|
|
+ AC_MSG_ERROR("Unable to determine which integer type is 16 bit.")
|
|
fi
|
|
|
|
-
|
|
dnl **** Check which ANSI integer type is 32 bit
|
|
-
|
|
-AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type,
|
|
- AC_TRY_RUN([
|
|
-int main(void) {
|
|
- if (sizeof(int)==4)
|
|
- return(0);
|
|
- else if (sizeof(long)==4)
|
|
- return(1);
|
|
- else
|
|
- return(2);
|
|
-}], ac_32bit_type="int", ac_32bit_type="long", ac_32bit_type=))
|
|
-if test "$ac_32bit_type" = "int"
|
|
-then
|
|
- T1_AA_TYPE32="-DT1_AA_TYPE32=int"
|
|
- T1_INT32="int"
|
|
-else
|
|
- T1_AA_TYPE32="-DT1_AA_TYPE32=long"
|
|
- T1_INT32="long"
|
|
+T1_AA_TYPE32=""
|
|
+for type in int long; do
|
|
+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then
|
|
+ T1_AA_TYPE32="-DT1_AA_TYPE32=$type"
|
|
+ T1_INT32="$type"
|
|
+ break
|
|
+ fi
|
|
+done
|
|
+
|
|
+if test x"$T1_AA_TYPE32" = "x"; then
|
|
+ AC_MSG_ERROR("Unable to determine which integer type is 32 bit.")
|
|
fi
|
|
|
|
-
|
|
dnl **** Check which ANSI integer type is 64 bit
|
|
-
|
|
-AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type,
|
|
- AC_TRY_RUN([
|
|
-int main(void) {
|
|
- if (sizeof(long)==8)
|
|
- return(0);
|
|
- else
|
|
- return(1);
|
|
-}], ac_64bit_type="long", ac_64bit_type="<none>"))
|
|
-if test "$ac_64bit_type" = "long"
|
|
-then
|
|
- T1_AA_TYPE64="-DT1_AA_TYPE64=long"
|
|
-else
|
|
- T1_AA_TYPE64=
|
|
+T1_AA_TYPE64=""
|
|
+for type in long long_long; do
|
|
+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then
|
|
+ AC_MSG_WARN("$type is 64 bit")
|
|
+ T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\""
|
|
+ break
|
|
+ fi
|
|
+done
|
|
+
|
|
+if test x"$T1_AA_TYPE64" = "x"; then
|
|
+ AC_MSG_ERROR("Unable to determine which integer type is 64 bit.")
|
|
fi
|
|
|
|
-
|
|
CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_DATA_DIR}\\\"\""
|
|
|
|
dnl **** Check for functions and header files ****
|