Compare revisions

Rye Mutt · Rye Mutt · Rye Mutt · 279f47a6 · 279f47a6
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -22,11 +22,11 @@
            <key>archive</key>
            <map>
              <key>hash</key>
-              <string>8b36b7c62146d221e178c2c2555174ac2f7c0fe43b18e155948407dd0ae3fce8dd0ba4ea9205c248c60706f67b5db44db9e725b1216aad1a7e80cb38d7355e7a</string>
+              <string>46ce3f201f8020ad6cf5e6f0f9d5c4c72c11438c0c91444773cb2b8def290fdee10d29eb39f9668dd921aa80cbc6a3ee441b1c6bdd12be831c5e5ceec8e40d96</string>
              <key>hash_algorithm</key>
              <string>blake2b</string>
              <key>url</key>
-              <string>https://git.alchemyviewer.org/api/v4/projects/109/packages/generic/expat/2.4.9.1600/expat-2.4.9-darwin64-1600.tar.zst</string>
+              <string>https://git.alchemyviewer.org/api/v4/projects/109/packages/generic/expat/2.5.0.1677/expat-2.5.0-darwin64-1677.tar.zst</string>
            </map>
            <key>name</key>
            <string>darwin64</string>
@@ -36,11 +36,11 @@
            <key>archive</key>
            <map>
              <key>hash</key>
-              <string>6896a2ee9c5e4a01ab20f6c2f16fac14cb9ec8a22417d16762ad25648b89289ba33d9cfc019959af63d39fa2d09fdc6385ae6f747ce828db3ae0adec1c4ab8fe</string>
+              <string>cded1fb0f4a6addafab3f384bf0e145121b54a7aa604d65b304061fce875297c3f0e5b90abb9b4797bb62907d6b25aa607de93d710bd13bf207f144304bc37f6</string>
              <key>hash_algorithm</key>
              <string>blake2b</string>
              <key>url</key>
-              <string>https://git.alchemyviewer.org/api/v4/projects/109/packages/generic/expat/2.4.9.1600/expat-2.4.9-linux64-1600.tar.zst</string>
+              <string>https://git.alchemyviewer.org/api/v4/projects/109/packages/generic/expat/2.5.0.1677/expat-2.5.0-linux64-1677.tar.zst</string>
            </map>
            <key>name</key>
            <string>linux64</string>
@@ -50,18 +50,18 @@
            <key>archive</key>
            <map>
              <key>hash</key>
-              <string>d2d135be4e1acaf7e639da4d63957e95e7b8c07c15e08379734615dda9529ed5d8bab3aefd6a2d0d55f8f7b047b9ca1405f793d303404812b39d55bdfcf80148</string>
+              <string>a753f5699a9c2b7a04977bd10718247269730d031418d3195003dc4833710be0dea6aaf6483f68118e0928d138c6ad0223a91e28999b3dd951df70bb7a0046e9</string>
              <key>hash_algorithm</key>
              <string>blake2b</string>
              <key>url</key>
-              <string>https://git.alchemyviewer.org/api/v4/projects/109/packages/generic/expat/2.4.9.1600/expat-2.4.9-windows64-1600.tar.zst</string>
+              <string>https://git.alchemyviewer.org/api/v4/projects/109/packages/generic/expat/2.5.0.1677/expat-2.5.0-windows64-1677.tar.zst</string>
            </map>
            <key>name</key>
            <string>windows64</string>
          </map>
        </map>
        <key>version</key>
-        <string>2.4.9</string>
+        <string>2.5.0</string>
      </map>
    </map>
    <key>package_description</key>
@@ -125,8 +125,8 @@
          </map>
          <key>manifest</key>
          <array>
-            <string>lib/debug/*.dylib</string>
-            <string>lib/release/*.dylib</string>
+            <string>lib/debug/*.a</string>
+            <string>lib/release/*.a</string>
          </array>
          <key>name</key>
          <string>darwin</string>

--- a/build-cmd.sh
+++ b/build-cmd.sh
@@ -118,38 +118,46 @@ if not any(frag in d for frag in ('CommonExtensions', 'VSPerfCollectionTools', '
    # Setup osx sdk platform
    SDKNAME="macosx"
    export SDKROOT=$(xcodebuild -version -sdk ${SDKNAME} Path)
-    export MACOSX_DEPLOYMENT_TARGET=10.15
+
+    # Deploy Targets
+    X86_DEPLOY=10.13
+    ARM64_DEPLOY=11.0

    # Setup build flags
-    ARCH_FLAGS="-arch x86_64"
-    SDK_FLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -isysroot ${SDKROOT}"
-    DEBUG_COMMON_FLAGS="$ARCH_FLAGS $SDK_FLAGS -O0 -g -msse4.2 -fPIC -DPIC"
-    RELEASE_COMMON_FLAGS="$ARCH_FLAGS $SDK_FLAGS -O3 -g -msse4.2 -fPIC -DPIC -fstack-protector-strong"
+    ARCH_FLAGS_X86="-arch x86_64 -mmacosx-version-min=${X86_DEPLOY} -isysroot ${SDKROOT}"
+    ARCH_FLAGS_ARM64="-arch arm64 -mmacosx-version-min=${ARM64_DEPLOY} -isysroot ${SDKROOT}"
+    DEBUG_COMMON_FLAGS="-O0 -g -fPIC -DPIC"
+    RELEASE_COMMON_FLAGS="-O3 -g -fPIC -DPIC -fstack-protector-strong"
    DEBUG_CFLAGS="$DEBUG_COMMON_FLAGS"
    RELEASE_CFLAGS="$RELEASE_COMMON_FLAGS"
    DEBUG_CXXFLAGS="$DEBUG_COMMON_FLAGS -std=c++17"
    RELEASE_CXXFLAGS="$RELEASE_COMMON_FLAGS -std=c++17"
    DEBUG_CPPFLAGS="-DPIC"
    RELEASE_CPPFLAGS="-DPIC"
-    DEBUG_LDFLAGS="$ARCH_FLAGS $SDK_FLAGS -Wl,-headerpad_max_install_names"
-    RELEASE_LDFLAGS="$ARCH_FLAGS $SDK_FLAGS -Wl,-headerpad_max_install_names"
+    DEBUG_LDFLAGS="-Wl,-headerpad_max_install_names"
+    RELEASE_LDFLAGS="-Wl,-headerpad_max_install_names"

-    JOBS=`sysctl -n hw.ncpu`
+    # x86 Deploy Target
+    export MACOSX_DEPLOYMENT_TARGET=${X86_DEPLOY}

    PREFIX="$STAGING_DIR"
-    PREFIX_DEBUG="$PREFIX/temp_debug"
-    PREFIX_RELEASE="$PREFIX/temp_release"
+    PREFIX_DEBUG_X86="$PREFIX/temp_debug_x86"
+    PREFIX_DEBUG_ARM64="$PREFIX/temp_debug_arm64"
+    PREFIX_RELEASE_X86="$PREFIX/temp_release_x86"
+    PREFIX_RELEASE_ARM64="$PREFIX/temp_release_arm64"

-    mkdir -p $PREFIX_DEBUG
-    mkdir -p $PREFIX_RELEASE
+    mkdir -p $PREFIX_DEBUG_X86
+    mkdir -p $PREFIX_DEBUG_ARM64
+    mkdir -p $PREFIX_RELEASE_X86
+    mkdir -p $PREFIX_RELEASE_ARM64

    pushd "$TOP_DIR/apr"
        autoreconf -fvi

-        mkdir -p "build_debug"
-        pushd "build_debug"
-            CFLAGS="$DEBUG_CFLAGS" CXXFLAGS="$DEBUG_CXXFLAGS" LDFLAGS="$DEBUG_LDFLAGS" \
-                ../configure --enable-debug --prefix="$PREFIX_DEBUG"
+        mkdir -p "build_debug_x86"
+        pushd "build_debug_x86"
+            CFLAGS="$ARCH_FLAGS_X86 $DEBUG_CFLAGS -msse4.2" CXXFLAGS="$ARCH_FLAGS_X86 $DEBUG_CXXFLAGS -msse4.2" LDFLAGS="$ARCH_FLAGS_X86 $DEBUG_LDFLAGS" \
+                ../configure --enable-debug --disable-shared --enable-static --prefix="$PREFIX_DEBUG_X86" --host=x86_64-apple-darwin
            make -j$AUTOBUILD_CPU_COUNT
            make install

@@ -159,10 +167,10 @@ if not any(frag in d for frag in ('CommonExtensions', 'VSPerfCollectionTools', '
            # fi
        popd

-        mkdir -p "build_release"
-        pushd "build_release"
-            CFLAGS="$RELEASE_CFLAGS" CXXFLAGS="$RELEASE_CXXFLAGS" LDFLAGS="$RELEASE_LDFLAGS" \
-                ../configure --prefix="$PREFIX_RELEASE"
+        mkdir -p "build_release_x86"
+        pushd "build_release_x86"
+            CFLAGS="$ARCH_FLAGS_X86 $RELEASE_CFLAGS -msse4.2" CXXFLAGS="$ARCH_FLAGS_X86 $RELEASE_CXXFLAGS -msse4.2" LDFLAGS="$ARCH_FLAGS_X86 $RELEASE_LDFLAGS" \
+                ../configure --disable-shared --enable-static --prefix="$PREFIX_RELEASE_X86" --host=x86_64-apple-darwin
            make -j$AUTOBUILD_CPU_COUNT
            make install

@@ -171,28 +179,81 @@ if not any(frag in d for frag in ('CommonExtensions', 'VSPerfCollectionTools', '
            #     make check
            # fi
        popd
-    popd

-    pushd "$PREFIX_DEBUG/lib"
-        fix_dylib_id "libapr-1.dylib"
-        dsymutil libapr-*.*.dylib
-        strip -x -S libapr-*.*.dylib
-    popd
+        # ARM64 Deploy Target
+        export MACOSX_DEPLOYMENT_TARGET=${ARM64_DEPLOY}
+
+        mkdir -p "build_debug_arm64"
+        pushd "build_debug_arm64"
+            CFLAGS="$ARCH_FLAGS_ARM64 $DEBUG_CFLAGS" CXXFLAGS="$ARCH_FLAGS_ARM64 $DEBUG_CXXFLAGS" LDFLAGS="$ARCH_FLAGS_ARM64 $DEBUG_LDFLAGS" \
+                ../configure --enable-debug --disable-shared --enable-static --prefix="$PREFIX_DEBUG_ARM64" --host=aarch64-apple-darwin
+            make -j$AUTOBUILD_CPU_COUNT
+            make install

-    pushd "$PREFIX_RELEASE/lib"
-        fix_dylib_id "libapr-1.dylib"
-        dsymutil libapr-*.*.dylib
-        strip -x -S libapr-*.*.dylib
+            # conditionally run unit tests
+            # if [ "${DISABLE_UNIT_TESTS:-0}" = "0" ]; then
+            #     make check
+            # fi
+        popd
+
+        mkdir -p "build_release_arm64"
+        pushd "build_release_arm64"
+            CFLAGS="$ARCH_FLAGS_ARM64 $RELEASE_CFLAGS" CXXFLAGS="$ARCH_FLAGS_ARM64 $RELEASE_CXXFLAGS" LDFLAGS="$ARCH_FLAGS_ARM64 $RELEASE_LDFLAGS" \
+                ../configure --disable-shared --enable-static --prefix="$PREFIX_RELEASE_ARM64" --host=aarch64-apple-darwin
+            make -j$AUTOBUILD_CPU_COUNT
+            make install
+
+            # conditionally run unit tests
+            # if [ "${DISABLE_UNIT_TESTS:-0}" = "0" ]; then
+            #     make check
+            # fi
+        popd        
    popd

+    # pushd "$PREFIX_DEBUG/lib"
+    #     fix_dylib_id "libapr-1.dylib"
+    #     dsymutil libapr-*.*.dylib
+    #     strip -x -S libapr-*.*.dylib
+    # popd
+
+    # pushd "$PREFIX_RELEASE/lib"
+    #     fix_dylib_id "libapr-1.dylib"
+    #     dsymutil libapr-*.*.dylib
+    #     strip -x -S libapr-*.*.dylib
+    # popd
+
    pushd "$TOP_DIR/apr-util"
        autoreconf -fvi

-        mkdir -p "build_debug"
-        pushd "build_debug"
-            CFLAGS="$DEBUG_CFLAGS" CXXFLAGS="$DEBUG_CXXFLAGS" LDFLAGS="$DEBUG_LDFLAGS" \
-                ../configure --prefix="$PREFIX_DEBUG" --with-apr="$PREFIX_DEBUG" \
-                --with-expat="$SDKROOT/usr"
+        # x86_64 Deploy Target
+        export MACOSX_DEPLOYMENT_TARGET=${X86_DEPLOY}
+
+        mkdir -p "build_debug_x86"
+        pushd "build_debug_x86"
+            cp -a $STAGING_DIR/packages/lib/debug/*.a $STAGING_DIR/packages/lib
+
+            CFLAGS="$ARCH_FLAGS_X86 $DEBUG_CFLAGS -msse4.2" CXXFLAGS="$ARCH_FLAGS_X86 $DEBUG_CXXFLAGS -msse4.2" LDFLAGS="$ARCH_FLAGS_X86 $DEBUG_LDFLAGS" \
+                ../configure --prefix="$PREFIX_DEBUG_X86" --with-apr="$PREFIX_DEBUG_X86" \
+                --with-expat="$PREFIX/packages" --disable-shared --enable-static --host=x86_64-apple-darwin
+            make -j$AUTOBUILD_CPU_COUNT
+            make install
+
+            # conditionally run unit tests
+            # if [ "${DISABLE_UNIT_TESTS:-0}" = "0" ]; then
+            #     export DYLD_LIBRARY_PATH="$STAGING_DIR/packages/lib"
+            #     make check
+            # fi
+
+            rm $STAGING_DIR/packages/lib/*.a
+        popd
+
+        mkdir -p "build_release_x86"
+        pushd "build_release_x86"
+            cp -a $STAGING_DIR/packages/lib/release/*.a $STAGING_DIR/packages/lib
+
+            CFLAGS="$ARCH_FLAGS_X86 $RELEASE_CFLAGS -msse4.2" CXXFLAGS="$ARCH_FLAGS_X86 $RELEASE_CXXFLAGS -msse4.2" LDFLAGS="$ARCH_FLAGS_X86 $RELEASE_LDFLAGS" \
+                ../configure --prefix="$PREFIX_RELEASE_X86" --with-apr="$PREFIX_RELEASE_X86" \
+                --with-expat="$PREFIX/packages" --disable-shared --enable-static --host=x86_64-apple-darwin
            make -j$AUTOBUILD_CPU_COUNT
            make install

@@ -201,13 +262,20 @@ if not any(frag in d for frag in ('CommonExtensions', 'VSPerfCollectionTools', '
            #     export DYLD_LIBRARY_PATH="$STAGING_DIR/packages/lib"
            #     make check
            # fi
+
+            rm $STAGING_DIR/packages/lib/*.a
        popd

-        mkdir -p "build_release"
-        pushd "build_release"
-            CFLAGS="$RELEASE_CFLAGS" CXXFLAGS="$RELEASE_CXXFLAGS" LDFLAGS="$RELEASE_LDFLAGS" \
-                ../configure --prefix="$PREFIX_RELEASE" --with-apr="$PREFIX_RELEASE" \
-                --with-expat="$SDKROOT/usr"
+        # ARM64 Deploy Target
+        export MACOSX_DEPLOYMENT_TARGET=${ARM64_DEPLOY}
+
+        mkdir -p "build_debug_arm64"
+        pushd "build_debug_arm64"
+            cp -a $STAGING_DIR/packages/lib/debug/*.a $STAGING_DIR/packages/lib
+
+            CFLAGS="$ARCH_FLAGS_ARM64 $DEBUG_CFLAGS" CXXFLAGS="$ARCH_FLAGS_ARM64 $DEBUG_CXXFLAGS" LDFLAGS="$ARCH_FLAGS_ARM64 $DEBUG_LDFLAGS" \
+                ../configure --prefix="$PREFIX_DEBUG_ARM64" --with-apr="$PREFIX_DEBUG_ARM64" \
+                --with-expat="$PREFIX/packages" --disable-shared --enable-static --host=aarch64-apple-darwin
            make -j$AUTOBUILD_CPU_COUNT
            make install

@@ -216,29 +284,42 @@ if not any(frag in d for frag in ('CommonExtensions', 'VSPerfCollectionTools', '
            #     export DYLD_LIBRARY_PATH="$STAGING_DIR/packages/lib"
            #     make check
            # fi
+
+            rm $STAGING_DIR/packages/lib/*.a
        popd
-    popd

-    pushd "$PREFIX_DEBUG/lib"
-        fix_dylib_id "libaprutil-1.dylib"
-        dsymutil libaprutil-*.*.dylib
-        strip -x -S libaprutil-*.*.dylib
-    popd
+        mkdir -p "build_release_arm64"
+        pushd "build_release_arm64"
+            cp -a $STAGING_DIR/packages/lib/release/*.a $STAGING_DIR/packages/lib
+
+            CFLAGS="$ARCH_FLAGS_ARM64 $RELEASE_CFLAGS" CXXFLAGS="$ARCH_FLAGS_ARM64 $RELEASE_CXXFLAGS" LDFLAGS="$ARCH_FLAGS_ARM64 $RELEASE_LDFLAGS" \
+                ../configure --prefix="$PREFIX_RELEASE_ARM64" --with-apr="$PREFIX_RELEASE_ARM64" \
+                --with-expat="$PREFIX/packages" --disable-shared --enable-static --host=aarch64-apple-darwin
+            make -j$AUTOBUILD_CPU_COUNT
+            make install

-    pushd "$PREFIX_RELEASE/lib"
-        fix_dylib_id "libaprutil-1.dylib"
-        dsymutil libaprutil-*.*.dylib
-        strip -x -S libaprutil-*.*.dylib
+            # conditionally run unit tests
+            # if [ "${DISABLE_UNIT_TESTS:-0}" = "0" ]; then
+            #     export DYLD_LIBRARY_PATH="$STAGING_DIR/packages/lib"
+            #     make check
+            # fi
+
+            rm $STAGING_DIR/packages/lib/*.a
+        popd
    popd

    mkdir -p "$PREFIX/include"
    mkdir -p "$PREFIX/lib/debug"
    mkdir -p "$PREFIX/lib/release"

-    cp -a $PREFIX_DEBUG/lib/*.dylib* $PREFIX/lib/debug
-    cp -a $PREFIX_RELEASE/lib/*.dylib* $PREFIX/lib/release
+    # create fat libraries
+    lipo -create ${STAGING_DIR}/temp_debug_x86/lib/libapr-1.a ${STAGING_DIR}/temp_debug_arm64/lib/libapr-1.a -output ${STAGING_DIR}/lib/debug/libapr-1.a
+    lipo -create ${STAGING_DIR}/temp_debug_x86/lib/libaprutil-1.a ${STAGING_DIR}/temp_debug_arm64/lib/libaprutil-1.a -output ${STAGING_DIR}/lib/debug/libaprutil-1.a
+    lipo -create ${STAGING_DIR}/temp_release_x86/lib/libapr-1.a ${STAGING_DIR}/temp_release_arm64/lib/libapr-1.a -output ${STAGING_DIR}/lib/release/libapr-1.a
+    lipo -create ${STAGING_DIR}/temp_release_x86/lib/libaprutil-1.a ${STAGING_DIR}/temp_release_arm64/lib/libaprutil-1.a -output ${STAGING_DIR}/lib/release/libaprutil-1.a

-    cp -a $PREFIX_RELEASE/include/* $PREFIX/include/
+    # copy headers
+    mv $STAGING_DIR/temp_release_x86/include/* $STAGING_DIR/include/
  ;;

  linux*)
No results found