fix build on mac

Author: wangsongc

.github/workflows/macos-p7zip-CI.yml

@@ -13,34 +13,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Setup tmate session
-      uses: mxschmitt/action-tmate@v3
     - name: build 7za & check
       run: |
-        brew install patchelf
-        patchelf --version
         mkdir macos-p7zip
         mkdir macos-p7zip/bin
         mkdir macos-p7zip/lib
         export PROJECT_ROOT=`pwd`
         cd CPP/7zip/Bundles/Alone
         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_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
+        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

CPP/7zip/7zip_gcc.mak

@@ -1367,8 +1367,15 @@ $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)*
+	ifeq ($(HOST_OS), Darwin)
+		# 使用 install_name_tool 设置 rpath
+		install_name_tool -add_rpath '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/libbrotlidec.$(DYSUFFIX)*
+		install_name_tool -add_rpath '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/libbrotlienc.$(DYSUFFIX)*
+	else
+		# 原 patchelf 命令
+		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)*
+	endif
 
 # Compile brotli method and Handler 
 $O/BrotliDecoder.o: ../../Compress/BrotliDecoder.cpp
@@ -1419,7 +1426,13 @@ $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)*
+	ifeq ($(HOST_OS), Darwin)
+    	# 使用 install_name_tool 设置 rpath
+    	install_name_tool -add_rpath '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/liblzhamdll.$(DYSUFFIX)*
+	else
+		# 原 patchelf 命令
+		patchelf --force-rpath --set-rpath '$$ORIGIN/' $O/$(7z_LIB)/$(7Z_ADDON_CODEC)/liblzhamdll.$(DYSUFFIX)*
+	endif
 
 # Compile lzham register
 $O/LzhamRegister.o: ../../Compress/LzhamRegister.cpp