packages: ruby/ruby.spec, ruby/ruby-ffs.patch (NEW) - added ffs patch: chec...

qboosh qboosh at pld-linux.org
Sat Oct 9 19:22:02 CEST 2010


Author: qboosh                       Date: Sat Oct  9 17:22:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added ffs patch: check for ffs() to define HAVE_FFS, which is checked in missing.h
  (without this, it defines ffs() without no-throw, thus conflicting with glibc when compiling in C++ mode)

---- Files affected:
packages/ruby:
   ruby.spec (1.219 -> 1.220) , ruby-ffs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ruby/ruby.spec
diff -u packages/ruby/ruby.spec:1.219 packages/ruby/ruby.spec:1.220
--- packages/ruby/ruby.spec:1.219	Sat Sep 18 17:54:55 2010
+++ packages/ruby/ruby.spec	Sat Oct  9 19:21:56 2010
@@ -32,6 +32,7 @@
 Source5:	%{name}-mode-init.el
 Patch0:		%{name}-mkmf-shared.patch
 Patch1:		%{name}-lib64.patch
+Patch2:		%{name}-ffs.patch
 URL:		http://www.ruby-lang.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -208,6 +209,7 @@
 %setup -q -n %{name}-%{basever}-p%{patchlevel} -a1 -a2
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -429,6 +431,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.220  2010/10/09 17:21:56  qboosh
+- added ffs patch: check for ffs() to define HAVE_FFS, which is checked in missing.h
+  (without this, it defines ffs() without no-throw, thus conflicting with glibc when compiling in C++ mode)
+
 Revision 1.219  2010/09/18 15:54:55  qboosh
 - package fiddle modules
 

================================================================
Index: packages/ruby/ruby-ffs.patch
diff -u /dev/null packages/ruby/ruby-ffs.patch:1.1
--- /dev/null	Sat Oct  9 19:22:02 2010
+++ packages/ruby/ruby-ffs.patch	Sat Oct  9 19:21:56 2010
@@ -0,0 +1,11 @@
+--- ruby-1.9.2-p0/configure.in.orig	2010-10-09 14:30:10.239742720 +0200
++++ ruby-1.9.2-p0/configure.in	2010-10-09 14:35:19.007744396 +0200
+@@ -1163,7 +1163,7 @@
+ else
+   AC_LIBOBJ([signbit])
+ fi
+-AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall chroot getcwd eaccess\
++AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall chroot getcwd eaccess ffs\
+ 	      truncate ftruncate chsize times utimes utimensat fcntl lockf lstat\
+ 	      link symlink readlink readdir_r fsync fdatasync fchown\
+ 	      setitimer setruid seteuid setreuid setresuid setproctitle socketpair\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby/ruby.spec?r1=1.219&r2=1.220&f=u



More information about the pld-cvs-commit mailing list