media-libs/glee: add -r2

This fixes a pkgconfig issue on multilib LLVM systems. The
previous .pc file hardcoded `/lib`, which causes LLD to
strictly link against libraries in `/lib`--which are the
incorrect binary format for x64 systems.

This updates the configure script to generate a pkgconf
config automatically, using the configured `libdir`.

Signed-off-by: Vivian Heisz (demize) <demize@unstable.systems>
This commit is contained in:
Vivian Heisz (demize)
2025-05-15 15:31:51 -04:00
parent 71e2862ea3
commit f84c70570c
4 changed files with 19 additions and 53 deletions

View File

@@ -1,12 +0,0 @@
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include/GL/
Name: GLee
Description: GL Easy Extension library
Version: 5.4.0
Requires:
Conflicts:
Libs: -L${libdir} -lGLee
Cflags: -I${includedir}

View File

@@ -1,8 +1,9 @@
diff -ruN configure.ac configure.ac
--- configure.ac 1970-01-01 03:00:00.000000000 +0300
+++ configure.ac 2007-02-13 23:48:45.000000000 +0300
@@ -0,0 +1,10 @@
@@ -0,0 +1,11 @@
+AC_INIT(configure.ac)
+AC_CONFIG_FILES([glee.pc])
+
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(libGLee, 5.4)
@@ -20,3 +21,19 @@ diff -ruN Makefile.am Makefile.am
+libGLee_la_SOURCES = GLee.c
+includeGLdir = $(includedir)/GL
+includeGL_HEADERS = GLee.h
diff -ruN glee.pc.in.orig glee.pc.in
--- glee.pc.in.orig 2025-05-15 15:16:23.422989994 -0400
+++ glee.pc.in 2025-05-15 15:16:01.246086074 -0400
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@/GL
+
+Name: GLee
+Description: GL Easy Extension library
+Version: @PACKAGE_VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} -lGLee
+Cflags: -I${includedir}

View File

@@ -35,5 +35,5 @@ src_install() {
find "${ED}" -type f -name '*.la' -delete || die
dodoc readme.txt extensionList.txt || die
insinto /usr/$(get_libdir)/pkgconfig
newins "${FILESDIR}/${P}.pc" glee.pc
doins glee.pc
}

View File

@@ -1,39 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools
DESCRIPTION="OpenGL Easy Extension library"
HOMEPAGE="https://elf-stone.com/glee.php"
SRC_URI="https://elf-stone.com/downloads/GLee/GLee-${PV}-src.tar.gz"
S="${WORKDIR}"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="static-libs"
RDEPEND="virtual/opengl"
DEPEND="${RDEPEND}"
src_prepare() {
default
eapply -p0 "${FILESDIR}/${PN}-autotools.patch"
eautoreconf || die
}
src_configure() {
econf \
$(use_enable static-libs static)
}
src_install() {
emake DESTDIR="${D}" install || die
find "${ED}" -type f -name '*.la' -delete || die
dodoc readme.txt extensionList.txt || die
insinto /usr/lib/pkgconfig
newins "${FILESDIR}/${P}.pc" glee.pc
}