mikhail/libg15render
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failed cross build from source due to incorrect use of pkg-config

Browse Source
This commit is contained in:
Alexander Ponyatykh committed 2019-12-04 00:03:28 +03:00
1 parent bb7822e4f0
commit f9b97f4f6d
2 files changed
+55 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

debian/changelog
Vendored
+4 -1
View File
@@ -6,8 +6,11 @@ libg15render (1.3.0~svn316-3) unstable; urgency=medium
* Don't install .la files.
* Multiarchify.
* Remove unneeded build dependencies (closes: bug#810434).
* debian/patches/01-pkg-config-configure-in.patch:
- Fix failed cross build from source due to incorrect use of pkg-config
(closes: bug#945403).
-- Alexander Ponyatykh <lazyranma@gmail.com> Thu, 21 Nov 2019 01:33:56 +0300
-- Alexander Ponyatykh <lazyranma@gmail.com> Wed, 04 Dec 2019 00:02:08 +0300
libg15render (1.3.0~svn316-2.4) unstable; urgency=medium
debian/patches/01-pkg-config-configure-in.patch
Vendored
+51 -8
View File
@@ -1,11 +1,54 @@
From: Helmut Grohne <helmut@subdivi.de>
Subject: Fix cross build from source
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=945403
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@
AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support],
if [[[ "$enableval" = "yes" ]]]; then
AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
@@ -14,17 +14,15 @@
# Checks for --enable args
AC_MSG_CHECKING(whether to enable FreeType2 support)
-AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support],
- if [[[ "$enableval" = "yes" ]]]; then
- AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
- CFLAGS="$CFLAGS `freetype-config --cflags`"
+ CFLAGS="$CFLAGS `pkg-config --cflags freetype2`"
FTLIB="-lfreetype"
ttf_support="yes"
else
- FTLIB="-lfreetype"
- ttf_support="yes"
- else
- ttf_support="no"
- fi,
+AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support])
+AS_IF([[[ "$enable_ttf" = "yes" ]]],[
+ AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
+ PKG_CHECK_MODULES([FREETYPE2],[freetype2])
+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
+ ttf_support="yes"
+],[
ttf_support="no"
-)
+])
AC_MSG_RESULT($ttf_support)
# Checks for libraries.
@@ -43,7 +41,6 @@
AC_HEADER_STDC
AC_CHECK_FUNCS([memset])
-AC_SUBST(FTLIB)
AC_CONFIG_FILES([
Makefile
src/Makefile
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,10 +5,10 @@
lib_LTLIBRARIES = libg15render.la
libg15render_la_SOURCES = libg15render.h text.c pixel.c screen.c
-libg15render_la_LIBADD = @FTLIB@
+libg15render_la_LIBADD = @FREETYPE2_LIBS@
libg15render_la_LDFLAGS = -version-info 2:0:1
include_HEADERS= libg15render.h
bin_PROGRAMS = g15fontconvert
g15fontconvert_SOURCES = g15fontconvert.c
-g15fontconvert_LDADD = libg15render.la @FTLIB@
+g15fontconvert_LDADD = libg15render.la @FREETYPE2_LIBS@