Commit 5d8de932 authored by ¡Cinder! ㊝'s avatar ¡Cinder! ㊝ 💬
Browse files

Update darwin

parent 57896891
...@@ -63,8 +63,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> ...@@ -63,8 +63,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
</map> </map>
<key>manifest</key> <key>manifest</key>
<array> <array>
<string>lib/debug/libnghttp2*.dylib</string> <string>lib/debug/libnghttp2*.a</string>
<string>lib/release/libnghttp2*.dylib</string> <string>lib/release/libnghttp2*.a</string>
</array> </array>
<key>name</key> <key>name</key>
<string>darwin</string> <string>darwin</string>
......
...@@ -86,7 +86,7 @@ pushd "$top/nghttp2" ...@@ -86,7 +86,7 @@ pushd "$top/nghttp2"
;; ;;
darwin*) darwin*)
opts="${TARGET_OPTS:--arch $AUTOBUILD_CONFIGURE_ARCH -gdwarf-2}" opts="${TARGET_OPTS:--arch $AUTOBUILD_CONFIGURE_ARCH $LL_BUILD_RELEASE}"
mkdir -p "build" mkdir -p "build"
pushd "build" pushd "build"
...@@ -95,34 +95,17 @@ pushd "$top/nghttp2" ...@@ -95,34 +95,17 @@ pushd "$top/nghttp2"
-DCMAKE_INSTALL_PREFIX="$stage" \ -DCMAKE_INSTALL_PREFIX="$stage" \
-DCMAKE_OSX_SYSROOT="macosx10.14" \ -DCMAKE_OSX_SYSROOT="macosx10.14" \
-DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" \ -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" \
-DENABLE_STATIC_LIB=ON -DENABLE_SHARED_LIB=OFF \
-DENABLE_LIB_ONLY=ON -DENABLE_LIB_ONLY=ON
cmake --build . --config Debug cmake --build . --config Debug
cmake --build . --config Release cmake --build . --config Release
mv lib/Debug/libnghttp2*.dylib "$stage/lib/debug/" mv lib/Debug/libnghttp2*.a "$stage/lib/debug/"
mv lib/Release/libnghttp2*.dylib "$stage/lib/release/" mv lib/Release/libnghttp2*.a "$stage/lib/release/"
cp -a lib/includes/nghttp2/nghttp2ver.h "$stage/include/nghttp2" cp -a lib/includes/nghttp2/nghttp2ver.h "$stage/include/nghttp2"
popd popd
rm -rf "build" rm -rf "build"
# SL-807: fix_dylib_id doesn't really handle symlinks, even though
# it's coded to try to do so. Chase the multiple levels of
# indirection to find the real dylib.
pushd "$stage/lib/debug"
dylib="libnghttp2.dylib"
while [ -L "$dylib" ]
do dylib="$(readlink "$dylib")"
done
fix_dylib_id "$dylib"
popd
pushd "$stage/lib/release"
dylib="libnghttp2.dylib"
while [ -L "$dylib" ]
do dylib="$(readlink "$dylib")"
done
fix_dylib_id "$dylib"
popd
;; ;;
linux*) linux*)
...@@ -185,3 +168,4 @@ pushd "$top/nghttp2" ...@@ -185,3 +168,4 @@ pushd "$top/nghttp2"
popd popd
cp "$NGHTTP2_VERSION_HEADER_DIR"/nghttp2.h "$stage/include/nghttp2/" cp "$NGHTTP2_VERSION_HEADER_DIR"/nghttp2.h "$stage/include/nghttp2/"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment