Attachment #394882 for bug #537684

View | Details | Raw Unified | Return to bug 537684
Collapse All | Expand All

Lines 6-14 Link Here

(-)./toolchain-prefix-wrapper-0.3.1723/config.h.in.orig (-3 lines)
6	/* gentoo portage eprefix */	6	/* gentoo portage eprefix */
7	#undef GENTOO_PORTAGE_EPREFIX	7	#undef GENTOO_PORTAGE_EPREFIX
8		8
9	/* macosx_version_min */
10	#undef MIN_OSX_TARGET
11
12	/* Name of package */	9	/* Name of package */
13	#undef PACKAGE	10	#undef PACKAGE
14		11




)
AC_SUBST(GENTOO_PORTAGE_EPREFIX)

AC_MSG_CHECKING([for Mac OS X minimum deployment target])
AC_ARG_WITH([macosx-version-min],
	[AC_HELP_STRING(
	 	[--with-macosx-version-min],
		[the minimum deployment target on Mac OS X, such as 10.4]
	)],
	[MIN_OSX_TARGET=$withval],
	[MIN_OSX_TARGET=auto]
)
# We only "support" Tiger, Leopard and Snow Leopard and Lion
case $ac_cv_host in
	*-darwin*)
		case "x${MIN_OSX_TARGET}" in
			x10.[[3456789]]) ;;
			xno)
				AC_ERROR([--with-macosx-version-min must be given on Mac OS X hosts])
			;;
			xauto)
				# auto guessing
				case $ac_cv_host in
					*-darwin8*)
						MIN_OSX_TARGET=10.4
					;;
					*-darwin9*)
						MIN_OSX_TARGET=10.5
					;;
					*-darwin10*)
						MIN_OSX_TARGET=10.6
					;;
					*-darwin11*)
						MIN_OSX_TARGET=10.7
					;;
				esac
			;;
			*)
				AC_ERROR([need an explicit Mac OS X version number with --with-macosx-version-min])
			;;
		esac
		AC_MSG_RESULT(['${MIN_OSX_TARGET}'])
	;;
	*)
		MIN_OSX_TARGET="you shouldn't use this"
		AC_MSG_RESULT([irrelevant for $ac_cv_host])
	;;
esac
AC_DEFINE_UNQUOTED(
	[MIN_OSX_TARGET], ["${MIN_OSX_TARGET}"],
	[macosx_version_min]
)
AC_SUBST(MIN_OSX_TARGET)

AC_MSG_CHECKING([whether to use native ld even when GNU ld is supported])
AC_ARG_WITH([native-ld],
	[AC_HELP_STRING(

Lines 22-29 Link Here

(-)./toolchain-prefix-wrapper-0.3.1723/ld/darwinplugin.c.orig (-2 lines)
22	err = -1;	22	err = -1;
23		23
24	if (StringListAppendConcat(data->out->argList, "-search_paths_first", 19, NULL) < 0) break;	24	if (StringListAppendConcat(data->out->argList, "-search_paths_first", 19, NULL) < 0) break;
25	if (StringListAppendConcat(data->out->argList, "-macosx_version_min", 19, NULL) < 0) break;
26	if (StringListAppendConcat(data->out->argList, MIN_OSX_TARGET, sizeof(MIN_OSX_TARGET), NULL) < 0) break;
27		25
28		26
29	/* keep argv[1] ... argv[n] */	27	/* keep argv[1] ... argv[n] */

Lines 160-166 Link Here

(-)./toolchain-prefix-wrapper-0.3.1723/ld/Makefile.in.orig (-1 lines)
160	LIBS = @LIBS@	160	LIBS = @LIBS@
161	LTLIBOBJS = @LTLIBOBJS@	161	LTLIBOBJS = @LTLIBOBJS@
162	MAKEINFO = @MAKEINFO@	162	MAKEINFO = @MAKEINFO@
163	MIN_OSX_TARGET = @MIN_OSX_TARGET@
164	MKDIR_P = @MKDIR_P@	163	MKDIR_P = @MKDIR_P@
165	NATIVELD = @NATIVELD@	164	NATIVELD = @NATIVELD@
166	OBJEXT = @OBJEXT@	165	OBJEXT = @OBJEXT@

Lines 165-171 Link Here

(-)./toolchain-prefix-wrapper-0.3.1723/Makefile.in.orig (-1 lines)
165	LIBS = @LIBS@	165	LIBS = @LIBS@
166	LTLIBOBJS = @LTLIBOBJS@	166	LTLIBOBJS = @LTLIBOBJS@
167	MAKEINFO = @MAKEINFO@	167	MAKEINFO = @MAKEINFO@
168	MIN_OSX_TARGET = @MIN_OSX_TARGET@
169	MKDIR_P = @MKDIR_P@	168	MKDIR_P = @MKDIR_P@
170	NATIVELD = @NATIVELD@	169	NATIVELD = @NATIVELD@
171	OBJEXT = @OBJEXT@	170	OBJEXT = @OBJEXT@

Lines 120-126 Link Here

(-)./toolchain-prefix-wrapper-0.3.1723/utils/Makefile.in.orig (-1 lines)
120	LIBS = @LIBS@	120	LIBS = @LIBS@
121	LTLIBOBJS = @LTLIBOBJS@	121	LTLIBOBJS = @LTLIBOBJS@
122	MAKEINFO = @MAKEINFO@	122	MAKEINFO = @MAKEINFO@
123	MIN_OSX_TARGET = @MIN_OSX_TARGET@
124	MKDIR_P = @MKDIR_P@	123	MKDIR_P = @MKDIR_P@
125	NATIVELD = @NATIVELD@	124	NATIVELD = @NATIVELD@
126	OBJEXT = @OBJEXT@	125	OBJEXT = @OBJEXT@

Return to bug 537684

Lines 53-109 Link Here

(-)./toolchain-prefix-wrapper-0.3.1723/configure.ac.orig (-51 lines)
53	)	53	)
54	AC_SUBST(GENTOO_PORTAGE_EPREFIX)	54	AC_SUBST(GENTOO_PORTAGE_EPREFIX)
55		55
56	AC_MSG_CHECKING([for Mac OS X minimum deployment target])
57	AC_ARG_WITH([macosx-version-min],
58	[AC_HELP_STRING(
59	[--with-macosx-version-min],
60	[the minimum deployment target on Mac OS X, such as 10.4]
61	)],
62	[MIN_OSX_TARGET=$withval],
63	[MIN_OSX_TARGET=auto]
64	)
65	# We only "support" Tiger, Leopard and Snow Leopard and Lion
66	case $ac_cv_host in
67	-darwin)
68	case "x${MIN_OSX_TARGET}" in
69	x10.[[3456789]]) ;;
70	xno)
71	AC_ERROR([--with-macosx-version-min must be given on Mac OS X hosts])
72	;;
73	xauto)
74	# auto guessing
75	case $ac_cv_host in
76	-darwin8)
77	MIN_OSX_TARGET=10.4
78	;;
79	-darwin9)
80	MIN_OSX_TARGET=10.5
81	;;
82	-darwin10)
83	MIN_OSX_TARGET=10.6
84	;;
85	-darwin11)
86	MIN_OSX_TARGET=10.7
87	;;
88	esac
89	;;
90	*)
91	AC_ERROR([need an explicit Mac OS X version number with --with-macosx-version-min])
92	;;
93	esac
94	AC_MSG_RESULT(['${MIN_OSX_TARGET}'])
95	;;
96	*)
97	MIN_OSX_TARGET="you shouldn't use this"
98	AC_MSG_RESULT([irrelevant for $ac_cv_host])
99	;;
100	esac
101	AC_DEFINE_UNQUOTED(
102	[MIN_OSX_TARGET], ["${MIN_OSX_TARGET}"],
103	[macosx_version_min]
104	)
105	AC_SUBST(MIN_OSX_TARGET)
106
107	AC_MSG_CHECKING([whether to use native ld even when GNU ld is supported])	56	AC_MSG_CHECKING([whether to use native ld even when GNU ld is supported])
108	AC_ARG_WITH([native-ld],	57	AC_ARG_WITH([native-ld],
109	[AC_HELP_STRING(	58	[AC_HELP_STRING(