Author: gdalziel
Date: 2009-09-08 06:31:55 -0600 (Tue, 08 Sep 2009)
New Revision: 2122
Added:
trunk/cdrtools/cdrtools-2.01-glibc_conflicts-1.patch
Removed:
trunk/cdrtools/cdrtools-2.01-glibc_conflicts-1.patch
Log:
Updated cdrtools-2.01-glibc_conflicts-1.patch.
Deleted: trunk/cdrtools/cdrtools-2.01-glibc_conflicts-1.patch
===================================================================
--- trunk/cdrtools/cdrtools-2.01-glibc_conflicts-1.patch 2009-09-08
00:46:42 UTC (rev 2121)
+++ trunk/cdrtools/cdrtools-2.01-glibc_conflicts-1.patch 2009-09-08
12:31:55 UTC (rev 2122)
@@ -1,33 +0,0 @@
-Submitted By: Guy Dalziel (krendoshazin at dementedfury dot org)
-Date: 2009-07-31
-Initial Package Version: 2.01
-Origin: Guy Dalziel
-Upstream Status: Not submitted.
-Description: Fixes several function conflicts that occur between Cdrtools and
- Glibc 2.10.1.
-
-diff -Naur cdrtools-2.01-orig/include/schily.h cdrtools-2.01/include/schily.h
---- cdrtools-2.01-orig/include/schily.h 2004-03-05 00:30:40.000000000
+0000
-+++ cdrtools-2.01/include/schily.h 2009-07-31 14:39:16.102075882 +0100
-@@ -50,6 +50,9 @@
- extern "C" {
- #endif
-
-+#define fexecve fexecve_
-+#define getline getline_
-+
- #if defined(_INCL_SYS_TYPES_H) || defined(off_t)
- # ifndef FOUND_OFF_T
- # define FOUND_OFF_T
-diff -Naur cdrtools-2.01-orig/cdrecord/cue.c cdrtools-2.01/cdrecord/cue.c
---- cdrtools-2.01-orig/cdrecord/cue.c 2004-03-02 20:00:53.000000000 +0000
-+++ cdrtools-2.01/cdrecord/cue.c 2009-07-31 14:41:12.088988527 +0100
-@@ -44,6 +44,8 @@
- #include "auheader.h"
- #include "libport.h"
-
-+#define getdelim getdelim_
-+
- typedef struct state {
- char *filename;
- void *xfp;
Added: trunk/cdrtools/cdrtools-2.01-glibc_conflicts-1.patch
===================================================================
--- trunk/cdrtools/cdrtools-2.01-glibc_conflicts-1.patch
(rev 0)
+++ trunk/cdrtools/cdrtools-2.01-glibc_conflicts-1.patch 2009-09-08
12:31:55 UTC (rev 2122)
@@ -0,0 +1,44 @@
+Submitted By: Guy Dalziel (krendoshazin at dementedfury dot org)
+Date: 2009-07-31
+Initial Package Version: 2.01
+Origin: Guy Dalziel (with thanks to Nathan Coulson for reporting that the
original
+ patch did not work as specified).
+Upstream Status: Not submitted.
+Description: Fixes several function conflicts that occur between Cdrtools and
+ Glibc 2.10.1.
+
+diff -Naur cdrtools-2.01-orig/include/schily.h cdrtools-2.01/include/schily.h
+--- cdrtools-2.01-orig/include/schily.h 2004-03-05 00:30:40.000000000
+0000
++++ cdrtools-2.01/include/schily.h 2009-08-15 13:03:32.167323222 +0100
+@@ -50,6 +50,16 @@
+ extern "C" {
+ #endif
+
++#ifdef fexecve
++#undef fexecve
++#endif
++#define fexecve fexecve_
++
++#ifdef getline
++#undef getline
++#endif
++#define getline getline_
++
+ #if defined(_INCL_SYS_TYPES_H) || defined(off_t)
+ # ifndef FOUND_OFF_T
+ # define FOUND_OFF_T
+diff -Naur cdrtools-2.01-orig/cdrecord/cue.c cdrtools-2.01/cdrecord/cue.c
+--- cdrtools-2.01-orig/cdrecord/cue.c 2004-03-02 20:00:53.000000000 +0000
++++ cdrtools-2.01/cdrecord/cue.c 2009-08-15 13:04:35.321174296 +0100
+@@ -44,6 +44,11 @@
+ #include "auheader.h"
+ #include "libport.h"
+
++#ifdef getdelim
++#undef getdelim
++#endif
++#define getdelim getdelim_
++
+ typedef struct state {
+ char *filename;
+ void *xfp;
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
