github-wownero/wowlet
1
0
Fork 0
mirror of https://github.com/wownero/wowlet.git synced 2026-10-17 07:11:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

depends: don't run autoreconf anywhere

Browse Source
This commit is contained in:
tobtoht
2025-02-22 10:43:02 +01:00
parent fad3eb259c
commit 649ba5c58a
12 changed files with 61 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/depends/packages/appimage_runtime.mk
+6 -6
View File
@@ -1,8 +1,8 @@
package=appimage_runtime
$(package)_version=c9553b05938b22849ac3255ac923bf8e775ce539
$(package)_version=f6c0b18d42eb4aa629cc6a18d08c20cc67c80af8
$(package)_download_path=https://github.com/AppImage/type2-runtime/archive/
$(package)_file_name=$($(package)_version).tar.gz
$(package)_sha256_hash=4a27451013b571cf9f5a13660719d091cc79f2344aafa2e48578ddc0e4618af1
$(package)_sha256_hash=746c2110049c4092dab9d8b788e2a9e98ec77ff9b8b09be844fce1dcdeb4c328
$(package)_dependencies=libsquashfuse zstd
$(package)_patches=depends-fix.patch
@@ -13,11 +13,11 @@ endef
define $(package)_build_cmds
cd src/runtime && \
export host_prefix="$(host_prefix)" && \
$(MAKE) runtime-fuse3 -e CC=$($(package)_cc) LDLAGS="$($(package)_ldflags)" && \
"${HOST}-strip" runtime-fuse3
$(MAKE) runtime -e CC=$($(package)_cc) LDLAGS="$($(package)_ldflags)" && \
"${HOST}-strip" runtime
endef
define $(package)_stage_cmds
cd src/runtime && \
cp -a runtime-fuse3 $($(package)_staging_prefix_dir)/runtime
endef
cp -a runtime $($(package)_staging_prefix_dir)/runtime
endef
contrib/depends/packages/eudev.mk
-4
View File
@@ -16,10 +16,6 @@ define $(package)_build_cmd
$(MAKE)
endef
define $(package)_preprocess_cmds
cd $($(package)_build_subdir); autoreconf -f -i
endef
define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef
contrib/depends/packages/libsodium.mk
+1 -2
View File
@@ -13,8 +13,7 @@ endef
define $(package)_preprocess_cmds
rm -rf builds/msvc &&\
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux/ && \
patch -p1 -i $($(package)_patch_dir)/fix-blake2b-symbol-naming.patch && \
autoconf
patch -p1 -i $($(package)_patch_dir)/fix-blake2b-symbol-naming.patch
endef
define $(package)_config_cmds
contrib/depends/packages/libsquashfuse.mk
+4 -8
View File
@@ -1,14 +1,10 @@
package=libsquashfuse
$(package)_version=e51978cd6bb5c4d16fae9eee43d0b258f570bb0f
$(package)_download_path=https://github.com/vasi/squashfuse/archive/
$(package)_file_name=$($(package)_version).tar.gz
$(package)_sha256_hash=f544029ad30d8fbde4e4540c574b8cdc6d38b94df025a98d8551a9441f07d341
$(package)_version=0.5.2
$(package)_download_path=https://github.com/vasi/squashfuse/releases/download/$($(package)_version)
$(package)_file_name=squashfuse-$($(package)_version).tar.gz
$(package)_sha256_hash=54e4baaa20796e86a214a1f62bab07c7c361fb7a598375576d585712691178f5
$(package)_dependencies=libfuse zstd
define $(package)_preprocess_cmds
./autogen.sh
endef
define $(package)_config_cmds
$($(package)_autoconf) --with-zstd=$(host_prefix) --without-zlib CFLAGS=-no-pie LDFLAGS=-static
endef
contrib/depends/packages/libxcb.mk
-4
View File
@@ -20,10 +20,6 @@ $(package)_config_opts += --disable-xtest --disable-xv --disable-xvmc
endef
define $(package)_preprocess_cmds
find . -type f -name 'Makefile.in' -exec rm {} + && \
rm -rf build-aux/* && \
rm ChangeLog INSTALL aclocal.m4 configure m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 src/config.h.in && \
autoreconf -fi && \
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux && \
patch -p1 -i $($(package)_patch_dir)/remove_pthread_stubs.patch
endef
contrib/depends/packages/libxcb_util_image.mk
+2 -2
View File
@@ -12,9 +12,9 @@ $(package)_config_opts+= --disable-dependency-tracking --enable-option-checking
endef
define $(package)_preprocess_cmds
rm -rf test && \
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \
patch -p1 -i $($(package)_patch_dir)/no-tests.patch && \
autoreconf -i
patch -p1 -i $($(package)_patch_dir)/no-tests.patch
endef
define $(package)_config_cmds
contrib/depends/packages/tor_linux.mk
+1 -3
View File
@@ -18,9 +18,7 @@ define $(package)_set_vars
endef
define $(package)_preprocess_cmds
rm Makefile.in aclocal.m4 ar-lib compile config.guess config.sub configure depcomp install-sh missing orconfig.h.in test-driver &&\
rm -rf doc/man &&\
autoreconf -fi
rm -rf doc/man
endef
define $(package)_config_cmds
contrib/depends/packages/unbound.mk
+2 -3
View File
@@ -16,9 +16,8 @@ define $(package)_set_vars
endef
define $(package)_preprocess_cmds
rm configure~ doc/*.odp doc/*.pdf contrib/*.tar.gz contrib/*.tar.bz2 &&\
rm -rf testdata dnscrypt/testdata &&\
autoconf
rm doc/*.odp doc/*.pdf contrib/*.tar.gz contrib/*.tar.bz2 &&\
rm -rf testdata dnscrypt/testdata
endef
define $(package)_config_cmds
contrib/depends/packages/xcb_proto.mk
-6
View File
@@ -4,12 +4,6 @@ $(package)_download_path=https://xorg.freedesktop.org/archive/individual/proto
$(package)_file_name=xcb-proto-$($(package)_version).tar.gz
$(package)_sha256_hash=392d3c9690f8c8202a68fdb89c16fd55159ab8d65000a6da213f4a1576e97a16
define $(package)_preprocess_cmds
find . -type f -name 'Makefile.in' -exec rm {} + && \
rm aclocal.m4 configure install-sh missing py-compile && \
autoreconf -fi
endef
define $(package)_config_cmds
$($(package)_autoconf)
endef
contrib/depends/packages/xorgproto.mk
-3
View File
@@ -10,9 +10,6 @@ define $(package)_set_vars
endef
define $(package)_preprocess_cmds
find . -type f -name 'Makefile.in' -exec rm {} + && \
rm aclocal.m4 compile config.guess config.sub configure install-sh missing test-driver && \
autoreconf -fi && \
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
endef
contrib/depends/patches/appimage_runtime/depends-fix.patch
+14 -23
View File
@@ -1,30 +1,21 @@
diff --git a/src/runtime/Makefile b/src/runtime/Makefile
index d0cbf1f..905b130 100644
index 1776c19..6207731 100644
--- a/src/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -1,21 +1,21 @@
CC = gcc
CFLAGS = -std=gnu99 -s -Os -D_FILE_OFFSET_BITS=64 -DGIT_COMMIT=\"${GIT_COMMIT}\" -T data_sections.ld -ffunction-sections -fdata-sections -Wl,--gc-sections -static
-LIBS = -lsquashfuse -lsquashfuse_ll -lzstd -lz
+LIBS = -lsquashfuse -lsquashfuse_ll -lzstd -lpthread
@@ -1,12 +1,12 @@
GIT_COMMIT := $(shell cat version)
-CC = clang
-CFLAGS = -std=gnu99 -Os -D_FILE_OFFSET_BITS=64 -DGIT_COMMIT=\"$(GIT_COMMIT)\" -T data_sections.ld -ffunction-sections -fdata-sections -Wl,--gc-sections -static -Wall -Werror -static-pie
-LIBS = -lsquashfuse -lsquashfuse_ll -lzstd -lz -lfuse3
+CC = gcc
+CFLAGS = -std=gnu99 -Os -D_FILE_OFFSET_BITS=64 -DGIT_COMMIT=\"$(GIT_COMMIT)\" -T data_sections.ld -ffunction-sections -fdata-sections -Wl,--gc-sections -static -Wall
+LIBS = -lsquashfuse -lsquashfuse_ll -lzstd -lfuse3 -lpthread
all: runtime-fuse3 runtime-fuse3
all: runtime
# Compile runtime
runtime-fuse3.o: runtime.c
- $(CC) -I/usr/local/include/squashfuse -I/usr/include/fuse -o runtime-fuse3.o -c $(CFLAGS) $^
+ $(CC) -I${host_prefix}/include -I${host_prefix}/include/squashfuse -I${host_prefix}/include/fuse -o runtime-fuse3.o -c $(CFLAGS) $^
runtime-fuse3: runtime-fuse3.o
$(CC) $(CFLAGS) $^ $(LIBS) -lfuse -o runtime-fuse3
runtime-fuse3.o: runtime.c
- $(CC) -I/usr/local/include/squashfuse -I/usr/include/fuse3 -o runtime-fuse3.o -c $(CFLAGS) $^
+ $(CC) -I${host_prefix}/include -I${host_prefix}/include/squashfuse -I${host_prefix}/include/fuse3 -o runtime-fuse3.o -c $(CFLAGS) $^
runtime-fuse3: runtime-fuse3.o
- $(CC) $(CFLAGS) $^ $(LIBS) -lfuse3 -o runtime-fuse3
+ $(CC) $(CFLAGS) $^ -L${host_prefix}/lib $(LIBS) -lfuse3 -lpthread -o runtime-fuse3
runtime: runtime.c
- $(CC) -I/usr/local/include/squashfuse -I/usr/include/fuse3 $(CFLAGS) $^ $(LIBS) -o $@
+ $(CC) -L${host_prefix}/lib -I${host_prefix}/include -I${host_prefix}/squashfuse -I${host_prefix}/include/fuse3 $(CFLAGS) $^ $(LIBS) -o $@
clean:
rm -f *.o runtime-fuse3 runtime-fuse3
rm -f runtime
contrib/depends/patches/libxcb_util_image/no-tests.patch
+31 -20
View File
@@ -1,23 +1,34 @@
diff --git a/Makefile.am b/Makefile.am
index 23956fd..0f4c3c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,5 +12,5 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
diff --git a/Makefile.in b/Makefile.in
index 03316e8..b5c6f49 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -361,7 +361,7 @@ top_srcdir = @top_srcdir@
xcbincludedir = @xcbincludedir@
ACLOCAL_AMFLAGS = -I m4
MAINTAINERCLEANFILES = ChangeLog INSTALL
-SUBDIRS = image test
+SUBDIRS = image
EXTRA_DIST = autogen.sh README.md
diff --git a/configure.ac b/configure.ac
index 9cf3f5a..0949d55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,6 @@ PKG_CHECK_MODULES(XCB_UTIL, xcb-util)
AC_CONFIG_FILES([
Makefile
image/Makefile
- test/Makefile
image/xcb-image.pc
])
AC_OUTPUT
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/configure b/configure
index 3756ffc..46fcbc4 100755
--- a/configure
+++ b/configure
@@ -19952,7 +19952,7 @@ printf "%s\n" "yes" >&6; }
fi
-ac_config_files="$ac_config_files Makefile image/Makefile test/Makefile image/xcb-image.pc"
+ac_config_files="$ac_config_files Makefile image/Makefile image/xcb-image.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -20980,7 +20980,6 @@ do
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"image/Makefile") CONFIG_FILES="$CONFIG_FILES image/Makefile" ;;
- "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"image/xcb-image.pc") CONFIG_FILES="$CONFIG_FILES image/xcb-image.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;