haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "coreutils: avoids conflicts with libroot fts_* functions."

Browse Source 
This reverts commit 6eb589b22a.
This commit is contained in:
Jerome Duval
2015-08-11 16:38:47 +00:00
parent 348b8da6c2
commit 40ae423b02
2 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
sys-apps/coreutils/patches/coreutils-8.24.patchset
View File

@@ -1,4 +1,4 @@
From 942ed631ed98e7bcb27ba571f773673306508847 Mon Sep 17 00:00:00 2001
From 5658840eee54435e0481e66becfc195e7e9526b3 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 13 May 2014 17:18:52 +0000
Subject: define __USE_GNU for wempcpy
@@ -19,10 +19,10 @@ index f4a9e7c..c48f02c 100644
#if ! defined __builtin_expect && __GNUC__ < 3
# define __builtin_expect(expr, expected) (expr)
--
1.8.3.4
2.2.2
From c0fb1d88a2c57ccb6a7f4b1163a79c095982a414 Mon Sep 17 00:00:00 2001
From ca4637a2b09e592d76431968246046bf5cccc041 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 13 May 2014 17:22:10 +0000
Subject: force declaration of rpl_inet_ntop
@@ -42,10 +42,10 @@ index 4cad48f..7dea9d1 100644
# undef inet_ntop
# define inet_ntop rpl_inet_ntop
--
1.8.3.4
2.2.2
From 4bb13253900ab335459a313c7ed600c55e1a6263 Mon Sep 17 00:00:00 2001
From 6732b1fdc586231b354c160a1732f3989fe3fd76 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 13 May 2014 17:32:36 +0000
Subject: Haiku defines mknod in unistd.h
@@ -64,10 +64,10 @@ index 86a7c39..89fe068 100644
#include <errno.h>
--
1.8.3.4
2.2.2
From 06160ccfc41d8946f3f91f3d89d67bee969538b1 Mon Sep 17 00:00:00 2001
From 2e96f642d4dbea03a1aea87cd614b7fcab3e6cbd Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 13 May 2014 17:35:25 +0000
Subject: protect the label, not used on Haiku
@@ -94,10 +94,10 @@ index 6f04f55..7a4e940 100644
/* Free a mount entry as returned from read_file_system_list (). */
--
1.8.3.4
2.2.2
From 2b5fa5b8f473fef06723023ba43126955b50b55d Mon Sep 17 00:00:00 2001
From fcae25b00f489dceb930d80f39f7926c18652910 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 15 May 2014 15:40:32 +0000
Subject: strchrnul needs __USE_GNU on Haiku
@@ -133,10 +133,10 @@ index 2abd6bc..41ae186 100644
#undef _GL_ALREADY_INCLUDING_STRING_H
--
1.8.3.4
2.2.2
From 78a37955a9062379724f418ad1179dda992e61cf Mon Sep 17 00:00:00 2001
From 499494b20a9675e8d66650babacdbd2f40c7412d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 15 May 2014 20:13:58 +0000
Subject: don't build hostid, uptime, nice, users, who, dd
@@ -177,10 +177,10 @@ index 4de1234..00adfb8 100644
src/uptime src/users src/who
default__progs = src/[ src/base64 src/basename src/cat src/chcon \
--
1.8.3.4
2.2.2
From 3a180f2ad623a00d5dc1edc15b7438735c13ddf2 Mon Sep 17 00:00:00 2001
From 8d21f2dc24ea52fd9b34b18435728a76f79f3bab Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 6 Feb 2015 20:24:12 +0000
Subject: import Haiku changes, fix warnings.
@@ -618,32 +618,5 @@ index 39bd28c..44cba6e 100644
print_element (element);
}
--
1.8.3.4
From 06a7b7461bb95977f0c1cb0f3c400666aaf7b290 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 8 Aug 2015 19:12:56 +0000
Subject: avoids conflicts with libroot fts_* functions.
diff --git a/lib/fts_.h b/lib/fts_.h
index b9a3f12..c0d9cff 100644
--- a/lib/fts_.h
+++ b/lib/fts_.h
@@ -269,6 +269,12 @@ typedef struct _ftsent {
# define __attribute_warn_unused_result__ /* empty */
#endif
+#define fts_children _fts_children
+#define fts_close _fts_close
+#define fts_open _fts_open
+#define fts_read _fts_read
+#define fts_set _fts_set
+
__BEGIN_DECLS
FTSENT *fts_children (FTS *, int) __THROW __attribute_warn_unused_result__;
int fts_close (FTS *) __THROW __attribute_warn_unused_result__;
--
1.8.3.4
2.2.2