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

dev-libs/libcgroup: fix build with slibtool

Browse Source 
Thanks-to: orbea <orbea@riseup.net>
Closes: https://bugs.gentoo.org/777450
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-03-24 19:51:26 +00:00
parent f53215934f
commit 0bf2ad14f8
2 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
dev-libs/libcgroup/files/libcgroup-0.41-slibtool.patch Normal file
View File

@@ -0,0 +1,59 @@
https://bugs.gentoo.org/777450
commit 0c710d2f82184984e73b643a8e752f55371c6bc8
Author: orbea <orbea@riseup.net>
Date: Sun Mar 21 13:24:23 2021 -0700
build: Remove .libs from Makefile.am files.
Signed-off-by: orbea <orbea@riseup.net>
diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am
index 8bb7334..c59641b 100644
--- a/src/bindings/Makefile.am
+++ b/src/bindings/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = _libcgroup.la
_libcgroup_la_SOURCES = libcgroup.c
_libcgroup_la_LDFLAGS = $(shell python-config --ldflags) -module -avoid-version
_libcgroup_la_CFLAGS = $(shell python-config --cflags)
-_libcgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la
+_libcgroup_la_LIBADD = $(top_builddir)/src/libcgroup.la
SWIG=swig
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 2e08a4d..c8dbe67 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -4,7 +4,7 @@ if WITH_DAEMON
sbin_PROGRAMS = cgrulesengd
cgrulesengd_SOURCES = cgrulesengd.c cgrulesengd.h
-cgrulesengd_LDADD = $(top_builddir)/src/.libs/libcgroup.la -lrt
+cgrulesengd_LDADD = $(top_builddir)/src/libcgroup.la -lrt
cgrulesengd_LDFLAGS = -L$(top_builddir)/src/.libs
endif
diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am
index 852ceae..df173c2 100644
--- a/src/pam/Makefile.am
+++ b/src/pam/Makefile.am
@@ -5,6 +5,6 @@ if WITH_PAM
pamlib_LTLIBRARIES = pam_cgroup.la
pam_cgroup_la_SOURCES = pam_cgroup.c
pam_cgroup_la_LDFLAGS = -module
-pam_cgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la -lpam
+pam_cgroup_la_LIBADD = $(top_builddir)/src/libcgroup.la -lpam
endif
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 0280d4a..cb0b8f3 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
-LDADD = $(top_builddir)/src/.libs/libcgroup.la
+LDADD = $(top_builddir)/src/libcgroup.la
if WITH_TOOLS

3
dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -47,6 +47,7 @@ PATCHES=(
"${FILESDIR}"/${P}-replace_INLCUDES.patch
"${FILESDIR}"/${P}-reorder-headers.patch
"${FILESDIR}"/${P}-remove-umask.patch
"${FILESDIR}"/${P}-slibtool.patch
)
src_prepare() {