RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 16-Feb-2015 22:33:13
Branch: rpm-5_4 Handle: 2015021621331200
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmruby.c
rpm/ruby system.h
Log:
- ruby: make peace with FC21 ruby-2.1.5 embedding.
Summary:
Revision Changes Path
2.16.2.4 +1 -0 rpm/rpmio/rpmruby.c
1.5.2.1 +1 -0 rpm/ruby/system.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmruby.c
============================================================================
$ cvs diff -u -r2.16.2.3 -r2.16.2.4 rpmruby.c
--- rpm/rpmio/rpmruby.c 24 Sep 2014 13:03:04 -0000 2.16.2.3
+++ rpm/rpmio/rpmruby.c 16 Feb 2015 21:33:12 -0000 2.16.2.4
@@ -17,6 +17,7 @@
#undef PACKAGE_BUGREPORT
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#define HAVE_SETPROCTITLE 1 /* XXX ruby-2.1.5 prototype
clash */
#include <ruby.h>
#pragma GCC diagnostic warning "-Wstrict-prototypes"
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/system.h
============================================================================
$ cvs diff -u -r1.5 -r1.5.2.1 system.h
--- rpm/ruby/system.h 1 Dec 2010 16:09:50 -0000 1.5
+++ rpm/ruby/system.h 16 Feb 2015 21:33:12 -0000 1.5.2.1
@@ -22,6 +22,7 @@
#undef xfree
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#define HAVE_SETPROCTITLE 1 /* XXX ruby-2.1.5 prototype
clash */
#include <ruby.h>
#pragma GCC diagnostic warning "-Wstrict-prototypes"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
