- fpc-glibc.patch: Workaround for newer versions of glibc. For a reason

  unknown to me symbols __libc_init and __setfpucw are available only
  in the static version of libc. This fixes linking bin2obj. It should
  be possible to do it better, this is a hack.
- Release 2.

Changed files:
    fpc-glibc.patch -> 1.1
    fpc.spec -> 1.16

diff --git a/fpc-glibc.patch b/fpc-glibc.patch
new file mode 100644 (file)
index 0000000..0d783ab
--- /dev/null
+++ b/fpc-glibc.patch
@@ -0,0 +1,17 @@
+--- utils/Makefile~    Fri Dec 15 21:26:43 2000
++++ utils/Makefile     Wed Dec 12 21:16:28 2001
+@@ -1037,6 +1037,14 @@
+       $(COMPILER) $< $(REDIR)
+       $(EXECPPAS)
+ 
++# Workaround for newer versions of glibc. For a reason unknown to me
++# symbols __libc_init and __setfpucw are available only in the static
++# version of libc.
++bin2obj$(EXEEXT): bin2obj.pp
++      $(COMPILER) $< -s $(REDIR)
++      echo 'INPUT(/usr/lib/libc.a)' >>link.res
++      ./ppas.sh
++
+ #####################################################################
+ # Library
+ #####################################################################

diff --git a/fpc.spec b/fpc.spec
index a783a6ba323119c48f831e698a4274a0d27adac3..ac805c8e13af36dc7b2abe87eaa9536dcd0a0034 100644 (file)
--- a/fpc.spec
+++ b/fpc.spec
@@ -2,7 +2,7 @@ Summary:        32-bit compiler for the i386 and m68k processors
 Summary(pl):   32 bitowy kompilator dla procesorów i386 i m68k
 Name:          fpc
 Version:       1.0.4
-Release:       1
+Release:       2
 License:       GPL
 Group:         Development/Languages
 Group(de):     Entwicklung/Sprachen
@@ -11,6 +11,7 @@ Vendor:               Michael Van Canneyt <michael@tfdec1.fys.kuleuven.ac.be>
 Source0:       ftp://ftp.freepascal.org/pub/fpc/dist/Linux/%{name}-%{version}.ELF.tar
 Source1:       %{name}-sample.cfg
 Patch0:                %{name}-poptasm.patch
+Patch1:                %{name}-glibc.patch
 URL:           http://www.freepascal.org/
 Requires:      gcc >= 2.95.2
 BuildRequires: bin86
@@ -76,6 +77,7 @@ mkdir -p src/%{name}-%{version}/man && echo ".PHONY:  all install installman" > s
 
 cd src/%{name}-%{version}
 %patch0 -p0
+%patch1 -p0
 
 %build
 if [ "%{_build_cpu}" = "m68k" ]; then