- added gcc-nodoubleo patch - gcc (at least 3.3) doesn't like double -o

Changed files:
    bglibs-gcc-nodoubleo.patch -> 1.1
    bglibs.spec -> 1.4

diff --git a/bglibs-gcc-nodoubleo.patch b/bglibs-gcc-nodoubleo.patch
new file mode 100644 (file)
index 0000000..856c673
--- /dev/null
+++ b/bglibs-gcc-nodoubleo.patch
@@ -0,0 +1,38 @@
+--- bglibs-1.009/Makefile.orig 2003-04-07 19:47:25.000000000 +0200
++++ bglibs-1.009/Makefile      2003-06-01 11:57:28.000000000 +0200
+@@ -126,6 +126,15 @@
+       ) >compile
+       chmod 755 compile
+ 
++compile-no-o: compile
++      (  \
++        echo '#!/bin/sh'; \
++        echo 'source=$$1; shift'; \
++        echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
++        echo exec `head -1 conf-cc` -I.  '-c $$source $${1+"$$@"}'; \
++      ) >compile-no-o
++      chmod 755 compile-no-o
++
+ conf_home.c: conf-home
+       head -1 conf-home | \
+         sed -e 's/"/\\"/g' \
+@@ -679,7 +688,7 @@
+ pwcmp/module.o: compile pwcmp/module.c pwcmp/module.h
+       ./compile pwcmp/module.c
+ 
+-selftests: selftests.sh
++selftests: selftests.sh compile-no-o
+       sh selftests.sh
+ 
+ str/alloc.o: compile str/alloc.c str/str.h selftest.c iobuf/iobuf.h msg/msg.h str/str.h
+--- bglibs-1.009/selftests.sh.orig     2003-04-07 19:47:25.000000000 +0200
++++ bglibs-1.009/selftests.sh  2003-06-01 11:56:44.000000000 +0200
+@@ -14,7 +14,7 @@
+   rm -f $t/*
+   sed -e '1,/^#ifdef SELFTEST_EXP$/d' -e '/^#endif/,$d' $1 >$t/test.exp
+ 
+-  ./compile $1 -DSELFTEST_MAIN -o $t/test.o || {
++  ./compile-no-o $1 -DSELFTEST_MAIN -o $t/test.o || {
+     echo "=====> Compile failed! <====="
+     return 1
+   }

diff --git a/bglibs.spec b/bglibs.spec
index 8c4f720466bef0c8c6ce7dc049e95329e1d5c33b..7ec119725949b16ca390ea7fa860c163f1043105 100644 (file)
--- a/bglibs.spec
+++ b/bglibs.spec
@@ -5,8 +5,9 @@ Version:        1.009
 Release:       1
 License:       GPL
 Group:         Development/Libraries
-Source0:       http://untroubled.org/bglibs/%{name}-%{version}.tar.gz
 # Source0-md5: 486ac7cc8166441261a6569c4ec5a87d
+Source0:       http://untroubled.org/bglibs/%{name}-%{version}.tar.gz
+Patch0:                %{name}-gcc-nodoubleo.patch
 URL:           http://untroubled.org/bglibs/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -21,6 +22,7 @@ Zestaw bibliotek Bruce'a Guentera.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 echo '%{__cc} %{rpmcflags} -Wall' > conf-cc