Skip to content

Commit 55db758

Browse files
authored
Don't mutilate libgeneral's header (futurerestore#9)
* Update configure.ac * Update build.sh
1 parent 0ab9df3 commit 55db758

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/workflows/build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ sudo find /usr/local/lib -iname 'libzip*.dylib' -delete
2121
sudo find /usr/local/lib -iname 'liblzma*.dylib' -delete
2222
sudo find /usr/local/lib -iname 'libusb-1.0*.dylib' -delete
2323
sudo find /usr/local/lib -iname 'libpng*.dylib' -delete
24-
sed -i '' 's|# include CUSTOM_LOGGING|//# include CUSTOM_LOGGING|' /usr/local/include/libgeneral/macros.h
2524
./autogen.sh --disable-dependency-tracking --disable-silent-rules --prefix=/usr/local --disable-debug CC='/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang' CXX='/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++' LD='/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld' RANLIB='/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib' AR='/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar' CFLAGS='-isysroot /usr/local/SYSROOT/MacOSX10.13.sdk -isystem=/usr/local/SYSROOT/MacOSX10.13.sdk/usr/include -DTSSCHECKER_NOMAIN=1 -DIDEVICERESTORE_NOMAIN=1' CXXFLAGS='-isysroot /usr/local/SYSROOT/MacOSX10.13.sdk -isystem=/usr/local/SYSROOT/MacOSX10.13.sdk/usr/include -DTSSCHECKER_NOMAIN=1 -DIDEVICERESTORE_NOMAIN=1' LDFLAGS='-L/usr/local/SYSROOT/MacOSX10.13.sdk/usr/lib -lbz2 -llzma -lcompression -L/usr/local/lib -lzstd -lusbmuxd-2.0 -framework CoreFoundation -framework IOKit'
2625
echo 'step 4:'
2726
gmake -j16
@@ -33,4 +32,4 @@ echo 'step 7:'
3332
otool -L /usr/local/bin/futurerestore
3433
echo 'step 8:'
3534
mv /usr/local/bin/futurerestore $BASE/futurerestore
36-
echo 'End'
35+
echo 'End'

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ else
8181
fi
8282
AM_CONDITIONAL([HAVE_LIBIPATCHER],[test "x$do_libipatcher" = "xyes"])
8383

84-
AC_DEFINE(CUSTOM_LOGGING, 1, [required for futurerestore])
84+
AC_DEFINE(CUSTOM_LOGGING, <stdlib.h>, [required for futurerestore])
8585

8686
LT_INIT
8787

0 commit comments

Comments
 (0)