[Opalvoip-svn] SF.net SVN: opalvoip:[33730] opal/trunk
Brought to you by:
csoutheren,
rjongbloed
Menu
▾
▴
[Opalvoip-svn] SF.net SVN: opalvoip:[33730] opal/trunk
|
From: <rjo...@us...> - 2015-07-11 17:23:18
|
Revision: 33730
http://sourceforge.net/p/opalvoip/code/33730
Author: rjongbloed
Date: 2015-07-11 17:23:16 +0000 (Sat, 11 Jul 2015)
Log Message:
-----------
Removed Mac-OS tests for version as barfs on Yosemite. Let compiler work it out.
Modified Paths:
--------------
opal/trunk/configure
opal/trunk/make/my_macros.m4
opal/trunk/plugins/configure
Modified: opal/trunk/configure
===================================================================
--- opal/trunk/configure 2015-07-11 17:21:15 UTC (rev 33729)
+++ opal/trunk/configure 2015-07-11 17:23:16 UTC (rev 33730)
@@ -5300,18 +5300,18 @@
/* end confdefs.h. */
/* For now, do not test the preprocessor; as of 2007 there are too many
- implementations with broken preprocessors. Perhaps this can
- be revisited in 2012. In the meantime, code should not expect
- #if to work with literals wider than 32 bits. */
+ implementations with broken preprocessors. Perhaps this can
+ be revisited in 2012. In the meantime, code should not expect
+ #if to work with literals wider than 32 bits. */
/* Test literals. */
long long int ll = 9223372036854775807ll;
long long int nll = -9223372036854775807LL;
unsigned long long int ull = 18446744073709551615ULL;
/* Test constant expressions. */
typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
- ? 1 : -1)];
+ ? 1 : -1)];
typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
- ? 1 : -1)];
+ ? 1 : -1)];
int i = 63;
int
main ()
@@ -5320,9 +5320,9 @@
long long int llmax = 9223372036854775807ll;
unsigned long long int ullmax = 18446744073709551615ull;
return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
- | (llmax / ll) | (llmax % ll)
- | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
- | (ullmax / ull) | (ullmax % ull));
+ | (llmax / ll) | (llmax % ll)
+ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+ | (ullmax / ull) | (ullmax % ull));
;
return 0;
}
@@ -5354,33 +5354,33 @@
else
ac_cv_type_long_long_int=yes
if test "x${ac_cv_prog_cc_c99-no}" = xno; then
- ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
- if test $ac_cv_type_long_long_int = yes; then
- if test "$cross_compiling" = yes; then :
+ ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
+ if test $ac_cv_type_long_long_int = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <limits.h>
- #ifndef LLONG_MAX
- # define HALF \
- (1LL << (sizeof (long long int) * CHAR_BIT - 2))
- # define LLONG_MAX (HALF - 1 + HALF)
- #endif
+ #ifndef LLONG_MAX
+ # define HALF \
+ (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+ # define LLONG_MAX (HALF - 1 + HALF)
+ #endif
int
main ()
{
long long int n = 1;
- int i;
- for (i = 0; ; i++)
- {
- long long int m = n << i;
- if (m >> i != n)
- return 1;
- if (LLONG_MAX / 2 < m)
- break;
- }
- return 0;
+ int i;
+ for (i = 0; ; i++)
+ {
+ long long int m = n << i;
+ if (m >> i != n)
+ return 1;
+ if (LLONG_MAX / 2 < m)
+ break;
+ }
+ return 0;
;
return 0;
}
@@ -5394,7 +5394,7 @@
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
- fi
+ fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
@@ -5417,18 +5417,18 @@
/* end confdefs.h. */
/* For now, do not test the preprocessor; as of 2007 there are too many
- implementations with broken preprocessors. Perhaps this can
- be revisited in 2012. In the meantime, code should not expect
- #if to work with literals wider than 32 bits. */
+ implementations with broken preprocessors. Perhaps this can
+ be revisited in 2012. In the meantime, code should not expect
+ #if to work with literals wider than 32 bits. */
/* Test literals. */
long long int ll = 9223372036854775807ll;
long long int nll = -9223372036854775807LL;
unsigned long long int ull = 18446744073709551615ULL;
/* Test constant expressions. */
typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
- ? 1 : -1)];
+ ? 1 : -1)];
typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
- ? 1 : -1)];
+ ? 1 : -1)];
int i = 63;
int
main ()
@@ -5437,9 +5437,9 @@
long long int llmax = 9223372036854775807ll;
unsigned long long int ullmax = 18446744073709551615ull;
return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
- | (llmax / ll) | (llmax % ll)
- | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
- | (ullmax / ull) | (ullmax % ull));
+ | (llmax / ll) | (llmax % ll)
+ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+ | (ullmax / ull) | (ullmax % ull));
;
return 0;
}
@@ -5592,16 +5592,9 @@
as_fn_error $? "Unable to determine iOS release number" "$LINENO" 5
fi
- MIN_IOS_VER="6.0"
- if test $target_release \< $MIN_IOS_VER; then :
- as_fn_error $? "Requires iOS release $MIN_IOS_VER
-else
- has $target_release" "$LINENO" 5
-fi
-
IOS_DEVROOT="`xcode-select -print-path`/Platforms/${target_os}.platform/Developer"
IOS_SDKROOT=${IOS_DEVROOT}/SDKs/${target_os}${target_release}.sdk
- IOS_FLAGS="-arch $target_cpu -miphoneos-version-min=$MIN_IOS_VER -isysroot ${IOS_SDKROOT}"
+ IOS_FLAGS="-arch $target_cpu -miphoneos-version-min=6.0 -isysroot ${IOS_SDKROOT}"
CPPFLAGS="${IOS_FLAGS} $CPPFLAGS"
LDFLAGS="${IOS_FLAGS} -L${IOS_SDKROOT}/usr/lib $LDFLAGS"
;;
@@ -5610,14 +5603,7 @@
target_os=Darwin
target_release=`sw_vers -productVersion`
- MIN_MACOSX_VER="10.8"
- if test $target_release \< $MIN_MACOSX_VER; then :
- as_fn_error $? "Requires Mac OS-X release $MIN_MACOSX_VER
-else
- is $target_release" "$LINENO" 5
-fi
-
- CPPFLAGS="-mmacosx-version-min=$MIN_MACOSX_VER $CPPFLAGS"
+ CPPFLAGS="-mmacosx-version-min=10.8 $CPPFLAGS"
LIBS="-framework QTKit -framework CoreVideo -framework AudioUnit $LIBS"
;;
Modified: opal/trunk/make/my_macros.m4
===================================================================
--- opal/trunk/make/my_macros.m4 2015-07-11 17:21:15 UTC (rev 33729)
+++ opal/trunk/make/my_macros.m4 2015-07-11 17:23:16 UTC (rev 33730)
@@ -487,12 +487,9 @@
iPhone* )
AS_VAR_SET_IF([target_release], , AC_MSG_ERROR([Unable to determine iOS release number]))
- MIN_IOS_VER="6.0"
- AS_IF([test $target_release \< $MIN_IOS_VER], AC_MSG_ERROR([Requires iOS release $MIN_IOS_VER, has $target_release]))
-
IOS_DEVROOT="`xcode-select -print-path`/Platforms/${target_os}.platform/Developer"
IOS_SDKROOT=${IOS_DEVROOT}/SDKs/${target_os}${target_release}.sdk
- IOS_FLAGS="-arch $target_cpu -miphoneos-version-min=$MIN_IOS_VER -isysroot ${IOS_SDKROOT}"
+ IOS_FLAGS="-arch $target_cpu -miphoneos-version-min=6.0 -isysroot ${IOS_SDKROOT}"
CPPFLAGS="${IOS_FLAGS} $CPPFLAGS"
LDFLAGS="${IOS_FLAGS} -L${IOS_SDKROOT}/usr/lib $LDFLAGS"
;;
@@ -501,10 +498,7 @@
target_os=Darwin
target_release=`sw_vers -productVersion`
- MIN_MACOSX_VER="10.8"
- AS_IF([test $target_release \< $MIN_MACOSX_VER], AC_MSG_ERROR([Requires Mac OS-X release $MIN_MACOSX_VER, is $target_release]))
-
- CPPFLAGS="-mmacosx-version-min=$MIN_MACOSX_VER $CPPFLAGS"
+ CPPFLAGS="-mmacosx-version-min=10.8 $CPPFLAGS"
LIBS="-framework QTKit -framework CoreVideo -framework AudioUnit $LIBS"
;;
Modified: opal/trunk/plugins/configure
===================================================================
--- opal/trunk/plugins/configure 2015-07-11 17:21:15 UTC (rev 33729)
+++ opal/trunk/plugins/configure 2015-07-11 17:23:16 UTC (rev 33730)
@@ -5299,18 +5299,18 @@
/* end confdefs.h. */
/* For now, do not test the preprocessor; as of 2007 there are too many
- implementations with broken preprocessors. Perhaps this can
- be revisited in 2012. In the meantime, code should not expect
- #if to work with literals wider than 32 bits. */
+ implementations with broken preprocessors. Perhaps this can
+ be revisited in 2012. In the meantime, code should not expect
+ #if to work with literals wider than 32 bits. */
/* Test literals. */
long long int ll = 9223372036854775807ll;
long long int nll = -9223372036854775807LL;
unsigned long long int ull = 18446744073709551615ULL;
/* Test constant expressions. */
typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
- ? 1 : -1)];
+ ? 1 : -1)];
typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
- ? 1 : -1)];
+ ? 1 : -1)];
int i = 63;
int
main ()
@@ -5319,9 +5319,9 @@
long long int llmax = 9223372036854775807ll;
unsigned long long int ullmax = 18446744073709551615ull;
return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
- | (llmax / ll) | (llmax % ll)
- | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
- | (ullmax / ull) | (ullmax % ull));
+ | (llmax / ll) | (llmax % ll)
+ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+ | (ullmax / ull) | (ullmax % ull));
;
return 0;
}
@@ -5353,33 +5353,33 @@
else
ac_cv_type_long_long_int=yes
if test "x${ac_cv_prog_cc_c99-no}" = xno; then
- ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
- if test $ac_cv_type_long_long_int = yes; then
- if test "$cross_compiling" = yes; then :
+ ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
+ if test $ac_cv_type_long_long_int = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <limits.h>
- #ifndef LLONG_MAX
- # define HALF \
- (1LL << (sizeof (long long int) * CHAR_BIT - 2))
- # define LLONG_MAX (HALF - 1 + HALF)
- #endif
+ #ifndef LLONG_MAX
+ # define HALF \
+ (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+ # define LLONG_MAX (HALF - 1 + HALF)
+ #endif
int
main ()
{
long long int n = 1;
- int i;
- for (i = 0; ; i++)
- {
- long long int m = n << i;
- if (m >> i != n)
- return 1;
- if (LLONG_MAX / 2 < m)
- break;
- }
- return 0;
+ int i;
+ for (i = 0; ; i++)
+ {
+ long long int m = n << i;
+ if (m >> i != n)
+ return 1;
+ if (LLONG_MAX / 2 < m)
+ break;
+ }
+ return 0;
;
return 0;
}
@@ -5393,7 +5393,7 @@
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
- fi
+ fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
@@ -5416,18 +5416,18 @@
/* end confdefs.h. */
/* For now, do not test the preprocessor; as of 2007 there are too many
- implementations with broken preprocessors. Perhaps this can
- be revisited in 2012. In the meantime, code should not expect
- #if to work with literals wider than 32 bits. */
+ implementations with broken preprocessors. Perhaps this can
+ be revisited in 2012. In the meantime, code should not expect
+ #if to work with literals wider than 32 bits. */
/* Test literals. */
long long int ll = 9223372036854775807ll;
long long int nll = -9223372036854775807LL;
unsigned long long int ull = 18446744073709551615ULL;
/* Test constant expressions. */
typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
- ? 1 : -1)];
+ ? 1 : -1)];
typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
- ? 1 : -1)];
+ ? 1 : -1)];
int i = 63;
int
main ()
@@ -5436,9 +5436,9 @@
long long int llmax = 9223372036854775807ll;
unsigned long long int ullmax = 18446744073709551615ull;
return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
- | (llmax / ll) | (llmax % ll)
- | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
- | (ullmax / ull) | (ullmax % ull));
+ | (llmax / ll) | (llmax % ll)
+ | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+ | (ullmax / ull) | (ullmax % ull));
;
return 0;
}
@@ -5591,16 +5591,9 @@
as_fn_error $? "Unable to determine iOS release number" "$LINENO" 5
fi
- MIN_IOS_VER="6.0"
- if test $target_release \< $MIN_IOS_VER; then :
- as_fn_error $? "Requires iOS release $MIN_IOS_VER
-else
- has $target_release" "$LINENO" 5
-fi
-
IOS_DEVROOT="`xcode-select -print-path`/Platforms/${target_os}.platform/Developer"
IOS_SDKROOT=${IOS_DEVROOT}/SDKs/${target_os}${target_release}.sdk
- IOS_FLAGS="-arch $target_cpu -miphoneos-version-min=$MIN_IOS_VER -isysroot ${IOS_SDKROOT}"
+ IOS_FLAGS="-arch $target_cpu -miphoneos-version-min=6.0 -isysroot ${IOS_SDKROOT}"
CPPFLAGS="${IOS_FLAGS} $CPPFLAGS"
LDFLAGS="${IOS_FLAGS} -L${IOS_SDKROOT}/usr/lib $LDFLAGS"
;;
@@ -5609,14 +5602,7 @@
target_os=Darwin
target_release=`sw_vers -productVersion`
- MIN_MACOSX_VER="10.8"
- if test $target_release \< $MIN_MACOSX_VER; then :
- as_fn_error $? "Requires Mac OS-X release $MIN_MACOSX_VER
-else
- is $target_release" "$LINENO" 5
-fi
-
- CPPFLAGS="-mmacosx-version-min=$MIN_MACOSX_VER $CPPFLAGS"
+ CPPFLAGS="-mmacosx-version-min=10.8 $CPPFLAGS"
LIBS="-framework QTKit -framework CoreVideo -framework AudioUnit $LIBS"
;;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|