ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-21 22:47:56 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
51f96278ed
openwrt/tools/7z/patches/7-zip-flags.patch

21 lines
556 B
Diff
Raw Normal View History

tools/7z: Allow building on alpine When using alpine as host, things start to fail. Lets pull in the upstream alpine patches to make things work. This should not affect other hosts. Note, that Alpine has the '_GNU_SOURCE' define in the APKBUILD file, but here we add this flag to the needed fix flags patch, which does similar things too. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
2023-02-16 14:25:12 +00:00
--- a/CPP/7zip/7zip_gcc.mak
+++ b/CPP/7zip/7zip_gcc.mak
tools/7z: update to 23.01 Release Notes: https://sourceforge.net/p/sevenzip/discussion/45797/thread/3f550826d8/#e950 Manually adjust: - 7-zip-flags.patch Automatically refresh: - 7-zip-musl.patch Signed-off-by: Nick Hainke <vincent@systemli.org>
2023-07-19 13:45:10 +00:00
@@ -24,7 +24,7 @@ PROGPATH_STATIC = $(O)/$(PROG)s
tools/7z: Allow building on alpine When using alpine as host, things start to fail. Lets pull in the upstream alpine patches to make things work. This should not affect other hosts. Note, that Alpine has the '_GNU_SOURCE' define in the APKBUILD file, but here we add this flag to the needed fix flags patch, which does similar things too. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
2023-02-16 14:25:12 +00:00
ifneq ($(CC), xlc)
tools/7z: update to 23.01 Release Notes: https://sourceforge.net/p/sevenzip/discussion/45797/thread/3f550826d8/#e950 Manually adjust: - 7-zip-flags.patch Automatically refresh: - 7-zip-musl.patch Signed-off-by: Nick Hainke <vincent@systemli.org>
2023-07-19 13:45:10 +00:00
-CFLAGS_WARN_WALL = -Werror -Wall -Wextra
tools/7z: Allow building on alpine When using alpine as host, things start to fail. Lets pull in the upstream alpine patches to make things work. This should not affect other hosts. Note, that Alpine has the '_GNU_SOURCE' define in the APKBUILD file, but here we add this flag to the needed fix flags patch, which does similar things too. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
2023-02-16 14:25:12 +00:00
+CFLAGS_WARN_WALL = -Wall -Wextra
endif
# for object file
tools/7z: update to 24.05 Update to a more recent stable release. Most notably, this version includes some fixes for building on an OS like Alpine. This allows for the removal of hacks that fixed building on Alpine, but broke building on ARM archs. Manually adjust: - 7-zip-flags.patch - 7-zip-musl.patch Link: https://7-zip.org/history.txt Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/15991 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-07-11 10:33:55 +00:00
@@ -50,7 +50,7 @@ endif
endif
tools/7z: Allow building on alpine When using alpine as host, things start to fail. Lets pull in the upstream alpine patches to make things work. This should not affect other hosts. Note, that Alpine has the '_GNU_SOURCE' define in the APKBUILD file, but here we add this flag to the needed fix flags patch, which does similar things too. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
2023-02-16 14:25:12 +00:00
# CFLAGS_BASE_LIST = -S
-CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
+CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) -D_GNU_SOURCE \
tools/7z: update to 24.05 Update to a more recent stable release. Most notably, this version includes some fixes for building on an OS like Alpine. This allows for the removal of hacks that fixed building on Alpine, but broke building on ARM archs. Manually adjust: - 7-zip-flags.patch - 7-zip-musl.patch Link: https://7-zip.org/history.txt Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/15991 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-07-11 10:33:55 +00:00
$(CFLAGS_DEBUG) -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
tools/7z: Allow building on alpine When using alpine as host, things start to fail. Lets pull in the upstream alpine patches to make things work. This should not affect other hosts. Note, that Alpine has the '_GNU_SOURCE' define in the APKBUILD file, but here we add this flag to the needed fix flags patch, which does similar things too. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
2023-02-16 14:25:12 +00:00
-fPIC
Reference in New Issue Copy Permalink