ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Officially support Ninja

Browse Source
This commit is contained in:
DRC
2020-12-08 21:25:47 -06:00
parent 110d8d6dca
commit 1388ad6757
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
BUILDING.md
View File

@@ -103,6 +103,13 @@ directory, whereas *{source_directory}* refers to the libjpeg-turbo source
directory. For in-tree builds, these directories are the same. directory. For in-tree builds, these directories are the same.
Ninja
-----
In all of the procedures and recipes below, replace `make` with `ninja` and
`Unix Makefiles` with `Ninja` if using Ninja.
Build Procedure Build Procedure
--------------- ---------------

4
release/makedpkg.in
View File

@@ -67,7 +67,7 @@ makedeb()
mkdir $TMPDIR/DEBIAN mkdir $TMPDIR/DEBIAN
if [ $SUPPLEMENT = 1 ]; then if [ $SUPPLEMENT = 1 ]; then
make install DESTDIR=$TMPDIR DESTDIR=$TMPDIR @CMAKE_MAKE_PROGRAM@ install
rm -rf $TMPDIR$BINDIR rm -rf $TMPDIR$BINDIR
if [ "$DATAROOTDIR" != "$PREFIX" ]; then if [ "$DATAROOTDIR" != "$PREFIX" ]; then
rm -rf $TMPDIR$DATAROOTDIR rm -rf $TMPDIR$DATAROOTDIR
@@ -79,7 +79,7 @@ makedeb()
rm -rf $TMPDIR$INCLUDEDIR rm -rf $TMPDIR$INCLUDEDIR
rm -rf $TMPDIR$MANDIR rm -rf $TMPDIR$MANDIR
else else
make install DESTDIR=$TMPDIR DESTDIR=$TMPDIR @CMAKE_MAKE_PROGRAM@ install
if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$DOCDIR" = "@CMAKE_INSTALL_DEFAULT_PREFIX@/doc" ]; then if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$DOCDIR" = "@CMAKE_INSTALL_DEFAULT_PREFIX@/doc" ]; then
safedirmove $TMPDIR/$DOCDIR $TMPDIR/usr/share/doc/$PKGNAME-$VERSION $TMPDIR/__tmpdoc safedirmove $TMPDIR/$DOCDIR $TMPDIR/usr/share/doc/$PKGNAME-$VERSION $TMPDIR/__tmpdoc
ln -fs /usr/share/doc/$DIRNAME-$VERSION $TMPDIR$DOCDIR ln -fs /usr/share/doc/$DIRNAME-$VERSION $TMPDIR$DOCDIR

6
release/makemacpkg.in
View File

@@ -90,7 +90,7 @@ TMPDIR=`mktemp -d /tmp/$PKGNAME-build.XXXXXX`
PKGROOT=$TMPDIR/pkg/Package_Root PKGROOT=$TMPDIR/pkg/Package_Root
mkdir -p $PKGROOT mkdir -p $PKGROOT
make install DESTDIR=$PKGROOT DESTDIR=$PKGROOT @CMAKE_MAKE_PROGRAM@ install
if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$DOCDIR" = "@CMAKE_INSTALL_DEFAULT_PREFIX@/doc" ]; then if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$DOCDIR" = "@CMAKE_INSTALL_DEFAULT_PREFIX@/doc" ]; then
mkdir -p $PKGROOT/Library/Documentation mkdir -p $PKGROOT/Library/Documentation
@@ -109,13 +109,13 @@ install_subbuild()
echo ERROR: $ARCHNAME build directory $BUILDDIR does not exist echo ERROR: $ARCHNAME build directory $BUILDDIR does not exist
exit 1 exit 1
fi fi
if [ ! -f $BUILDDIR/Makefile ]; then if [ ! -f $BUILDDIR/Makefile -a ! -f $BUILDDIR/build.ninja ]; then
echo ERROR: $ARCHNAME build directory $BUILDDIR is not configured echo ERROR: $ARCHNAME build directory $BUILDDIR is not configured
exit 1 exit 1
fi fi
mkdir -p $TMPDIR/dist.$DIRNAME mkdir -p $TMPDIR/dist.$DIRNAME
pushd $BUILDDIR pushd $BUILDDIR
make install DESTDIR=$TMPDIR/dist.$DIRNAME DESTDIR=$TMPDIR/dist.$DIRNAME @CMAKE_MAKE_PROGRAM@ install
popd popd
$LIPO -create \ $LIPO -create \
$PKGROOT/$LIBDIR/$LIBJPEG_DSO_NAME \ $PKGROOT/$LIBDIR/$LIBJPEG_DSO_NAME \

2
release/maketarball.in
View File

@@ -32,7 +32,7 @@ rm -f $PKGNAME-$VERSION-$OS-$ARCH.tar.bz2
TMPDIR=`mktemp -d /tmp/$PKGNAME-build.XXXXXX` TMPDIR=`mktemp -d /tmp/$PKGNAME-build.XXXXXX`
mkdir -p $TMPDIR/install mkdir -p $TMPDIR/install
make install DESTDIR=$TMPDIR/install DESTDIR=$TMPDIR/install @CMAKE_MAKE_PROGRAM@ install
echo tartest >$TMPDIR/tartest echo tartest >$TMPDIR/tartest
GNUTAR=0 GNUTAR=0
BSDTAR=0 BSDTAR=0

2
release/rpm.spec.in
View File

@@ -102,7 +102,7 @@ broader range of users and developers.
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT @CMAKE_MAKE_PROGRAM@ install
/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
#-->%if 0 #-->%if 0