Explorar o código

libowfat: update to 0.33

Waldemar Brodkorb %!s(int64=2) %!d(string=hai) anos
pai
achega
02f1582d6e
Modificáronse 2 ficheiros con 29 adicións e 14 borrados
  1. 8 7
      package/libowfat/Makefile
  2. 21 7
      package/libowfat/patches/patch-GNUmakefile

+ 8 - 7
package/libowfat/Makefile

@@ -4,13 +4,15 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		libowfat
-PKG_VERSION:=		0.30
+PKG_VERSION:=		0.33
 PKG_RELEASE:=		1
-PKG_HASH:=		db4a3a853cfbb9e83b27f565b580f6fdc519475b162edc1a656043e1c126e993
+PKG_HASH:=		311ec8b3f4b72bb442e323fb013a98f956fa745547f2bc9456287b20d027cd7d
 PKG_DESCR:=		owfat library
 PKG_SECTION:=		libs/misc
-PKG_URL:=		http://www.fefe.de/libowfat
-PKG_SITES:=		http://www.fefe.de/libowfat/
+PKG_URL:=		https://www.fefe.de/libowfat
+PKG_SITES:=		https://www.fefe.de/libowfat/
+
+PKG_NOPARALLEL:=        1
 
 include ${ADK_TOPDIR}/mk/package.mk
 
@@ -18,9 +20,8 @@ CONFIG_STYLE:=		manual
 
 TARGET_CFLAGS+=		${TARGET_CPPFLAGS}
 MAKE_FILE=		GNUmakefile
-MAKE_FLAGS+=		DIET= CC='${TARGET_CC}' CROSS=${TARGET_CROSS} \
+MAKE_FLAGS+=		DIET= CROSS=${TARGET_CROSS} \
 			LDFLAGS='${TARGET_LDFLAGS}'
-FAKE_FLAGS+=		prefix='${WRKINST}/usr' \
-			INCLUDEDIR='${WRKINST}/usr/include/owfat'
+FAKE_FLAGS+=		prefix='/usr'
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 21 - 7
package/libowfat/patches/patch-GNUmakefile

@@ -1,11 +1,25 @@
---- libowfat-0.30.orig/GNUmakefile	2015-04-10 22:54:57.000000000 +0200
-+++ libowfat-0.30/GNUmakefile	2015-06-05 16:06:19.000000000 +0200
-@@ -18,7 +18,7 @@ all: ent $(LIBS) libowfat.a libsocket t
+--- libowfat-0.33.orig/GNUmakefile	2021-04-24 12:47:51.000000000 +0200
++++ libowfat-0.33/GNUmakefile	2024-02-23 05:07:36.527866006 +0100
+@@ -23,9 +23,9 @@ picx32 piex32:
+ 
  CROSS=
  #CROSS=i686-mingw-
- CC=$(CROSS)gcc
--CFLAGS=-pipe -W -Wall -Wextra -O2 -fomit-frame-pointer
+-CC?=gcc
+-AR?=ar
+-RANLIB?=ranlib
++CC=gcc
++AR=ar
++RANLIB=ranlib
+ CCC=$(CROSS)$(CC)
+ WERROR=
+ WARN=-W -Wall -Wextra $(WERROR)
+@@ -41,7 +41,8 @@ OPT_PLUS=-O3 $(NATIVE)
+ 
+ DEFINE=-D_REENTRANT
+ 
+-CFLAGS=-pipe $(WARN) $(DEFINE) $(OPT_REG)
 +CFLAGS?=
- #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
++CFLAGS+=-pipe $(WARN) $(DEFINE) $(OPT_REG)
+ CFLAGS_OPT=-pipe $(WARN) $(DEFINE) $(OPT_PLUS)
  
- ent: ent.c haveuint128.h
+ #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall