Waldemar Brodkorb 3 месяцев назад
Родитель
Сommit
a590e007e7
1 измененных файлов с 5 добавлено и 3 удалено
  1. 5 3
      package/btrfs-progs/Makefile

+ 5 - 3
package/btrfs-progs/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		btrfs-progs
-PKG_VERSION:=		6.1.3
+PKG_VERSION:=		7.0
 PKG_RELEASE:=		1
-PKG_HASH:=		d37fc9ec4fa5778b20aa7548fe706eb3a300338c1473318271ae54024dac7167
+PKG_HASH:=		c286d6876cbcd72327a0b417e4cfd280353ec23e37b549fdbcd7800a832d9a99
 PKG_DESCR:=		btrfs progs
 PKG_DEPENDS:=		zstd
 PKG_BUILDDEP:=		zstd
@@ -21,6 +21,8 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BTRFS_PROGS,btrfs-progs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
+CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes \
+			ac_cv_func_realloc_0_nonnull=yes
 CONFIGURE_ARGS+=	--disable-backtrace \
 			--disable-documentation \
 			--disable-python \
@@ -31,7 +33,7 @@ btrfs-progs-install:
 	$(CP) $(WRKINST)/usr/lib/libbtrfs*.so* \
 		$(IDIR_BTRFS_PROGS)/usr/lib
 	$(INSTALL_DIR) $(IDIR_BTRFS_PROGS)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/* \
+	$(CP) $(WRKINST)/usr/bin/* \
 		$(IDIR_BTRFS_PROGS)/usr/bin
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk