Ticket #16349: patch-universal_archs.diff
| File patch-universal_archs.diff, 6.5 KB (added by jewart@…, 3 years ago) |
|---|
-
configure
old new 1 1 #! /bin/sh 2 # From configure.in Revision: 67 228.2 # From configure.in Revision: 67732 . 3 3 # Guess values for system-dependent variables and create Makefiles. 4 4 # Generated by GNU Autoconf 2.61 for python 2.5. 5 5 # … … 657 657 SOVERSION 658 658 CONFIG_ARGS 659 659 UNIVERSALSDK 660 UNIVERSALARCHS 660 661 PYTHONFRAMEWORK 661 662 PYTHONFRAMEWORKDIR 662 663 PYTHONFRAMEWORKPREFIX … … 1314 1315 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 1315 1316 --enable-universalsdk[=SDKDIR] 1316 1317 Build agains Mac OS X 10.4u SDK (ppc/i386) 1318 --enable-universalarchs[=ARCHS] 1319 Build using specific architectures for the OS X 1320 Universal build 1317 1321 --enable-framework[=INSTALLDIR] 1318 1322 Build (MacOSX|Darwin) framework 1319 1323 --enable-shared disable/enable building shared python library … … 1879 1883 1880 1884 1881 1885 1886 # Check whether --enable-universalarchs was given. 1887 if test "${enable_universalarchs+set}" = set; then 1888 enableval=$enable_universalarchs; 1889 case $enableval in 1890 *) 1891 UNIVERSALARCHS=$enableval 1892 ;; 1893 esac 1894 1895 else 1896 1897 UNIVERSALARCHS="ppc i386" 1898 1899 fi 1900 1901 1902 1882 1903 # Check whether --enable-framework was given. 1883 1904 if test "${enable_framework+set}" = set; then 1884 1905 enableval=$enable_framework; … … 3752 3773 { echo "$as_me:$LINENO: result: no" >&5 3753 3774 echo "${ECHO_T}no" >&6; } 3754 3775 fi 3755 rm -f conftest*3776 rm -f -r conftest* 3756 3777 3757 3778 3758 3779 … … 5128 5152 else 5129 5153 ac_cv_header_stdc=no 5130 5154 fi 5131 rm -f conftest*5155 rm -f -r conftest* 5132 5156 5133 5157 fi 5134 5158 … … 5149 5173 else 5150 5174 ac_cv_header_stdc=no 5151 5175 fi 5152 rm -f conftest*5176 rm -f -r conftest* 5153 5177 5154 5178 fi 5155 5179 … … 6242 6266 6243 6267 6244 6268 fi 6245 rm -f conftest*6269 rm -f -r conftest* 6246 6270 6247 6271 { echo "$as_me:$LINENO: result: $was_it_defined" >&5 6248 6272 echo "${ECHO_T}$was_it_defined" >&6; } … … 6772 6796 else 6773 6797 ac_cv_type_uid_t=no 6774 6798 fi 6775 rm -f conftest*6799 rm -f -r conftest* 6776 6800 6777 6801 fi 6778 6802 { echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 … … 11524 11548 if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2 11525 11549 then 11526 11550 if test "${enable_universalsdk}"; then 11527 LDFLAGS="-arch i386 -arch ppc -isysroot ${UNIVERSALSDK} ${LDFLAGS}" 11551 for ARCH in ${UNIVERSALARCHS}; do 11552 LDFLAGS="${LDFLAGS} -arch ${ARCH} " 11553 done 11554 LDFLAGS="${LDFLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}" 11528 11555 fi 11529 11556 LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup' 11530 11557 BLDSHARED="$LDSHARED" … … 12607 12634 else 12608 12635 unistd_defines_pthreads=no 12609 12636 fi 12610 rm -f conftest*12637 rm -f -r conftest* 12611 12638 12612 12639 { echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5 12613 12640 echo "${ECHO_T}$unistd_defines_pthreads" >&6; } … … 14221 14248 $EGREP "yes" >/dev/null 2>&1; then 14222 14249 ipv6type=$i 14223 14250 fi 14224 rm -f conftest*14251 rm -f -r conftest* 14225 14252 14226 14253 ;; 14227 14254 kame) … … 14244 14271 ipv6libdir=/usr/local/v6/lib 14245 14272 ipv6trylibc=yes 14246 14273 fi 14247 rm -f conftest*14274 rm -f -r conftest* 14248 14275 14249 14276 ;; 14250 14277 linux-glibc) … … 14265 14292 ipv6type=$i; 14266 14293 ipv6trylibc=yes 14267 14294 fi 14268 rm -f conftest*14295 rm -f -r conftest* 14269 14296 14270 14297 ;; 14271 14298 linux-inet6) … … 14303 14330 ipv6lib=inet6; 14304 14331 ipv6libdir=/usr/local/v6/lib 14305 14332 fi 14306 rm -f conftest*14333 rm -f -r conftest* 14307 14334 14308 14335 ;; 14309 14336 v6d) … … 14326 14353 ipv6libdir=/usr/local/v6/lib; 14327 14354 BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS" 14328 14355 fi 14329 rm -f conftest*14356 rm -f -r conftest* 14330 14357 14331 14358 ;; 14332 14359 zeta) … … 14348 14375 ipv6lib=inet6; 14349 14376 ipv6libdir=/usr/local/v6/lib 14350 14377 fi 14351 rm -f conftest*14378 rm -f -r conftest* 14352 14379 14353 14380 ;; 14354 14381 esac … … 21179 21206 _ACEOF 21180 21207 21181 21208 fi 21182 rm -f conftest*21209 rm -f -r conftest* 21183 21210 21184 21211 fi 21185 21212 … … 21378 21405 _ACEOF 21379 21406 21380 21407 fi 21381 rm -f conftest*21408 rm -f -r conftest* 21382 21409 21383 21410 fi 21384 21411 … … 23272 23299 SOVERSION!$SOVERSION$ac_delim 23273 23300 CONFIG_ARGS!$CONFIG_ARGS$ac_delim 23274 23301 UNIVERSALSDK!$UNIVERSALSDK$ac_delim 23302 UNIVERSALARCHS!$UNIVERSALARCHS$ac_delim 23275 23303 PYTHONFRAMEWORK!$PYTHONFRAMEWORK$ac_delim 23276 23304 PYTHONFRAMEWORKDIR!$PYTHONFRAMEWORKDIR$ac_delim 23277 23305 PYTHONFRAMEWORKPREFIX!$PYTHONFRAMEWORKPREFIX$ac_delim … … 23327 23355 CFLAGSFORSHARED!$CFLAGSFORSHARED$ac_delim 23328 23356 SHLIBS!$SHLIBS$ac_delim 23329 23357 USE_SIGNAL_MODULE!$USE_SIGNAL_MODULE$ac_delim 23330 SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim23331 23358 _ACEOF 23332 23359 23333 23360 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then … … 23369 23396 ac_delim='%!_!# ' 23370 23397 for ac_last_try in false false false false false :; do 23371 23398 cat >conf$$subs.sed <<_ACEOF 23399 SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim 23372 23400 USE_THREAD_MODULE!$USE_THREAD_MODULE$ac_delim 23373 23401 LDLAST!$LDLAST$ac_delim 23374 23402 THREADOBJ!$THREADOBJ$ac_delim … … 23390 23418 LTLIBOBJS!$LTLIBOBJS$ac_delim 23391 23419 _ACEOF 23392 23420 23393 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then23421 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then 23394 23422 break 23395 23423 elif $ac_last_try; then 23396 23424 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -
Makefile.pre.in
old new 112 112 113 113 # Short name and location for Mac OS X Python framework 114 114 UNIVERSALSDK=@UNIVERSALSDK@ 115 # Archs for Universal binaries 116 UNIVERSALARCHS=@UNIVERSALARCHS@ 115 117 PYTHONFRAMEWORK= @PYTHONFRAMEWORK@ 116 118 PYTHONFRAMEWORKDIR= @PYTHONFRAMEWORKDIR@ 117 119 PYTHONFRAMEWORKPREFIX= @PYTHONFRAMEWORKPREFIX@ … … 387 389 $(RESSRCDIR)/English.lproj/InfoPlist.strings 388 390 $(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION) 389 391 if test "${UNIVERSALSDK}"; then \ 390 $(CC) -o $(LDLIBRARY) -arch i386 -arch ppc -dynamiclib \ 392 if test "${UNIVERSALARCHS}"; then \ 393 for ARCH in "${UNIVERSALARCHS}"; \ 394 do \ 395 ARCHS="${ARCHS} -arch ${ARCH}" \ 396 done \ 397 else \ 398 ARCHS="-arch i386 -arch ppc" \ 399 fi \ 400 $(CC) -o $(LDLIBRARY) ${ARCHS} -dynamiclib \ 391 401 -isysroot "${UNIVERSALSDK}" \ 392 402 -all_load $(LIBRARY) -Wl,-single_module \ 393 403 -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python \ -
(a) configure vs. (b) /tmp/py25-configure
a b 4557 4557 Darwin*) 4558 4558 BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd" 4559 4559 if test "${enable_universalsdk}"; then 4560 BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" 4560 for ARCH in ${UNIVERSALARCHS}; do 4561 BASECFLAGS="${BASECFLAGS} -arch ${ARCH} " 4562 done 4563 BASECFLAGS="${BASECFLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" 4561 4564 fi 4562 4565 4563 4566 ;;