electric-fence: update to 2.2.6

This commit is contained in:
Henrik Grimler 2022-03-11 13:01:24 +01:00
parent 45961444bc
commit 014c8e5b3f
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 20 additions and 20 deletions

View File

@ -1,8 +1,6 @@
diff --git a/../electric-fence/Makefile b/./Makefile --- ./Makefile.orig 2021-11-12 18:58:14.000000000 +0000
index 4e0dd5b6c..4c26431e1 100644 +++ ./Makefile 2022-03-11 12:00:02.007006320 +0000
--- a/../electric-fence/Makefile @@ -1,19 +1,15 @@
+++ b/./Makefile
@@ -1,19 +1,12 @@
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS=-O0 -fno-builtin-malloc -g -Wall -DUSE_SEMAPHORE -fPIC - CFLAGS=-O0 -fno-builtin-malloc -g -Wall -DUSE_SEMAPHORE -fPIC
-else -else
@ -12,19 +10,21 @@ index 4e0dd5b6c..4c26431e1 100644
LIBS= -lpthread LIBS= -lpthread
-prefix=/usr -prefix=$(DESTDIR)/usr
+prefix?=$(DESTDIR)/usr
BIN_INSTALL_DIR= $(prefix)/bin BIN_INSTALL_DIR= $(prefix)/bin
LIB_INSTALL_DIR= $(prefix)/lib LIB_INSTALL_DIR= $(prefix)/lib
-MAN_INSTALL_DIR= $(prefix)/man/man3 MAN_INSTALL_DIR= $(prefix)/share/man/man3
+MAN_INSTALL_DIR= $(prefix)/share/man/man3
-CC= cc -CC= cc
-AR= ar -AR= ar
+CC?= cc
+AR?= ar
INSTALL= install INSTALL= install
PACKAGE_SOURCE= README efence.3 Makefile efence.h \ PACKAGE_SOURCE= README efence.3 Makefile efence.h \
@@ -21,25 +14,17 @@ PACKAGE_SOURCE= README efence.3 Makefile efence.h \ @@ -21,18 +17,10 @@
OBJECTS= efence.o page.o print.o OBJECTS= efence.o page.o print.o
@ -40,20 +40,21 @@ index 4e0dd5b6c..4c26431e1 100644
+all: libefence.a libefence.so.0.0 +all: libefence.a libefence.so.0.0
install: libefence.a libefence.3 libefence.so.0.0 install: libefence.a libefence.3 libefence.so.0.0
- $(INSTALL) -m 755 ef.sh $(BIN_INSTALL_DIR)/ef -# $(INSTALL) -m 755 ef.sh $(BIN_INSTALL_DIR)/ef
+ $(INSTALL) -m 755 $(TERMUX_PKG_BUILDER_DIR)/ef.sh $(BIN_INSTALL_DIR)/ef + $(INSTALL) -m 755 $(TERMUX_PKG_BUILDER_DIR)/ef.sh $(BIN_INSTALL_DIR)/ef
$(INSTALL) -m 644 libefence.a $(LIB_INSTALL_DIR) mkdir -p $(LIB_INSTALL_DIR)
$(INSTALL) -m 755 libefence.so.0.0 $(LIB_INSTALL_DIR) $(INSTALL) -m 644 libefence.a $(LIB_INSTALL_DIR)/
- rm -f $(LIB_INSTALL_DIR)/libefence.so.0 $(INSTALL) -m 755 libefence.so.0.0 $(LIB_INSTALL_DIR)/
ln -s libefence.so.0.0 $(LIB_INSTALL_DIR)/libefence.so.0 @@ -41,7 +29,7 @@
- rm -f $(LIB_INSTALL_DIR)/libefence.so - rm -f $(LIB_INSTALL_DIR)/libefence.so
ln -s libefence.so.0.0 $(LIB_INSTALL_DIR)/libefence.so ln -s libefence.so.0 $(LIB_INSTALL_DIR)/libefence.so
- $(INSTALL) -m 644 efence.3 $(MAN_INSTALL_DIR)/libefence.3 mkdir -p $(MAN_INSTALL_DIR)
- $(INSTALL) -m 644 libefence.3 $(MAN_INSTALL_DIR)/libefence.3
+ $(INSTALL) -Dm 644 libefence.3 $(MAN_INSTALL_DIR)/libefence.3 + $(INSTALL) -Dm 644 libefence.3 $(MAN_INSTALL_DIR)/libefence.3
clean: clean:
- rm -f $(OBJECTS) tstheap.o eftest.o tstheap eftest \ - rm -f $(OBJECTS) tstheap.o eftest.o tstheap eftest \
@@ -61,7 +46,7 @@ libefence.a: $(OBJECTS) @@ -63,7 +51,7 @@
libefence.so.0.0: $(OBJECTS) libefence.so.0.0: $(OBJECTS)
$(CC) -shared -Wl,-soname,libefence.so.0 -o libefence.so.0.0 \ $(CC) -shared -Wl,-soname,libefence.so.0 -o libefence.so.0.0 \

View File

@ -2,8 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://elinux.org/Electric_Fence
TERMUX_PKG_DESCRIPTION="Electric Fence (eFence) malloc memory debugger" TERMUX_PKG_DESCRIPTION="Electric Fence (eFence) malloc memory debugger"
TERMUX_PKG_LICENSE=GPL-2.0 TERMUX_PKG_LICENSE=GPL-2.0
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.2.5 TERMUX_PKG_VERSION=2.2.6
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/e/electric-fence/electric-fence_${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/e/electric-fence/electric-fence_${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=8aa8d1e5772a169098f0aba6e647295c12561a6851ef9b378a54020e8086bcc6 TERMUX_PKG_SHA256=a949e0dedb06cbcd444566cce1457223f2c41abd3513f21663f30f19ccc48e24
TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_BUILD_IN_SRC=true