Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add the -headerpad_max_install_names option to the screenshotgen utility to fix the buildbot builds on MacOSX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-12-29 12:11:48 +00:00
parent 02b4f9fd2a
commit 516cf181f8
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/bakefiles/config.bkl
View File

@@ -365,6 +365,9 @@ to run the tests, include CppUnit library here.
<option name="SAMPLES_RPATH_FLAG"/>
<option name="SAMPLES_RPATH_POSTLINK"/>
<!-- see configure.in; it's required by some samples on Mac OS X -->
<option name="HEADER_PAD_OPTION"/>
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
<set var="RUNTIME_LIBS">dynamic</set>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->

15
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 57523 2008-12-24 01:28:55Z VZ .
# From configure.in Id: configure.in 57597 2008-12-27 14:58:12Z FM .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
@@ -756,6 +756,7 @@ TOOLKIT_LOWERCASE
TOOLKIT_VERSION
SAMPLES_RPATH_FLAG
SAMPLES_RPATH_POSTLINK
HEADER_PAD_OPTION
HOST_SUFFIX
CPPUNIT_CFLAGS
CPPUNIT_LIBS
@@ -33896,6 +33897,8 @@ done
EOF
chmod +x change-install-names
fi
HEADER_PAD_OPTION="-headerpad_max_install_names"
;;
*-*-cygwin* | *-*-mingw32* )
@@ -47419,6 +47422,7 @@ fi
case "$TOOLKIT" in
GTK)
TOOLKIT_DESC="GTK+"
@@ -51945,6 +51949,7 @@ TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim
TOOLKIT_VERSION!$TOOLKIT_VERSION$ac_delim
SAMPLES_RPATH_FLAG!$SAMPLES_RPATH_FLAG$ac_delim
SAMPLES_RPATH_POSTLINK!$SAMPLES_RPATH_POSTLINK$ac_delim
HEADER_PAD_OPTION!$HEADER_PAD_OPTION$ac_delim
HOST_SUFFIX!$HOST_SUFFIX$ac_delim
CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim
CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim
@@ -51998,7 +52003,6 @@ REZ!$REZ$ac_delim
SETFILE!$SETFILE$ac_delim
OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim
GCC_PCH!$GCC_PCH$ac_delim
ICC_PCH!$ICC_PCH$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52040,6 +52044,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
ICC_PCH!$ICC_PCH$ac_delim
ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
@@ -52136,7 +52141,6 @@ COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52178,6 +52182,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
@@ -52274,7 +52279,6 @@ WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
USE_GUI!$USE_GUI$ac_delim
AFMINSTALL!$AFMINSTALL$ac_delim
WIN32INSTALL!$WIN32INSTALL$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52316,6 +52320,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
WIN32INSTALL!$WIN32INSTALL$ac_delim
TOOLKIT!$TOOLKIT$ac_delim
TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
@@ -52356,7 +52361,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

7
configure.in
View File

@@ -3820,6 +3820,12 @@ done
EOF
chmod +x change-install-names
fi
dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
dnl "install_name_tool: changing install names can't be redone for: the_exe_name
dnl (for architecture ppc) because larger updated load commands do not fit
dnl (the program must be relinked)"
HEADER_PAD_OPTION="-headerpad_max_install_names"
;;
*-*-cygwin* | *-*-mingw32* )
@@ -7650,6 +7656,7 @@ AC_SUBST(TOOLKIT_LOWERCASE)
AC_SUBST(TOOLKIT_VERSION)
AC_SUBST(SAMPLES_RPATH_FLAG)
AC_SUBST(SAMPLES_RPATH_POSTLINK)
AC_SUBST(HEADER_PAD_OPTION)
AC_SUBST(HOST_SUFFIX)
AC_SUBST(CPPUNIT_CFLAGS)
AC_SUBST(CPPUNIT_LIBS)

3
utils/screenshotgen/src/Makefile.in
View File

@@ -42,6 +42,7 @@ CXXWARNINGS = @CXXWARNINGS@
HOST_SUFFIX = @HOST_SUFFIX@
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
HEADER_PAD_OPTION = @HEADER_PAD_OPTION@
wx_top_builddir = @wx_top_builddir@
### Variables: ###
@@ -182,7 +183,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
screenshotgen$(EXEEXT): $(SCREENSHOTGEN_OBJECTS) $(__screenshotgen___win32rc)
$(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(HEADER_PAD_OPTION) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__screenshotgen___mac_setfilecmd)
$(__screenshotgen___os2_emxbindcmd)

3
utils/screenshotgen/src/screenshotgen.bkl
View File

@@ -7,6 +7,9 @@
<exe id="screenshotgen" template="wx_util" template_append="wx_append">
<if cond="FORMAT=='autoconf'">
<!-- we need this for correct install_name_tool operations on Mac: -->
<ldflags>$(HEADER_PAD_OPTION)</ldflags>
<wx-mac-app-bundle/>
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>