diff --git a/disable_pascalscript_powerpc64.diff b/disable_pascalscript_powerpc64.diff new file mode 100644 index 0000000..7db2f81 --- /dev/null +++ b/disable_pascalscript_powerpc64.diff @@ -0,0 +1,31 @@ +Index: lazarus/ide/lazarus.pp +=================================================================== +--- lazarus/ide/lazarus.pp (revision 54032) ++++ lazarus/ide/lazarus.pp (working copy) +@@ -73,8 +73,11 @@ + TurboPowerIPro, TurboPowerIProDsgn, + jcfidelazarus, chmhelppkg, + FPCUnitTestRunner, FPCUnitIDE, ProjTemplates, TAChartLazarusPkg, +- TodoListLaz, DateTimeCtrls, SQLDBLaz, DBFLaz, pascalscript, EditorMacroScript, ++ TodoListLaz, DateTimeCtrls, SQLDBLaz, DBFLaz, ++ {$IFNDEF CPUPOWERPC64} ++ pascalscript, EditorMacroScript, + {$ENDIF} ++ {$ENDIF} + MainBase; + + {$I revision.inc} +=================================================================== +--- lazarus/components/Makefile.fpc (revision 54032) ++++ lazarus/components/Makefile.fpc (working copy) +@@ -56,8 +56,10 @@ + $(MAKE) -C externhelp + $(MAKE) -C tdbf + $(MAKE) -C sqldb ++ifneq ($(CPU_TARGET),powerpc64) + $(MAKE) -C PascalScript/Source + $(MAKE) -C macroscript ++endif + + all: bigide + diff --git a/lazarus.spec b/lazarus.spec index 67c93ea..db7caad 100644 --- a/lazarus.spec +++ b/lazarus.spec @@ -1,6 +1,6 @@ Name: lazarus Version: 1.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lazarus Component Library and IDE for Freepascal Group: Development/Languages @@ -10,6 +10,7 @@ URL: http://www.lazarus-ide.org/ Source0: http://downloads.sourceforge.net/project/%{name}/Lazarus%20Zip%20_%20GZip/Lazarus%20%{version}/%{name}-%{version}-0.tar.gz patch0: Makefile_patch.diff patch1: Desktop_patch.diff +patch2: disable_pascalscript_powerpc64.diff BuildRequires: fpc, binutils, glibc-devel, desktop-file-utils, fpc-src, gtk2-devel BuildRequires: perl-generators @@ -25,6 +26,7 @@ Component Library - LCL, which is also included in this package. %setup -c -q %patch0 -p0 %patch1 -p0 +%patch2 -p0 %build cd lazarus @@ -36,6 +38,9 @@ cd .. export FPCDIR=%{_datadir}/fpcsrc/ fpcmake -Tall +cd components +fpcmake -Tall +cd .. make bigide OPT='-gl -gw' make tools OPT='-gl -gw' @@ -97,6 +102,9 @@ fi %{_mandir}/*/* %changelog +* Wed Feb 8 2017 Joost van der Sluis - 1.6.2-3 +- Disable PascalScript on Powerpc64 + * Sat Feb 04 2017 Björn Esser - 1.6.2-2 - Rebuilt for changes in 'ExclusiveArch: %%{fpc_arches}'