From 53ebb66d2ac9d189e96789fde59dec19c5bf4288 Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Thu, 26 Jan 2012 15:30:58 +0000 Subject: [PATCH] do not use config.guess anymore git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40679 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/LyX-Mac-binary-release.sh | 6 +----- status.20x | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh index 102dc0e49b..1826fa7e2a 100644 --- a/development/LyX-Mac-binary-release.sh +++ b/development/LyX-Mac-binary-release.sh @@ -216,8 +216,6 @@ LyxAppPrefix="${LyxAppDir}.app" # if zip file is needed... remove the comment sign #LyxAppZip="${LyxAppPrefix}.zip" -BuildSystem=`"${LyxSourceDir}/config/config.guess"` - # --------------------------------- # DON'T MODIFY ANYTHING BELOW HERE! # --------------------------------- @@ -318,7 +316,6 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then "${HunSpellSourceDir}/configure"\ --prefix="${HunSpellInstallDir}"\ ${HunspellConfigureOptions} - #--host="${HOSTSYSTEM}" ${BuildSystem:+"--build=${BuildSystem}"} make && make install${strip} for file in ${FILE_LIST} ; do if [ -f "${HunSpellInstallDir}"/lib/${file} ]; then @@ -383,7 +380,6 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_ CXXFLAGS=-g "${ASpellSourceDir}/configure"\ --prefix="${ASpellInstallDir}"\ ${AspellConfigureOptions} - #--host="${HOSTSYSTEM}" ${BuildSystem:+"--build=${BuildSystem}"} make && make install${aspellstrip} for file in ${FILE_LIST} ; do if [ -f "${ASpellInstallDir}"/lib/${file} ]; then @@ -492,7 +488,7 @@ build_lyx() { --prefix="${LyxAppPrefix}" --with-version-suffix="-${LyXVersionSuffix}"\ ${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \ ${LyXConfigureOptions}\ - --host="${HOSTSYSTEM}" --build="${BuildSystem}" --enable-build-type=rel && \ + --enable-build-type=rel && \ make -j2 && make install${strip} for file in ${LYX_FILE_LIST} ; do if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then diff --git a/status.20x b/status.20x index 5a585797d4..a59a3fb27c 100644 --- a/status.20x +++ b/status.20x @@ -235,3 +235,5 @@ What's new - Fix installation of python files (bug 6080, bug 7990). +- When building LyX package on Mac don't call configure with --build anymore. + It's guessed by configure anyway. -- 2.39.5