diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2012-03-23 00:50:09 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2012-03-23 00:50:09 +0000 |
| commit | 555da902b6d2bfcd406f5dc0ef22b220746b85a9 (patch) | |
| tree | 79ca09c9c5978bf4d4a946fc51ed8cb3d7f19ecc /trunk | |
| parent | 1fddb8c15d3dfb2c4b1d2f4d286fbc3f52223dba (diff) | |
Fix universal DMG build
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@815 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/Makefile.am | 6 | ||||
| -rw-r--r-- | trunk/release/makemacpkg.in | 20 |
2 files changed, 16 insertions, 10 deletions
diff --git a/trunk/Makefile.am b/trunk/Makefile.am index bdeeed9..d232a0d 100644 --- a/trunk/Makefile.am +++ b/trunk/Makefile.am @@ -297,15 +297,15 @@ deb: all if X86_64 udmg: all - sh pkgscripts/makemacpkg -builddir32 ${BUILDDIR32} + sh pkgscripts/makemacpkg -build32 ${BUILDDIR32} iosdmg: all - sh pkgscripts/makemacpkg -builddir32 ${BUILDDIR32} -builddirarmv6 ${BUILDDIRARMV6} -builddirarmv7 ${BUILDDIRARMV7} + sh pkgscripts/makemacpkg -build32 ${BUILDDIR32} -buildarmv6 ${BUILDDIRARMV6} -buildarmv7 ${BUILDDIRARMV7} else iosdmg: all - sh pkgscripts/makemacpkg -builddirarmv6 ${BUILDDIRARMV6} -builddirarmv7 ${BUILDDIRARMV7} + sh pkgscripts/makemacpkg -buildarmv6 ${BUILDDIRARMV6} -buildarmv7 ${BUILDDIRARMV7} endif diff --git a/trunk/release/makemacpkg.in b/trunk/release/makemacpkg.in index 6cb4069..7b43aa3 100644 --- a/trunk/release/makemacpkg.in +++ b/trunk/release/makemacpkg.in @@ -17,7 +17,7 @@ onexit() usage() { - echo "$0 [-builddir32 [32-bit build dir]] [-builddirarmv6 [ARM v6 build dir]] [-builddirarmv7 [ARM v7 build dir]]" + echo "$0 [-build32 [32-bit build dir]] [-buildarmv6 [ARM v6 build dir]] [-buildarmv7 [ARM v7 build dir]]" exit 1 } @@ -26,27 +26,33 @@ VERSION=@VERSION@ BUILD=@BUILD@ SRCDIR=@abs_top_srcdir@ BUILDDIR32=@abs_top_srcdir@/osxx86 +BUILD32=0 BUILDDIRARMV6=@abs_top_srcdir@/iosarmv6 +BUILDARMV6=0 BUILDDIRARMV7=@abs_top_srcdir@/iosarmv7 +BUILDARMV7=0 WITH_JAVA=@WITH_JAVA@ while [ $# -gt 0 ]; do case $1 in -h*) usage 0 ;; - -builddir32) + -build32) + BUILD32=1 if [ $# -gt 1 ]; then if [[ ! "$2" =~ -.* ]]; then BUILDDIR32=$2; shift fi fi ;; - -builddirarmv6) + -buildarmv6) + BUILDARMV6=1 if [ $# -gt 1 ]; then if [[ ! "$2" =~ -.* ]]; then BUILDDIRARMV6=$2; shift fi fi ;; - -builddirarmv7) + -buildarmv7) + BUILDARMV7=1 if [ $# -gt 1 ]; then if [[ ! "$2" =~ -.* ]]; then BUILDDIRARMV7=$2; shift @@ -76,7 +82,7 @@ mv $PKGROOT/opt/$PACKAGE_NAME/lib/libturbojpeg.* $PKGROOT/usr/lib mkdir -p $PKGROOT/usr/include mv $PKGROOT/opt/$PACKAGE_NAME/include/turbojpeg.h $PKGROOT/usr/include -if [ ! "$BUILDDIR32" = "" ]; then +if [ $BUILD32 = 1 ]; then if [ ! -d $BUILDDIR32 ]; then echo ERROR: 32-bit build directory $BUILDDIR32 does not exist exit 1 @@ -141,7 +147,7 @@ if [ ! "$BUILDDIR32" = "" ]; then fi -if [ ! "$BUILDDIRARMV6" = "" ]; then +if [ $BUILDARMV6 = 1 ]; then if [ ! -d $BUILDDIRARMV6 ]; then echo ERROR: ARM v6 build directory $BUILDDIRARMV6 does not exist exit 1 @@ -164,7 +170,7 @@ if [ ! "$BUILDDIRARMV6" = "" ]; then -output $PKGROOT/usr/lib/libturbojpeg.a fi -if [ ! "$BUILDDIRARMV7" = "" ]; then +if [ $BUILDARMV7 = 1 ]; then if [ ! -d $BUILDDIRARMV7 ]; then echo ERROR: ARM v7 build directory $BUILDDIRARMV7 does not exist exit 1 |