packages: fpc/fpc.spec - fixed IDE build - move prep cp to prep - force ld....
baggins
baggins at pld-linux.org
Wed Sep 21 19:50:01 CEST 2011
Author: baggins Date: Wed Sep 21 17:50:01 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fixed IDE build
- move prep cp to prep
- force ld.bfd instead of ld.gold (gold produces non-working ppc binary)
- updated BRs
---- Files affected:
packages/fpc:
fpc.spec (1.78 -> 1.79)
---- Diffs:
================================================================
Index: packages/fpc/fpc.spec
diff -u packages/fpc/fpc.spec:1.78 packages/fpc/fpc.spec:1.79
--- packages/fpc/fpc.spec:1.78 Wed Sep 21 12:53:09 2011
+++ packages/fpc/fpc.spec Wed Sep 21 19:49:55 2011
@@ -1,9 +1,7 @@
# $Revision$, $Date$
-# TODO:
-# - repair ide build
#
# Conditional build:
-%bcond_with ide # build with ide
+%bcond_without ide # build with ide
%bcond_without doc # build without doc
Summary: 32-bit compiler for the i386 and m68k processors
@@ -24,18 +22,25 @@
Source3: ftp://ftp.freepascal.org/pub/fpc/dist/%{version}/powerpc-linux/%{name}-%{version}.powerpc-linux.tar
# Source3-md5: cea93e5da48c45da3147236cba75dc76
Patch0: %{name}-skip-dev-dot.patch
+Patch1: %{name}-link.patch
URL: http://www.freepascal.org/
BuildRequires: binutils-static >= 3:2.17.50
-BuildRequires: gdb-lib
BuildRequires: gpm-devel
BuildRequires: ncurses-devel
-%{?with_ide:BuildRequires: readline-static}
BuildRequires: rpmbuild(macros) >= 1.213
-%{?with_doc:BuildRequires: tetex-fonts-jknappen}
-%{?with_doc:BuildRequires: tetex-format-pdflatex}
-%{?with_doc:BuildRequires: tetex-makeindex}
-%{?with_doc:BuildRequires: tetex-metafont}
-%{?with_doc:BuildRequires: texlive-xetex}
+%if %{with ide}
+BuildRequires: gdb-lib >= 7.2-6
+BuildRequires: python-static
+BuildRequires: readline-static
+BuildRequires: zlib-static
+%endif
+%if %{with doc}
+BuildRequires: tetex-fonts-jknappen
+BuildRequires: tetex-format-pdflatex
+BuildRequires: tetex-makeindex
+BuildRequires: tetex-metafont
+BuildRequires: texlive-xetex
+%endif
Requires: binutils
Provides: fpc-bootstrap
ExclusiveArch: %{ix86} %{x8664} ppc
@@ -107,6 +112,7 @@
%prep
%setup -q -n %{name}build-%{version}
%patch0 -p1
+%patch1 -p1
%ifarch %{ix86}
tar xf %{SOURCE1}
@@ -132,12 +138,18 @@
tar xzf $i
done
ln -sf `pwd`/lib/%{name}/%{_bver}/ppc* bin
+cd ..
-%build
# save for fpc-src
install -d fpc-src
cp -af fpcsrc/* fpc-src
+%build
+# use ld.bfd
+[ -d our-ld ] || install -d our-ld
+ln -sf %{_bindir}/ld.bfd our-ld/ld
+export PATH=$(pwd)/our-ld:$PATH
+
PP=`pwd`/bin/lib/%{name}/%{_bver}/ppc%{_bname}
NEWPP=`pwd`/fpcsrc/compiler/ppc%{_bname}
NEWFPDOC=`pwd`/fpcsrc/utils/fpdoc/fpdoc
@@ -178,26 +190,7 @@
%{?with_ide: ide_clean installer_clean} \
rtl_all \
packages_all \
- utils_all %{?with_ide:installer_all}
-
-# %{?with_ide:IDE=YES} \
-%if %{with ide}
-%{__make} -C fpcsrc/ide OPT="$OPTF -Xs -n" \
- RELEASE="1" \
- BASEINSTALLDIR=%{_libdir}/%{name}/%{version} \
- BININSTALLDIR=%{_bindir} \
- GDBLIBDIR=%{_libdir} \
- PP="$NEWPP" \
- FPC="$NEWPP" \
- FPDOC=$NEWFPDOC \
- DATA2INC=`pwd`/utils/data2inc \
- LINKSMART=YES \
- clean \
- default \
- gdb
-%endif
-# %{?with_ide:installer_clean} \
-# %{?with_ide:installer_all}
+ utils_all %{?with_ide:ide_all installer_all}
%if %{with doc}
export save_size=10000
@@ -281,6 +274,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.79 2011/09/21 17:49:55 baggins
+- fixed IDE build
+- move prep cp to prep
+- force ld.bfd instead of ld.gold (gold produces non-working ppc binary)
+- updated BRs
+
Revision 1.78 2011/09/21 10:53:09 baggins
- removed obsoleed patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fpc/fpc.spec?r1=1.78&r2=1.79&f=u
More information about the pld-cvs-commit
mailing list