cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-29 23:18:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

libcgroup: fix compile with newer musl

Browse Source 
The code uses __BEGIN/END_DECLS from glibc's features.h, actually
sys/cdefs.h, which is deprecated. Get rid of it.

Fixed license information.

Fixed musl-fts dependency. It's only valid for musl.

Removed autoreconf as the patch was removed.

Added PKG_INSTALL for consistency between packages.

Added PKG_BUILD_PARALLEL for faster compilation.

Small cleanups for consistency between packages.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2020-03-29 17:11:03 -07:00
parent 1950340c69
commit d1a2a025fe
3 changed files with 262 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libcgroup/Makefile
+22 -17
View File
@@ -2,17 +2,18 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libcgroup
PKG_VERSION:=0.41
PKG_RELEASE:=1
PKG_LICENSE:=LGPL
PKG_LICENSE_FILES:=COPYING
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/libcg
PKG_HASH:=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
PKG_MAINTAINER:=Daniel Danzberger <daniel@dd-wrt.com>
PKG_MAINTAINER:=Daniel Danzberger <daniel@dd-wrt.com>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk
@@ -20,7 +21,7 @@ define Package/libcgroup
TITLE:=CGroup config and exec library
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+musl-fts +@KERNEL_CGROUPS
DEPENDS:=+USE_MUSL:musl-fts +@KERNEL_CGROUPS
endef
define Package/cgroup-tools
@@ -33,27 +34,31 @@ define Package/libcgroup/description
Helpers utils for working with cgroups.
endef
CONFIGURE_ARGS += --enable-tools \
--enable-shared \
--disable-daemon \
--disable-pam
CONFIGURE_ARGS += \
--enable-tools \
--enable-shared \
--disable-daemon \
--disable-pam
TARGET_LDFLAGS += $(if $(CONFIG_USE_MUSL),-lfts)
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
$(CP) $(PKG_BUILD_DIR)/include/libcgroup.h $(1)/usr/include
$(CP) $(PKG_BUILD_DIR)/include/libcgroup $(1)/usr/include
$(CP) $(PKG_BUILD_DIR)/src/.libs/libcgroup.so* $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/libcgroup.pc $(1)/usr/lib/pkgconfig/
$(CP) $(PKG_INSTALL_DIR)/usr/include/libcgroup.h $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/libcgroup $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcgroup.so* $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libcgroup.pc $(1)/usr/lib/pkgconfig/
endef
define Package/libcgroup/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/src/.libs/libcgroup.so* $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcgroup.so* $(1)/usr/lib
endef
define Package/cgroup-tools/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/tools/.libs/* $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin
endef
$(eval $(call BuildPackage,libcgroup))