mirror of
https://github.com/libjpeg-turbo/libjpeg-turbo
synced 2025-03-28 21:13:18 +00:00
Build: Make Mac packaging architecture-agnostic
Rename the ARMV8_BUILD CMake variable to SECONDARY_BUILD, and modify the makemacpkg script so that it allows any architecture in a primary or secondary build. The idea is that Apple Silicon users can package an arm64 primary build and a secondary x86_64 build, and Intel users can package an x86_64 primary build and a secondary arm64 build, using the same procedure. Also simplify the iOS build instructions, using the CMAKE_OSX_ARCHITECTURES variable rather than a toolchain.
This commit is contained in:
DRC
parent
9758c8a74c
commit
be7a0c8bae
35
BUILDING.md
35
BUILDING.md
@ -415,17 +415,13 @@ iPhone 5S/iPad Mini 2/iPad Air and newer.
|
||||
|
||||
IOS_PLATFORMDIR=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform
|
||||
IOS_SYSROOT=($IOS_PLATFORMDIR/Developer/SDKs/iPhoneOS*.sdk)
|
||||
export CFLAGS="-Wall -arch arm64 -miphoneos-version-min=8.0 -funwind-tables"
|
||||
export CFLAGS="-Wall -miphoneos-version-min=8.0 -funwind-tables"
|
||||
|
||||
cd {build_directory}
|
||||
|
||||
cat <<EOF >toolchain.cmake
|
||||
set(CMAKE_SYSTEM_NAME Darwin)
|
||||
set(CMAKE_SYSTEM_PROCESSOR aarch64)
|
||||
set(CMAKE_C_COMPILER /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang)
|
||||
EOF
|
||||
|
||||
cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake \
|
||||
cmake -G"Unix Makefiles" \
|
||||
-DCMAKE_C_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang \
|
||||
-DCMAKE_OSX_ARCHITECTURES=arm64 \
|
||||
-DCMAKE_OSX_SYSROOT=${IOS_SYSROOT[0]} \
|
||||
[additional CMake flags] {source_directory}
|
||||
make
|
||||
@ -643,18 +639,19 @@ are installed by default on OS X/macOS 10.7 and later.
|
||||
In order to create a Mac package/disk image that contains universal
|
||||
x86-64/Arm binaries, set the following CMake variable:
|
||||
|
||||
* `ARMV8_BUILD`: Directory containing an Armv8 (64-bit) iOS or macOS build of
|
||||
libjpeg-turbo to include in the universal binaries
|
||||
* `SECONDARY_BUILD`: Directory containing a cross-compiled x86-64 or Armv8
|
||||
(64-bit) iOS or macOS build of libjpeg-turbo to include in the universal
|
||||
binaries
|
||||
|
||||
You should first use CMake to configure an Armv8 sub-build of libjpeg-turbo
|
||||
(see "Building libjpeg-turbo for iOS" above, if applicable) in a build
|
||||
directory that matches the one specified in the aforementioned CMake variable.
|
||||
Next, configure the primary (x86-64) build of libjpeg-turbo as an out-of-tree
|
||||
build, specifying the aforementioned CMake variable, and build it. Once the
|
||||
primary build has been built, run `make dmg` from the build directory. The
|
||||
packaging system will build the sub-build, use lipo to combine it with the
|
||||
primary build into a single set of universal binaries, then package the
|
||||
universal binaries.
|
||||
You should first use CMake to configure the cross-compiled x86-64 or Armv8
|
||||
secondary build of libjpeg-turbo (see "Building libjpeg-turbo for iOS" above,
|
||||
if applicable) in a build directory that matches the one specified in the
|
||||
aforementioned CMake variable. Next, configure the primary (native) build of
|
||||
libjpeg-turbo as an out-of-tree build, specifying the aforementioned CMake
|
||||
variable, and build it. Once the primary build has been built, run `make dmg`
|
||||
from the build directory. The packaging system will build the secondary build,
|
||||
use lipo to combine it with the primary build into a single set of universal
|
||||
binaries, then package the universal binaries.
|
||||
|
||||
|
||||
Windows
|
||||
|
||||
@ -127,8 +127,8 @@ endif() # WIN32
|
||||
|
||||
if(APPLE)
|
||||
|
||||
set(ARMV8_BUILD "" CACHE PATH
|
||||
"Directory containing Armv8 iOS or macOS build to include in universal binaries")
|
||||
set(SECONDARY_BUILD "" CACHE PATH
|
||||
"Directory containing cross-compiled x86-64 or Armv8 (64-bit) iOS or macOS build to include in universal binaries")
|
||||
|
||||
set(MACOS_APP_CERT_NAME "" CACHE STRING
|
||||
"Name of the Developer ID Application certificate (in the macOS keychain) that should be used to sign the libjpeg-turbo DMG. Leave this blank to generate an unsigned DMG.")
|
||||
|
||||
@ -51,7 +51,7 @@ PKGNAME=@PKGNAME@
|
||||
VERSION=@VERSION@
|
||||
BUILD=@BUILD@
|
||||
SRCDIR=@CMAKE_CURRENT_SOURCE_DIR@
|
||||
BUILDDIRARMV8=@ARMV8_BUILD@
|
||||
BUILDDIRSECONDARY=@SECONDARY_BUILD@
|
||||
WITH_JAVA=@WITH_JAVA@
|
||||
MACOS_APP_CERT_NAME="@MACOS_APP_CERT_NAME@"
|
||||
MACOS_INST_CERT_NAME="@MACOS_INST_CERT_NAME@"
|
||||
@ -98,69 +98,66 @@ if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$DOCDIR" = "@CMAKE_INSTALL
|
||||
ln -fs /Library/Documentation/$PKGNAME $PKGROOT$DOCDIR
|
||||
fi
|
||||
|
||||
install_subbuild()
|
||||
install_secondarybuild()
|
||||
{
|
||||
BUILDDIR=$1
|
||||
ARCHNAME=$2
|
||||
DIRNAME=$3
|
||||
LIPOARCH=$4
|
||||
|
||||
if [ ! -d $BUILDDIR ]; then
|
||||
echo ERROR: $ARCHNAME build directory $BUILDDIR does not exist
|
||||
echo ERROR: Secondary build directory $BUILDDIR does not exist
|
||||
exit 1
|
||||
fi
|
||||
if [ ! -f $BUILDDIR/Makefile -a ! -f $BUILDDIR/build.ninja ]; then
|
||||
echo ERROR: $ARCHNAME build directory $BUILDDIR is not configured
|
||||
echo ERROR: Secondary build directory $BUILDDIR is not configured
|
||||
exit 1
|
||||
fi
|
||||
mkdir -p $TMPDIR/dist.$DIRNAME
|
||||
mkdir -p $TMPDIR/dist.secondary
|
||||
pushd $BUILDDIR
|
||||
DESTDIR=$TMPDIR/dist.$DIRNAME @CMAKE_MAKE_PROGRAM@ install
|
||||
DESTDIR=$TMPDIR/dist.secondary @CMAKE_MAKE_PROGRAM@ install
|
||||
popd
|
||||
$LIPO -create \
|
||||
$PKGROOT/$LIBDIR/$LIBJPEG_DSO_NAME \
|
||||
-arch $LIPOARCH $TMPDIR/dist.$DIRNAME/$LIBDIR/$LIBJPEG_DSO_NAME \
|
||||
$TMPDIR/dist.secondary/$LIBDIR/$LIBJPEG_DSO_NAME \
|
||||
-output $PKGROOT/$LIBDIR/$LIBJPEG_DSO_NAME
|
||||
$LIPO -create \
|
||||
$PKGROOT/$LIBDIR/libjpeg.a \
|
||||
-arch $LIPOARCH $TMPDIR/dist.$DIRNAME/$LIBDIR/libjpeg.a \
|
||||
$TMPDIR/dist.secondary/$LIBDIR/libjpeg.a \
|
||||
-output $PKGROOT/$LIBDIR/libjpeg.a
|
||||
$LIPO -create \
|
||||
$PKGROOT/$LIBDIR/$TURBOJPEG_DSO_NAME \
|
||||
-arch $LIPOARCH $TMPDIR/dist.$DIRNAME/$LIBDIR/$TURBOJPEG_DSO_NAME \
|
||||
$TMPDIR/dist.secondary/$LIBDIR/$TURBOJPEG_DSO_NAME \
|
||||
-output $PKGROOT/$LIBDIR/$TURBOJPEG_DSO_NAME
|
||||
$LIPO -create \
|
||||
$PKGROOT/$LIBDIR/libturbojpeg.a \
|
||||
-arch $LIPOARCH $TMPDIR/dist.$DIRNAME/$LIBDIR/libturbojpeg.a \
|
||||
$TMPDIR/dist.secondary/$LIBDIR/libturbojpeg.a \
|
||||
-output $PKGROOT/$LIBDIR/libturbojpeg.a
|
||||
$LIPO -create \
|
||||
$PKGROOT/$BINDIR/cjpeg \
|
||||
-arch $LIPOARCH $TMPDIR/dist.$DIRNAME/$BINDIR/cjpeg \
|
||||
$TMPDIR/dist.secondary/$BINDIR/cjpeg \
|
||||
-output $PKGROOT/$BINDIR/cjpeg
|
||||
$LIPO -create \
|
||||
$PKGROOT/$BINDIR/djpeg \
|
||||
-arch $LIPOARCH $TMPDIR/dist.$DIRNAME/$BINDIR/djpeg \
|
||||
$TMPDIR/dist.secondary/$BINDIR/djpeg \
|
||||
-output $PKGROOT/$BINDIR/djpeg
|
||||
$LIPO -create \
|
||||
$PKGROOT/$BINDIR/jpegtran \
|
||||
-arch $LIPOARCH $TMPDIR/dist.$DIRNAME/$BINDIR/jpegtran \
|
||||
$TMPDIR/dist.secondary/$BINDIR/jpegtran \
|
||||
-output $PKGROOT/$BINDIR/jpegtran
|
||||
$LIPO -create \
|
||||
$PKGROOT/$BINDIR/tjbench \
|
||||
-arch $LIPOARCH $TMPDIR/dist.$DIRNAME/$BINDIR/tjbench \
|
||||
$TMPDIR/dist.secondary/$BINDIR/tjbench \
|
||||
-output $PKGROOT/$BINDIR/tjbench
|
||||
$LIPO -create \
|
||||
$PKGROOT/$BINDIR/rdjpgcom \
|
||||
-arch $LIPOARCH $TMPDIR/dist.$DIRNAME/$BINDIR/rdjpgcom \
|
||||
$TMPDIR/dist.secondary/$BINDIR/rdjpgcom \
|
||||
-output $PKGROOT/$BINDIR/rdjpgcom
|
||||
$LIPO -create \
|
||||
$PKGROOT/$BINDIR/wrjpgcom \
|
||||
-arch $LIPOARCH $TMPDIR/dist.$DIRNAME/$BINDIR/wrjpgcom \
|
||||
$TMPDIR/dist.secondary/$BINDIR/wrjpgcom \
|
||||
-output $PKGROOT/$BINDIR/wrjpgcom
|
||||
}
|
||||
|
||||
if [ "$BUILDDIRARMV8" != "" ]; then
|
||||
install_subbuild $BUILDDIRARMV8 Armv8 armv8 arm64
|
||||
if [ "$BUILDDIRSECONDARY" != "" ]; then
|
||||
install_secondarybuild $BUILDDIRSECONDARY
|
||||
fi
|
||||
|
||||
install_name_tool -id $LIBDIR/$LIBJPEG_DSO_NAME $PKGROOT/$LIBDIR/$LIBJPEG_DSO_NAME
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user