Waldemar Brodkorb 2 недель назад
Родитель
Сommit
0db3b0a119

+ 9 - 9
package/libhugetlbfs/Makefile

@@ -4,16 +4,15 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libhugetlbfs
-PKG_VERSION:=		2.11
-PKG_RELEASE:=		2
-PKG_HASH:=		e02a612eb64386d16270ad4f8ea0196f941f35eba3f651683564d149195ad0bb
+PKG_VERSION:=		2.24
+PKG_RELEASE:=		1
+PKG_HASH:=		d501dfa91c8ead1106967a3d3829f2ba738c3fac0a65cb358ed2ab3870ddc5ef
 PKG_DESCR:=		easy hugepage access
 PKG_SECTION:=		libs/misc
 PKG_URL:=		http://libhugetlbfs.ozlabs.org/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libhugetlbfs/}
+PKG_SITES:=		https://github.com/libhugetlbfs/libhugetlbfs/releases/download/$(PKG_VERSION)/
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	glibc musl
 PKG_ARCH_DEPENDS:=	x86 x86_64
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
@@ -21,15 +20,16 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBHUGETLBFS,libhugetlbfs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIG_STYLE:=		manual
-XAKE_FLAGS+=		PREFIX=/usr DESTDIR=${WRKINST} ADK_ARCH=${ADK_TARGET_CPU_ARCH}
+AUTOTOOL_STYLE:=	autoreconf
+
+XAKE_FLAGS+=		V=1 PREFIX=/usr DESTDIR=${WRKINST} ARCH=${ADK_TARGET_CPU_ARCH} BUILDTYPE=NATIVEONLY
 ALL_TARGET:=		libs tools
 
 libhugetlbfs-install:
 	$(INSTALL_DIR) $(IDIR_LIBHUGETLBFS)/usr/{bin,lib,share/libhugetlbfs/ldscripts}
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/{cpupcstat,huge{adm,ctl,edit},pagesize} \
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/{huge{adm,ctl,edit},pagesize} \
 		$(IDIR_LIBHUGETLBFS)/usr/bin
-	${INSTALL_DATA} ${WRKINST}/usr/lib/libhugetlbfs* \
+	${INSTALL_DATA} ${WRKINST}/usr/lib*/libhugetlbfs* \
 		${IDIR_LIBHUGETLBFS}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/share/libhugetlbfs/ld.hugetlbfs \
 		${IDIR_LIBHUGETLBFS}/usr/share/libhugetlbfs

+ 0 - 76
package/libhugetlbfs/patches/patch-Makefile

@@ -1,76 +0,0 @@
-	- do not call uname -m, use passed ${ADK_ARCH} variable
-	- use ${CC} instead of hard-coded gcc
---- libhugetlbfs-2.11.orig/Makefile	2010-12-16 18:38:22.000000000 +0100
-+++ libhugetlbfs-2.11/Makefile	2011-02-27 18:58:07.000000000 +0100
-@@ -31,51 +31,51 @@ CFLAGS ?= -O2 -g
- CFLAGS += -Wall -fPIC
- CPPFLAGS += -D__LIBHUGETLBFS__
- 
--ARCH = $(shell uname -m | sed -e s/i.86/i386/)
-+ARCH = $(shell echo ${ADK_ARCH} | sed -e s/i.86/i386/)
- 
- ifeq ($(ARCH),ppc64)
--CC64 = gcc -m64
-+CC64 = ${CC} -m64
- ELF64 = elf64ppc
- TMPLIB64 = lib64
- TMPLIB32 = lib
- ifneq ($(BUILDTYPE),NATIVEONLY)
--CC32 = gcc -m32
-+CC32 = ${CC} -m32
- ELF32 = elf32ppclinux
- endif
- else
- ifeq ($(ARCH),ppc)
--CC32 = gcc -m32
-+CC32 = ${CC} -m32
- ELF32 = elf32ppclinux
- TMPLIB32 = lib
- else
- ifeq ($(ARCH),i386)
--CC32 = gcc
-+CC32 = ${CC}
- ELF32 = elf_i386
- TMPLIB32 = lib
- else
- ifeq ($(ARCH),x86_64)
--CC64 = gcc -m64
-+CC64 = ${CC} -m64
- ELF64 = elf_x86_64
- TMPLIB64 = lib64
- TMPLIB32 = lib
- ifneq ($(BUILDTYPE),NATIVEONLY)
--CC32 = gcc -m32
-+CC32 = ${CC} -m32
- ELF32 = elf_i386
- endif
- else
- ifeq ($(ARCH),ia64)
--CC64 = gcc
-+CC64 = ${CC}
- TMPLIB64 = lib64
- CFLAGS += -DNO_ELFLINK
- else
- ifeq ($(ARCH),sparc64)
--CC64 = gcc -m64
-+CC64 = ${CC} -m64
- TMPLIB64 = lib64
- CFLAGS += -DNO_ELFLINK
- else
- ifeq ($(ARCH),s390x)
--CC64 = gcc -m64
--CC32 = gcc -m31
-+CC64 = ${CC} -m64
-+CC32 = ${CC} -m31
- TMPLIB64 = lib64
- TMPLIB32 = lib
- CFLAGS += -DNO_ELFLINK
-@@ -370,7 +370,7 @@ install-libs: libs $(OBJDIRS:%=%/install
- 	$(INSTALL) -d $(DESTDIR)$(HEADERDIR)
- 	$(INSTALL) -d $(DESTDIR)$(LDSCRIPTDIR)
- 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
--	$(INSTALL) -m 644 -t $(DESTDIR)$(HEADERDIR) $(INSTALL_HEADERS)
-+	$(INSTALL) -m 644 $(INSTALL_HEADERS) $(DESTDIR)$(HEADERDIR)
- 	$(INSTALL) -m 644 $(INSTALL_LDSCRIPTS:%=ldscripts/%) $(DESTDIR)$(LDSCRIPTDIR)
- 	for x in $(INSTALL_OBJSCRIPT); do \
- 		$(INSTALL) -m 755 objscript.$$x $(DESTDIR)$(BINDIR)/$$x; done

+ 0 - 5
package/libhugetlbfs/patches/patch-version

@@ -1,5 +0,0 @@
---- libhugetlbfs-2.11.orig/version	2010-12-16 19:14:12.000000000 +0100
-+++ libhugetlbfs-2.11/version	2011-02-27 18:53:06.000000000 +0100
-@@ -1 +1 @@
--2.11
-+commit<83deab600c0eb6c022ebb82052f621d5c4be2b1c>