gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 06:48:18 -07:00
Code Issues Projects Releases Wiki Activity

media-libs/sge: respect PKG_CONFIG, multilib--

Browse Source 
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-04-19 09:01:59 +01:00
parent fa9bf912bc
commit d5897bfafe
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media-libs/sge/files/sge-030809-freetype_pkgconfig.patch
View File

@@ -1,7 +1,7 @@
https://bugs.gentoo.org/655798
--- sge030809/Makefile.conf
+++ sge030809/Makefile.conf
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -35,16 +35,16 @@
SGE_LIBS =$(shell sdl-config --libs) -lstdc++
@@ -9,7 +9,7 @@ https://bugs.gentoo.org/655798
-# Is freetype-config available?
-HAVE_FT =$(shell if (freetype-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
+# Is freetype available?
+HAVE_FT =$(shell if pkg-config --exists freetype2 ; then echo "y"; else echo "n"; fi;)
+HAVE_FT =$(shell if ${PKG_CONFIG} --exists freetype2 ; then echo "y"; else echo "n"; fi;)
ifeq ($(HAVE_FT),n)
USE_FT = n
endif
@@ -18,8 +18,8 @@ https://bugs.gentoo.org/655798
USE_FT = y
- SGE_LIBS +=$(shell freetype-config --libs)
- FT_CFLAGS =$(shell freetype-config --cflags)
+ SGE_LIBS +=$(shell pkg-config --libs freetype2)
+ FT_CFLAGS =$(shell pkg-config --cflags freetype2)
+ SGE_LIBS +=$(shell ${PKG_CONFIG} --libs freetype2)
+ FT_CFLAGS =$(shell ${PKG_CONFIG} --cflags freetype2)
endif

7
media-libs/sge/sge-030809.ebuild
View File

@@ -1,8 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit multilib toolchain-funcs
inherit toolchain-funcs
MY_P="sge${PV}"
DESCRIPTION="Graphics extensions library for SDL"
@@ -38,7 +39,7 @@ src_prepare() {
-e '/^CXX=/d' \
-e '/^AR=/d' \
Makefile.conf || die
tc-export CC CXX AR
tc-export CC CXX AR PKG_CONFIG
# make sure the header gets regenerated everytime
rm -f sge_config.h
}