Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .github/workflows/macos-p7zip-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,3 @@ jobs:
git clone https://github.com/jinfeihan57/p7zip_test_utils.git
cd p7zip_test_utils/check
bash check_7za.sh $PROJECT_ROOT/macos-p7zip/bin/7za
- name: build 7zz & check
run: |
export PROJECT_ROOT=`pwd`
cd CPP/7zip/Bundles/Alone2
make -f makefile.gcc
INSTALL_PREFIX=$PROJECT_ROOT/macos-p7zip make -f makefile.gcc install
git clone https://github.com/jinfeihan57/p7zip_test_utils.git
cd p7zip_test_utils/check
bash check.sh $PROJECT_ROOT/macos-p7zip/bin/7zz
- name: build 7z.so
run: |
export PROJECT_ROOT=`pwd`
cd CPP/7zip/Bundles/Format7zF
make -f makefile.gcc
INSTALL_PREFIX=$PROJECT_ROOT/macos-p7zip make -f makefile.gcc install
8 changes: 7 additions & 1 deletion C/fast-lzma2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,14 @@ ifeq ($(x86_64),1)
OBJ+=lzma_dec_x86_64.o
endif

ifeq ($(shell uname),Darwin)
SHARED_LINKER_FLAGS = -dynamiclib
else
SHARED_LINKER_FLAGS = -soname,$(SONAME)
endif

libfast-lzma2 : $(OBJ)
$(CC) -shared -pthread -Wl,-soname,$(SONAME) -o $(REAL_NAME) $(OBJ)
$(CC) -shared -pthread -Wl,$(SHARED_LINKER_FLAGS) -o $(REAL_NAME) $(OBJ)

-include $(DEP)

Expand Down
8 changes: 5 additions & 3 deletions CPP/7zip/7zip_gcc.mak
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,10 @@ CD = cd

ifeq ($(shell uname),Darwin)
CP = cp -rf
SET_RPATH = install_name_tool -add_rpath
else
CP = cp -drf
SET_RPATH = patchelf --force-rpath --set-rpath
endif
MAKE = make
# CFLAGS_BASE := $(CFLAGS_BASE) -D_7ZIP_ST
Expand Down Expand Up @@ -1367,8 +1369,8 @@ $O/libbrotlicommon.$(DYSUFFIX) $O/libbrotlienc.$(DYSUFFIX) $O/libbrotlidec.$(DYS
$(CP) brotli_build/libbrotlicommon.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
$(CP) brotli_build/libbrotlidec.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
$(CP) brotli_build/libbrotlienc.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
patchelf --force-rpath --set-rpath '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/libbrotlidec.$(DYSUFFIX)*
patchelf --force-rpath --set-rpath '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/libbrotlienc.$(DYSUFFIX)*
$(SET_RPATH) '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/libbrotlidec.$(DYSUFFIX)*
$(SET_RPATH) '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/libbrotlienc.$(DYSUFFIX)*

# Compile brotli method and Handler
$O/BrotliDecoder.o: ../../Compress/BrotliDecoder.cpp
Expand Down Expand Up @@ -1419,7 +1421,7 @@ $O/liblzhamdll.$(DYSUFFIX) $O/liblzhamcomp.$(DYSUFFIX) $O/liblzhamdecomp.$(DYSUF
$(CP) lzham_build/lzhamcomp/liblzhamcomp.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
$(CP) lzham_build/lzhamdecomp/liblzhamdecomp.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
$(CP) lzham_build/lzhamdll/liblzhamdll.$(DYSUFFIX)* $O/$(7z_LIB)/$(7Z_ADDON_CODEC)
patchelf --force-rpath --set-rpath '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/liblzhamdll.$(DYSUFFIX)*
$(SET_RPATH) '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/liblzhamdll.$(DYSUFFIX)*

# Compile lzham register
$O/LzhamRegister.o: ../../Compress/LzhamRegister.cpp
Expand Down
6 changes: 1 addition & 5 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,4 @@ currently being supported with security updates.

## Reporting a Vulnerability

Use this section to tell people how to report a vulnerability.

Tell them where to go, how often they can expect to get an update on a
reported vulnerability, what to expect if the vulnerability is accepted or
declined, etc.
https://github.com/p7zip-project/p7zip/security/advisories